Updated Norwegian Bokmaal translation
[quassel.git] / i18n / quassel_nb_NO.ts
index 4087026..359b18c 100644 (file)
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="nb_NO">
+<!DOCTYPE TS>
+<TS version="2.0" language="nb_NO">
 <defaultcodec></defaultcodec>
 <context>
     <name></name>
     <message>
-        <location filename="../src/common/message.h" line="68"/>
         <source>Day changed to %1</source>
-        <translation>Dagen er nå %1</translation>
+        <translation type="obsolete">Dagen er nå %1</translation>
     </message>
 </context>
 <context>
     <name>AboutDlg</name>
     <message>
-        <location filename="../src/qtopia/ui/aboutdlg.ui" line="13"/>
         <source>About</source>
         <translation type="obsolete">Om</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;
@@ -35,12 +33,16 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&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;mobil utgave&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;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
-        <translation>&lt;b&gt;En moderne, distribuert IRC Klient&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; på &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC er dobbelt-lisensiert under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; og &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;De fleste ikonene er &amp;copy; &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; og benyttet under &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Vennligst benytt &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; til å rapportere bugs.</translation>
+        <translation type="obsolete">&lt;b&gt;En moderne, distribuert IRC Klient&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; på &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC er dobbelt-lisensiert under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; og &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;De fleste ikonene er &amp;copy; &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; og benyttet under &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Vennligst benytt &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; til å rapportere bugs.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="46"/>
+        <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
+        <translation>&lt;b&gt;En moderne, distribuert IRC Klient&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; på &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC er dobbelt-lisensiert under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; og &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;De fleste ikonene er &amp;copy; &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; og benyttet under &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Vennligst benytt &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; til å rapportere bugs.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="63"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="62"/>
         <source>Quassel IRC is mainly developed by:</source>
         <translation>Quassel IRC er hovedsakelig utviklet av:</translation>
     </message>
@@ -50,22 +52,25 @@ p, li { white-space: pre-wrap; }
         <translation>Vi vil takke følgende bidragsytere (i alfabetisk rekkefølge) og alle vi glemte å nevne her:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="89"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="115"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for the original Quassel icon - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating all the artwork you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more&lt;/dd&gt;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
+        <translation>En spesiell takk til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for den orginale Quassel logoen - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å ha laget de fleste av de flotte ikonene i Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;QT Software, tidligere kjent som Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å lage Qt og Qtopia, og for å sponse utviklingen av QuasselTopia med Greenphones og mer&lt;/dd&gt;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å holde Qt i live, og for å sponse utvikllingen av Quassel Mobile med N810&apos;er&lt;/dd&gt;</translation>
+    </message>
+    <message>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the shiny icons you see throughout Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
         <translation type="obsolete">En spesiell takk går til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for å lage de fleste av de skinnende ikonene du ser i  Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for å ha laget Qt og Qtopia, og for sponsingen av utvikling av Quasseltopia med  Greenphones og mer&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="17"/>
         <source>About Quassel</source>
         <translation>Om Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="22"/>
         <source>background:white;</source>
         <translation type="obsolete">background:white:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="59"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -73,7 +78,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="75"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -81,37 +86,34 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Versjon 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;Om</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="173"/>
         <source>QTextBrowser { background:transparent;}</source>
         <translation type="obsolete">QTextBrowser { background:transparent;}</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>&amp;Utviklere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="155"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Bidragsytere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Takk til</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="108"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
         <translation type="obsolete">En spesiell takk til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for flott utseende arbeid ogQuassel logoen/ikoner&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å ha laget de fleste av de flotte ikonene i Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å lage Qt og Qtopia, og for å sponse utviklingen av Quasseltopia med Greenphones og mer&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="30"/>
         <source>&lt;b&gt;Version %1&lt;/b&gt;&lt;br&gt;Protocol version: %2&lt;br&gt;Built: %3 %4</source>
         <translation type="obsolete">&lt;b&gt;Versjon %1&lt;/b&gt;&lt;br&gt;Protokoll versjon: %2&lt;br&gt;Bygget: %3 %4</translation>
     </message>
@@ -121,30 +123,39 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;b&gt;Versjon&lt;b&gt; %1&lt;br&gt;&lt;b&gt;Protokoll versjon:&lt;/b&gt; %2&lt;br&gt;Bygget:&lt;/b&gt; %3</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="115"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
-        <translation>En spesiell takk til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for flott utseende arbeid og Quassel logoen/ikoner&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å ha laget de fleste av de flotte ikonene i Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;QT Software, tidligere kjent som Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å lage Qt og Qtopia, og for å sponse utviklingen av QuasselTopia med Greenphones og mer&lt;/dd&gt;</translation>
+        <translation type="obsolete">En spesiell takk til:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for flott utseende arbeid og Quassel logoen/ikoner&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å ha laget de fleste av de flotte ikonene i Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;QT Software, tidligere kjent som Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for å lage Qt og Qtopia, og for å sponse utviklingen av QuasselTopia med Greenphones og mer&lt;/dd&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AbstractSqlStorage</name>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="104"/>
+        <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
+        <translatorcomment>Beholder Schema i stedet for skjema som lett kan forveksles med &apos;form&apos; - Terje Andersen</translatorcomment>
+        <translation>Installert Schema (versjon %1) er ikke oppdatert. Oppgraderer til versjon %2...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="106"/>
+        <source>Upgrade failed...</source>
+        <translation>Oppgraderingen feilet...</translation>
     </message>
 </context>
 <context>
     <name>AdminUserPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="65"/>
         <source>Setup Admin User</source>
         <translation type="obsolete">Setup administrasjonbruker</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="66"/>
         <source>Please enter credentials for the admin user.</source>
         <translation type="obsolete">Vennligst skriv inn bruker-legitimasjonen for administrasjonsbrukeren.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="68"/>
         <source>Name:</source>
         <translation type="obsolete">Navn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="72"/>
         <source>Password:</source>
         <translation type="obsolete">Passord:</translation>
     </message>
@@ -152,7 +163,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AliasesModel</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="159"/>
         <source>Alias</source>
         <translation>Kallenavn</translation>
     </message>
@@ -165,15 +176,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AliasesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Oppførsel</translation>
+        <translation type="obsolete">Oppførsel</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Aliases</source>
         <translation>Kallenavn</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="13"/>
         <source>Form</source>
@@ -193,148 +208,320 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="36"/>
         <source>Appearance</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Generelt</translation>
+        <translation type="obsolete">Generelt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="14"/>
         <source>Form</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Klient Stil</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Setter stilen til applikasjonen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Språk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Setter språket til applikasjonen. Krever omstart!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Skrifter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="68"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Setter skriften for hovedvinduet og skravle monitoren</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Skravle vindu:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="93"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="141"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Skrift</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="109"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="157"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Velg...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="116"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Setter skriften for kanal og kallenavn listene</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Kanal liste:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="164"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Setter skriften for innskrivningslinjen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Innskrivningslinje:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="221"/>
+        <source>Show a website preview window when hovering the mouse over a web address</source>
+        <translation>Vis et vindu med forhåndsvisning av en web side når musen svever over en web adresse</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Vis forhåndsvisninger av websider når musen svever over URL&apos;er</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>Vis status ikoner i kanal og kallenavn listene</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>Benytt ikoner i kanal og kallenavn listene</translation>
+    </message>
+    <message>
         <source>Client style:</source>
-        <translation>Klientstil:</translation>
+        <translation type="obsolete">Klientstil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Språk:</translation>
+        <translation type="obsolete">Språk:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
         <source>&lt;System&gt;</source>
         <translation type="obsolete">&lt;System&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>&lt;Original&gt;</source>
         <translation>&lt;Original&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>NB! må starte klienten på nytt for å få full effekt!</translation>
+        <translation type="obsolete">NB! må starte klienten på nytt for å få full effekt!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="69"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
         <translation>&lt;Systemstandard&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Div:</translation>
+        <translation type="obsolete">Div:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Vis forhåndsvisninger av websider</translation>
+        <translation type="obsolete">Vis forhåndsvisninger av websider</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Bruk ikoner til å representere tilstanden til brukere</translation>
+        <translation type="obsolete">Bruk ikoner til å representere tilstanden til brukere</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Borte-logg</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Vis nettverksnavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Vis buffernavn</translation>
     </message>
 </context>
 <context>
     <name>BacklogSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Behaviour</source>
-        <translation>Oppførsel</translation>
+        <translation type="obsolete">Oppførsel</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Backlog</source>
         <translation>Historikk</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="13"/>
         <source>Form</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="40"/>
+        <source>DynamicBacklogAmount</source>
+        <translation>Dynamisk historikkmengde</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
         <source>Backlog Request Method:</source>
         <translation>Metode for å hente historikk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
         <source>Fixed Amount per Buffer</source>
         <translation>Bestemt mengde per buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
         <source>Unread Messages per Buffer</source>
         <translation>Uleste meldinger per buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
         <source>Global Unread Messages</source>
         <translation>Uleste meldinger globalt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="77"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="122"/>
         <source>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</source>
         <translation>Den enkleste henteren. Den som henter et bestemt antall linjer i hvert buffer fra historien.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="137"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation>antall beskjeder per buffer som quassel spør etter etter den har koblet til kjernen.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="95"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
         <source>Initial backlog amount:</source>
         <translation>Historikkmengde ved oppstart:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="155"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="156"/>
+        <source>FixedBacklogAmount</source>
+        <translation>Fast historikkmengde</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="198"/>
+        <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+
+You can also choose to fetch additional older chatlines to provide a better context.</source>
+        <translation>Denne metoden for henting av meldingshistorikken henter for hver buffer separat. Man kan begrense hvor mange linjer som blir hentet i hver buffer.
+
+Man kan også velge å hente eldre skravlelinjer for å få en bedre sammenheng med hva som har skjedd før.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="269"/>
+        <source>PerBufferUnreadBacklogAdditional</source>
+        <translation>PerBufferUlestHistorikkTillegg</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
+        <source>This requester fetches all messages newer than the oldest unread message for all buffers.
+
+Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
+It is useful to limit the total amount of the backlog and is probably the fastest.
+
+You can also chose to fetch additional older chatlines to provide a better context similar.</source>
+        <translatorcomment>Denne bør fikses! --Terje Andersen</translatorcomment>
+        <translation>Denne historiemetoden henter alle meldinger som er nyere en den eldste meldingen som ikke er lest i alle buffere.
+Denne historiemetiden finner ut hvilken melding som er den eldste meldingen som ikke er lest i alle bufferene og så henter den en stor bit av meldingene i  alle bufferene.
+
+Obs: Denne historiemetoden anbefales ikke hvis du bruker skjulte buffere eller har inaktive buffere (dvs. ingen gamle samtaler eller kanaler)
+
+Du kan også velge å hente tilleggsskravlelinjer for å få en bedre sammenheng.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="353"/>
+        <source>GlobalUnreadBacklogLimit</source>
+        <translation>GlobalUlestHistorikkGrense</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="385"/>
+        <source>GlobalUnreadBacklogAdditional</source>
+        <translation>GlobalUlestHistorikkTillegg</translation>
+    </message>
+    <message>
         <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
 
 You can also chose to fetch additional older chatlines to provide a better context.</source>
-        <translation>Denne historiemetoden henter meldinger for hvert buffer separat. Man kan begrense hvor mange linjer som blir hentet i hvert buffer.
+        <translation type="obsolete">Denne historiemetoden henter meldinger for hvert buffer separat. Man kan begrense hvor mange linjer som blir hentet i hvert buffer.
 Man kan også velge å hente eldre skravlelinjer for å få en bedre sammenheng med hva som har skjedd før.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="295"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="215"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="225"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
         <source>Maximum amount of messages to be fetched per buffer.</source>
         <translation>Høyeste antall meldinger som blir hentet for hvert buffer.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="288"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="218"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
         <source>Limit:</source>
         <translation>Begrensning:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="321"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="237"/>
+        <source>PerBufferUnreadBacklogLimit</source>
+        <translation>PerBufferUlestHistorikkGrense</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="247"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="257"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="363"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
         <source>Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here.</source>
         <translation>Antall meldinger som blir hentet i tillegg til meldingene som ikke er lest før. Begrensningen gjelder ikke her.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="314"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="250"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
         <source>Additional Messages:</source>
         <translation>Tilleggsmeldinger:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="264"/>
         <source>This requester fetches all messages newer than the oldest unread message for all buffers. 
 This requester determines which is the oldest read message of all buffers and then requests one large chunk of messages across all buffers.
 
@@ -342,7 +529,7 @@ Note: this requester is not recommended if you use hidden buffer or have inactiv
 It is useful to limit the total amount of the backlog and is probably the fastest.
 
 You can also chose to fetch additional older chatlines to provide a better context similar.</source>
-        <translation>Denne historiemetoden henter alle meldinger som er nyere en den eldste meldingen som ikke er lest i alle buffere.
+        <translation type="obsolete">Denne historiemetoden henter alle meldinger som er nyere en den eldste meldingen som ikke er lest i alle buffere.
 Denne historiemetiden finner ut hvilken melding som er den eldste meldingen som ikke er lest i alle bufferene og så henter den en stor bit av meldingene i  alle bufferene.
 
 Obs: Denne historiemetoden anbefales ikke hvis du bruker skjulte buffere eller har inaktive buffere (dvs. ingen gamle samtaler eller kanaler)
@@ -350,17 +537,17 @@ Obs: Denne historiemetoden anbefales ikke hvis du bruker skjulte buffere eller h
 Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="285"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
         <source>Maximum amount of messages to be fetched over all buffers.</source>
         <translation>Høyeste antall meldinger som Quassel skal hente i alle bufferene.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation>Antall beskjeder som Quassel skal hente fra kjernen når du ruller opp i buffervisningen.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="374"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
         <source>Dynamic backlog amount:</source>
         <translation>Dynamisk historikkmengde:</translation>
     </message>
@@ -368,62 +555,51 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="157"/>
         <source>Status Buffer</source>
         <translation type="obsolete">Status buffer</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="295"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Status buffer av %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="299"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation type="obsolete">&lt;b&gt;Brukere:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="312"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation type="obsolete">&lt;b&gt;Emne:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="321"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation type="obsolete">Ikke aktive &lt;br/&gt; Dobbelt-klikk for å bli med</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="325"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Spørring med %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="326"/>
         <source>Away Message: %1</source>
         <translation type="obsolete">Fraværs melding: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="329"/>
         <source>%1 - %2</source>
         <translation type="obsolete">%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="333"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="318"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation type="obsolete">&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="277"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 - %2 &lt;/p&gt;</translation>
     </message>
@@ -431,142 +607,127 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
 <context>
     <name>BufferView</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="52"/>
         <source>Connect</source>
         <translation type="obsolete">Koble til</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="53"/>
         <source>Disconnect</source>
         <translation type="obsolete">Koble fra</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="493"/>
         <source>Join Channel</source>
         <translation type="obsolete">Bli med i kanal</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="56"/>
         <source>Join</source>
         <translation type="obsolete">Bli med</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="57"/>
         <source>Part</source>
         <translation type="obsolete">Forlate</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="60"/>
         <source>Delete buffer</source>
         <translation type="obsolete">Slett buffer</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="399"/>
         <source>Hide Events</source>
         <translation type="obsolete">Skjul hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Join Events</source>
         <translation type="obsolete">Bli med hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Part Events</source>
         <translation type="obsolete">Forlate hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Kill Events</source>
         <translation type="obsolete">Slett hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Quit Events</source>
         <translation type="obsolete">Avslutt hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Mode Events</source>
         <translation type="obsolete">Mouds hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="61"/>
         <source>Ignore list</source>
         <translation type="obsolete">Ignoreringsliste</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="194"/>
         <source>WHO</source>
         <translation type="obsolete">WHO</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="493"/>
         <source>Input channel name:</source>
         <translation type="obsolete">Skriv inn kanal navnet:</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="525"/>
         <source>Remove buffer permanently?</source>
         <translation type="obsolete">Slette buffer permanent?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="527"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
         <translation type="obsolete">Vil do slette bufferen &quot;%1&quot; permanent? Dette vil slette alle relaterte data, inkludert all historikk-data, fra Kjernens database!</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="51"/>
         <source>Show Channel List</source>
         <translation type="obsolete">Vis Kanal listen</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="58"/>
         <source>Hide buffers</source>
         <translation type="obsolete">Skjul Buffere</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="59"/>
         <source>Hide buffers permanently</source>
         <translation type="obsolete">Skjuler Buffere permanent</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Joins</source>
         <translation type="obsolete">Tilknytninger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Parts</source>
         <translation type="obsolete">Frakoblinger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Quits</source>
         <translation type="obsolete">Avsluttelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Nick Changes</source>
         <translation type="obsolete">Kallenavn endringer</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="67"/>
         <source>Mode</source>
         <translation type="obsolete">Modus</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="68"/>
         <source>Day Change</source>
         <translation type="obsolete">Dagsendringer</translation>
     </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
+        <source>Merge buffers permanently?</source>
+        <translation>Slå sammen bufferne permanent?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
+        <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
+ This cannot be reversed!</source>
+        <translation>Ønsker du å slå sammen bufferen &quot;%1&quot; inn i bufferen &quot;%2&quot; permanent?
+ Dette kan ikke angres!</translation>
+    </message>
 </context>
 <context>
     <name>BufferViewDock</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="402"/>
         <source>All Buffers</source>
-        <translation>Alle buffere</translation>
+        <translation type="obsolete">Alle buffere</translation>
     </message>
 </context>
 <context>
@@ -582,20 +743,27 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
         <translation>Skriv inn navnet på buffervisningen:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="491"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Legg til buffervisning</translation>
     </message>
 </context>
+<context>
+    <name>BufferViewFilter</name>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Vis / Skjul buffere</translation>
+    </message>
+</context>
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Generelt</translation>
+        <translation type="obsolete">Generelt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
         <source>Buffer Views</source>
         <translation>Buffervisninger</translation>
     </message>
@@ -625,7 +793,6 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
         <translation>Buffervisninginnstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
         <source>Show only Buffers from:</source>
         <translation type="obsolete">Vis kun Buffere fra:</translation>
     </message>
@@ -636,36 +803,47 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="115"/>
+        <source>This option is not available when all Networks are visible.
+In this mode no separate status buffer is displayed.</source>
+        <translation>Dette valget er ikke tilgjengelig når alle Nettverkene er synlige.
+In denne modusen kan ingen separate status buffere vises.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
         <source>Status Buffers</source>
         <translation>Statusbuffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="122"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
         <source>Channel Buffers</source>
         <translation>Kanalbuffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="129"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="133"/>
         <source>Query Buffers</source>
         <translation>Samtalebuffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="146"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
         <source>Add new Buffers automatically</source>
         <translation>Legg til nye buffere automatisk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="137"/>
         <source>Sort Buffers alphabetically</source>
         <translation type="obsolete">Sorter Buffere alfabetisk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="326"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Slette buffervisning?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="327"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Vil du virkelig slette buffervisningen &quot;%1&quot;?</translation>
     </message>
@@ -675,47 +853,48 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
         <translation>Nettverk:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="117"/>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="99"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="139"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
         <source>Hide inactive Buffers</source>
         <translation>Skjule inaktive buffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="153"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
         <source>Sort alphabetically</source>
         <translation>Sorter alfabetisk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="164"/>
         <source>Minimum Activity:</source>
         <translation>Minimum aktivitet:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="168"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="172"/>
         <source>No Activity</source>
         <translation>Ingen aktivitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="177"/>
         <source>Other Activity</source>
         <translation>Annen aktivitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="178"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="182"/>
         <source>New Message</source>
         <translation>Ny beskjed</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="183"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="187"/>
         <source>Highlight</source>
         <translation>Uthev</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="209"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="213"/>
         <source>Preview:</source>
         <translation>Forhåndsvisning:</translation>
     </message>
@@ -723,32 +902,26 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
 <context>
     <name>BufferViewWidget</name>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
         <source>All</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
         <source>Chans</source>
         <translation type="obsolete">Kanaler</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
         <source>Queries</source>
         <translation type="obsolete">Spørringer</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="40"/>
         <source>Nets</source>
         <translation type="obsolete">Nett</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
         <source>Select Buffer</source>
         <translation type="obsolete">Velg Buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="29"/>
         <source>Tab 1</source>
         <translation type="obsolete">Arkfane 1</translation>
     </message>
@@ -761,7 +934,6 @@ Du kan også velge å hente tillegsskravlelinjer for å få en bedre sammenheng.
 <context>
     <name>BufferWidget</name>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="106"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 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;
@@ -770,7 +942,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat komfortabelt. Hvor som helst.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="75"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -780,44 +951,37 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="64"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="72"/>
         <source>Enlarge Chat View</source>
         <translation type="obsolete">Forstørr Chatvisning</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="73"/>
         <source>Ctrl++</source>
         <translation type="obsolete">Ctrl++</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="77"/>
         <source>Demagnify Chat View</source>
         <translation type="obsolete">Forminsk Chatvisning</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="78"/>
         <source>Ctrl+-</source>
         <translation type="obsolete">Ctrl+-</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="82"/>
         <source>Normalize zoom of Chat View</source>
         <translation type="obsolete">Normaliser zoom av Chatvisning</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="85"/>
         <source>Ctrl+0</source>
-        <translation>Ctrl+0</translation>
+        <translation type="obsolete">Ctrl+0</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="73"/>
@@ -831,39 +995,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
+        <source>Actual Size</source>
+        <translation>Faktisk størrelse</translation>
+    </message>
+    <message>
         <source>Zoom Original</source>
-        <translation>Orginal zoom</translation>
+        <translation type="obsolete">Orginal zoom</translation>
     </message>
 </context>
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="405"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="408"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Brukere:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="412"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="424"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Emne:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="428"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Ikke aktive &lt;br/&gt; Dobbeltklikk for å bli med</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="431"/>
+        <location filename="../src/client/networkmodel.cpp" line="487"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
@@ -881,7 +1049,6 @@ p, li { white-space: pre-wrap; }
         <translation>Søkemønster:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
         <source>Search Channels</source>
         <translation type="obsolete">Søk i Kanalene</translation>
     </message>
@@ -907,7 +1074,6 @@ Advanced mode allows to pass search strings to the IRC Server.</source>
         <translation>Feil oppstod:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="131"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -932,43 +1098,136 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>ChatMonitorSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Chat Monitor</source>
+        <translation>Skravle monitor</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="58"/>
+        <source>Opt In</source>
+        <translation>Velger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="59"/>
+        <source>Opt Out</source>
+        <translation>Velger bort</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="236"/>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="132"/>
+        <source>Show:</source>
+        <translation>Vis:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="239"/>
+        <source>Ignore:</source>
+        <translation>Ignorer:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="21"/>
+        <source>Operation Mode:</source>
+        <translation>Operasjonsmodus:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="28"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; 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;Operation modes:&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-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Opt-In:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;Only buffers on the right side are shown in chatmonitor&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; text-decoration: underline;&quot;&gt;Opt-Out:&lt;/span&gt; Buffers on the right side will be ignored in chatmonitor&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; 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;Operasjonsmoduser:&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-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Velger:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;Kun buffere på høyre side blir vist i skravle monitoren&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; text-decoration: underline;&quot;&gt;Velger bort:&lt;/span&gt; Buffere på høyre side vil bli ignorert i skravle monitoren&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="60"/>
+        <source>Available Buffers:</source>
+        <translation>Tilgjengelige buffere:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="87"/>
+        <source>Move selected buffers to the left</source>
+        <translation>Flytt valgte buffere til venstre</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="101"/>
+        <source>Move selected buffers to the right</source>
+        <translation>Flytt valgte buffere til høyre</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="146"/>
+        <source>Show highlights in chatmonitor even if the originating buffer is ignored</source>
+        <translation>Vis uthevinger i skravle monitoren selv om opprinnelsesbufferen er ignorert</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="149"/>
+        <source>Always show highlighted messages</source>
+        <translation>Alltid vis uthevelses beskjeder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="156"/>
+        <source>Show own messages</source>
+        <translation>Vis egne beskjeder</translation>
+    </message>
+</context>
 <context>
     <name>ChatMonitorView</name>
     <message>
-        <location filename="../src/qtui/chatmonitorview.cpp" line="47"/>
         <source>Show own messages</source>
         <translation type="obsolete">Vis egne beskjeder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/chatmonitorview.cpp" line="54"/>
         <source>Show network name</source>
         <translation type="obsolete">Vis nettverksnavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/chatmonitorview.cpp" line="59"/>
         <source>Show buffer name</source>
         <translation type="obsolete">Vis buffernavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/chatmonitorview.cpp" line="47"/>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="50"/>
         <source>Show Own Messages</source>
         <translation>Vis egene meldinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/chatmonitorview.cpp" line="54"/>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="57"/>
         <source>Show Network Name</source>
         <translation>Vis nettverksnavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/chatmonitorview.cpp" line="59"/>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="62"/>
         <source>Show Buffer Name</source>
         <translation>Vis buffernavn</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="69"/>
+        <source>Configure...</source>
+        <translation>Konfigurer...</translation>
+    </message>
 </context>
 <context>
     <name>ChatScene</name>
     <message>
-        <location filename="../src/qtui/chatscene.cpp" line="582"/>
+        <location filename="../src/qtui/chatscene.cpp" line="583"/>
         <source>Copy Selection</source>
         <translation>Kopier valgt tekst</translation>
     </message>
@@ -976,7 +1235,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatViewSearchBar</name>
     <message>
-        <location filename="../src/qtui/chatviewsearchbar.cpp" line="44"/>
         <source>Show Search Bar</source>
         <translation type="obsolete">Vis søkelinje</translation>
     </message>
@@ -986,6 +1244,8 @@ p, li { white-space: pre-wrap; }
         <translation>Skjema</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="19"/>
+        <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="33"/>
         <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="44"/>
         <source>...</source>
         <translation>...</translation>
@@ -1014,15 +1274,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="247"/>
+        <location filename="../src/client/client.cpp" line="254"/>
         <source>Identity already exists in client!</source>
         <translation>Identiteten finnes allerede i klienten!</translation>
     </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="317"/>
+        <source>All Buffers</source>
+        <translation>Alle buffere</translation>
+    </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="119"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>Behandlet %1 beskjeder på %2 sekunder.</translation>
     </message>
@@ -1030,42 +1295,51 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ClientSyncer</name>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="53"/>
+        <location filename="../src/client/clientsyncer.cpp" line="52"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <translation>Quasselkjernen du forsøker å koble til er for gammel! Oppgrader!</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="78"/>
+        <location filename="../src/client/clientsyncer.cpp" line="77"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <translation>&lt;b&gt;Ugyldige data mottatt fra kjernen!&lt;/b&gt;&lt;br&gt;Kobler fra.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="110"/>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
+        <source>No Host to connect to specified.</source>
+        <translation>Ingen vert å koble til ble spesifisert.</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="382"/>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
+        <source>Cert Digest changed! was: %1</source>
+        <translation>Cert Digest endret! var: %1</translation>
+    </message>
+    <message>
         <source>Internal connections not yet supported.</source>
-        <translation>Interne tilkoblinger er ikke støttet enda .</translation>
+        <translation type="obsolete">Interne tilkoblinger er ikke støttet enda .</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="128"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
         <translation>&lt;b&gt;Denne klienten er bygget uten SSL-støtte!&lt;/b&gt;&lt;br /&gt;Deaktiver SSL i kontoinnstillingene.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="185"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least a Core Version %1 (Build &gt;= %2) to connect.</source>
         <translation type="obsolete">&lt;b&gt;Quassel Kjernen du forsøker å koble til er for gammel!&lt;/b&gt;&lt;br&gt;Trenger minst Kjerne versjon %1 (Build &gt;= %2) for å koble til.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="209"/>
+        <location filename="../src/client/clientsyncer.cpp" line="219"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
         <translation>&lt;b&gt;Quasselkjernen du prøver å koble til, støtter ikke SSL!&lt;/b&gt;&lt;br /&gt;Hvis du vil koble til alikevel må du deaktiver SSL i kontoinnstillingene.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="239"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Logger inn...</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="193"/>
+        <location filename="../src/client/clientsyncer.cpp" line="195"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
         <translation>&lt;b&gt;Quasselkjernen du forsøker å koble til er for gammel!&lt;/b&gt;&lt;br&gt;Trenger minst kjerne-/klientprotokoll v%1 for å koble til.</translation>
     </message>
@@ -1073,12 +1347,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ColorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Appearance</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Color settings</source>
         <translation>Fargeinnstillinger</translation>
     </message>
@@ -1098,292 +1372,312 @@ p, li { white-space: pre-wrap; }
         <translation>Aktiviteter:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1503"/>
         <source>FG</source>
-        <translation>FG</translation>
+        <translation type="obsolete">FG</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="51"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>BG</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1523"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="64"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="404"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="648"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1026"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Bruk BG</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
         <source>Default:</source>
         <translation>Standard:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
         <source>Inactive:</source>
         <translation>Inaktiv:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Uthev:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Ny beskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Andre aktiviteter:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1626"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Forhåndsvisning:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1633"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Chatvisning</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Tjeneraktivitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="41"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="384"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="625"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1003"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Forgrunn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="394"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="635"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Bakgrunn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Feilmelding:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Informativ beskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Enkel Beskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Tjenerbeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Uthevet Beskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Brukeraktivitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="661"/>
         <source>Action Message:</source>
         <translation>Handlingsbeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Bli med Beskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Sparkbeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Modusbeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Forlatebeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Avsluttbeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Omdøpbeskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Beskjed:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Tidsstempel:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Avsender:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Kallenavn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Vertsmaske:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Kanalnavn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Modusflagg:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Url:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1232"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Aktiver</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Avsender auto fargelegging:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Mirc fargekoder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1244"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Fargekoder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1250"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Farge 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1271"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Farge 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1292"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Farge 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1313"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Farge 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1334"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Farge 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1355"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Farge 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1376"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Farge 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1397"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Farge 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Farge 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Farge 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Farge 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Farge 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Farge 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Farge 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1460"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Farge 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1467"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Farge 9:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
         <source>Nickview</source>
         <translation>Kallenavnvisning</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1497"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
         <source>Nick status:</source>
         <translation>Kallenavnstatus:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1533"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
         <source>Online:</source>
         <translation>Tilgjengelig:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1573"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
         <source>Away:</source>
         <translation>Borte:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1195"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Ny-beskjed merker:</translation>
     </message>
@@ -1391,12 +1685,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ConclusionPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="170"/>
         <source>Conclusion</source>
         <translation type="obsolete">Konklusjon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="171"/>
         <source>You chose the following configuration:</source>
         <translation type="obsolete">Du velger følgende konfigurasjon:</translation>
     </message>
@@ -1404,7 +1696,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ConfigWizard</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="44"/>
         <source>Core Configuration Wizard</source>
         <translation type="obsolete">Veiviser for Kjerne Konfigurasjon</translation>
     </message>
@@ -1412,95 +1703,306 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ContentsChatItem</name>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="585"/>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
         <source>Copy Link Address</source>
         <translation>Kopier lenkeadresse</translation>
     </message>
 </context>
 <context>
-    <name>Core</name>
+    <name>ContextMenuActionProvider</name>
     <message>
-        <location filename="../src/core/core.cpp" line="59"/>
-        <source>Could not initialize any storage backend! Exiting...</source>
-        <translation>Kunne ikke starte noen lagringsmotor! Avslutter...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="120"/>
-        <source>Calling restoreState() even though active sessions exist!</source>
-        <translation>Kaller restoreState() selv om aktive sesjoner eksisterer!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Koble fra</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="120"/>
-        <source>Core state too old, ignoring...</source>
-        <translation type="obsolete">Kjerne status for gammel, ignorerer...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Bli med</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="161"/>
-        <source>Admin user or password not set.</source>
-        <translation>Administrasjonsbruker, eller -passord er ikke satt.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Forlate</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="164"/>
-        <source>Could not setup storage!</source>
-        <translation>Kunne ikke konfigurere lagring!</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>Slette buffer(e)...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="168"/>
-        <source>Creating admin user...</source>
-        <translation>Lager administrasjonsbruker...</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Vis buffer</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="316"/>
-        <source>Antique client trying to connect... refusing.</source>
-        <translation>Antikk klient prøver å koble til... Nekter.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Tilknytninger</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="384"/>
-        <source>&lt;b&gt;Quassel Core Version %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Up %3d%4h%5m (since %6)</source>
-        <translation type="obsolete">&lt;b&gt;Quassel Kjerne Versjon %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Oppe %3d%4h%5m (siden %6)</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Frakoblinger</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="405"/>
-        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client version %1 (Build &gt;= %2).&lt;br&gt;Please consider upgrading your client.</source>
-        <translation type="obsolete">&lt;b&gt;Din Quassel Klient er for gammel!&lt;/b&gt;&lt;br&gt;Denne Kjernen krever minst klient versjon %1 (Build &gt;= %2).&lt;br&gt;Vennligst vurder å oppgradere klienten din.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Avsluttelser</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="406"/>
-        <source>Client %1 too old, rejecting.</source>
-        <translation type="obsolete">Klient %1 for gammel, avviser.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Kallenavnsendringer</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="410"/>
-        <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
-        <translation>&lt;b&gt;Klienten er ikke initialisert!&lt;/b&gt;&lt;br&gt;Du må sende en init-beskjed før du prøver å logge inn.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>Modusendringer</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="486"/>
-        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
-        <translation type="obsolete">Klient %1 sendte ikke en init beskjed før den forsøkte å logge inn, avviser.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Dag endringer</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="430"/>
-        <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
-        <translation>&lt;b&gt;Ugyldig brukernavn, eller passord!&lt;/b&gt;&lt;br&gt;Brukernavn/passord-kombinasjonen kunne ikke bli funnet i databasen.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Sett som standard...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="471"/>
-        <source>Client %1 initialized and authentificated successfully as &quot;%2&quot; (UserId: %3).</source>
-        <translation type="obsolete">Klient %1 initialisert og autentisiert suksessfullt som &quot;%2&quot; (Brukerid: %3).</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Bruk standard...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="447"/>
-        <source>Non-authed client disconnected.</source>
-        <translation>Uautorisert klient koblet fra.</translation>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Bli med i Kanal...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="568"/>
-        <source>Could not initialize session for client %1!</source>
-        <translation type="obsolete">Kunne ikke initiere sesjonen for klient %1!</translation>
-    </message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Start samtale</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Vis samtale</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Versjon</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation>Finger</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Gi operatørstatus</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>Ta operatørstatus</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Gi stemme</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>Ta stemme</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Spark ut av kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Bannlys fra kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Spark og bannlys</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Skjule buffer(e) midlertidig</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Skjule buffer(e) permanent</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Vis Kanal listen</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Vis ignoreringslisten</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Skjul hendelser</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="94"/>
+        <source>CTCP</source>
+        <translation>CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="106"/>
+        <source>Actions</source>
+        <translation>Hendelser</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../src/core/core.cpp" line="146"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
+        <translation>Kunne ikke starte noen lagringsmotor! Avslutter...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="186"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
+        <translation>Kaller restoreState() selv om aktive sesjoner eksisterer!</translation>
+    </message>
+    <message>
+        <source>Core state too old, ignoring...</source>
+        <translation type="obsolete">Kjerne status for gammel, ignorerer...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="227"/>
+        <source>Admin user or password not set.</source>
+        <translation>Administrasjonsbruker, eller -passord er ikke satt.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="231"/>
+        <source>Could not setup storage!</source>
+        <translation>Kunne ikke konfigurere lagring!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="235"/>
+        <source>Creating admin user...</source>
+        <translation>Lager administrasjonsbruker...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="334"/>
+        <source>Invalid listen address %1</source>
+        <translation>Ugyldig lytte adresse %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="342"/>
+        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
+        <translation>Lytter etter GUI klienter på IPv4 %1 port %2 med protokoll versjon %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="350"/>
+        <source>Could not open IPv4 interface %1:%2: %3</source>
+        <translation>Kunne ikke åpne IPv4 grensesnittet %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="358"/>
+        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
+        <translation>Lytter etter GUI klienter på IPv6 %1 port %2 med protokoll versjon %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="369"/>
+        <source>Could not open IPv6 interface %1:%2: %3</source>
+        <translation>Kunne ikke åpne IPv6 grensesnittet %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="377"/>
+        <source>Invalid listen address %1, unknown network protocol</source>
+        <translation>Ugyldig lytte adresse %1, ukjent nettverksprotokoll</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="386"/>
+        <source>Could not open any network interfaces to listen on!</source>
+        <translation>Kunne ikke åpne noen nettverksgrensesnitt for lytting!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="442"/>
+        <source>Antique client trying to connect... refusing.</source>
+        <translation>Antikk klient prøver å koble til... Nekter.</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Quassel Core Version %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Up %3d%4h%5m (since %6)</source>
+        <translation type="obsolete">&lt;b&gt;Quassel Kjerne Versjon %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Oppe %3d%4h%5m (siden %6)</translation>
+    </message>
     <message>
-        <location filename="../src/core/core.cpp" line="62"/>
+        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client version %1 (Build &gt;= %2).&lt;br&gt;Please consider upgrading your client.</source>
+        <translation type="obsolete">&lt;b&gt;Din Quassel Klient er for gammel!&lt;/b&gt;&lt;br&gt;Denne Kjernen krever minst klient versjon %1 (Build &gt;= %2).&lt;br&gt;Vennligst vurder å oppgradere klienten din.</translation>
+    </message>
+    <message>
+        <source>Client %1 too old, rejecting.</source>
+        <translation type="obsolete">Klient %1 for gammel, avviser.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="536"/>
+        <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
+        <translation>&lt;b&gt;Klienten er ikke initialisert!&lt;/b&gt;&lt;br&gt;Du må sende en init-beskjed før du prøver å logge inn.</translation>
+    </message>
+    <message>
+        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
+        <translation type="obsolete">Klient %1 sendte ikke en init beskjed før den forsøkte å logge inn, avviser.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="556"/>
+        <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
+        <translation>&lt;b&gt;Ugyldig brukernavn, eller passord!&lt;/b&gt;&lt;br&gt;Brukernavn/passord-kombinasjonen kunne ikke bli funnet i databasen.</translation>
+    </message>
+    <message>
+        <source>Client %1 initialized and authentificated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <translation type="obsolete">Klient %1 initialisert og autentisiert suksessfullt som &quot;%2&quot; (Brukerid: %3).</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="573"/>
+        <source>Non-authed client disconnected.</source>
+        <translation>Uautorisert klient koblet fra.</translation>
+    </message>
+    <message>
+        <source>Could not initialize session for client %1!</source>
+        <translation type="obsolete">Kunne ikke initiere sesjonen for klient %1!</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="147"/>
         <source>Currently, Quassel only supports SQLite3. You need to build your
 Qt library with the sqlite plugin enabled in order for quasselcore
 to work.</source>
@@ -1509,62 +2011,63 @@ kompilere  Qt-biblioteket ditt med sqlite aktivert for å få Quasselkjernen
 til å virke.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="330"/>
+        <location filename="../src/core/core.cpp" line="454"/>
         <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
         <translation>&lt;b&gt;Quasselklienten din er for gammel!&lt;/b&gt;&lt;br&gt;Denne kjernen trenger minst klient/kjerne-protokollversjon %1.&lt;br&gt; Oppgrader klienten din.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="346"/>
+        <location filename="../src/core/core.cpp" line="470"/>
         <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
         <translation>&lt;b&gt;Quasselkjerne Versjon %1&lt;/b&gt;&lt;br&gt;Bygget: %2&lt;br&gt;Oppe %3d%4h%5m (siden %6)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="512"/>
         <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
         <translation type="obsolete">Klient %1 initialisert og autentisiert suksessfullt som &quot;%2&quot; (BrukerID: %3).</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="294"/>
+        <location filename="../src/core/core.cpp" line="420"/>
         <source>Client connected from</source>
         <translation>Klient koblet til fra</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="436"/>
+        <location filename="../src/core/core.cpp" line="458"/>
+        <location filename="../src/core/core.cpp" line="538"/>
+        <location filename="../src/core/core.cpp" line="562"/>
         <source>Client</source>
         <translation>Klient</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="332"/>
+        <location filename="../src/core/core.cpp" line="458"/>
         <source>too old, rejecting.</source>
         <translation>for gammel, avviser.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="392"/>
+        <location filename="../src/core/core.cpp" line="518"/>
         <source>Starting TLS for Client:</source>
         <translation>Starter TLS for klient:</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="412"/>
+        <location filename="../src/core/core.cpp" line="538"/>
         <source>did not send an init message before trying to login, rejecting.</source>
         <translation>Avviser klienten siden den ikke sendte noen init-beskjed før den prøvde å logge på.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="436"/>
+        <location filename="../src/core/core.cpp" line="562"/>
         <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
         <translation>initiert og autentisert som &quot;%1&quot; (BrukerID: %2).</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="453"/>
+        <location filename="../src/core/core.cpp" line="579"/>
         <source>Non-authed client disconnected. (socket allready destroyed)</source>
         <translation>Ikke-autentisiert klient koblet fra. (socket fjernet allerede)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="495"/>
+        <location filename="../src/core/core.cpp" line="623"/>
         <source>Could not initialize session for client:</source>
         <translation>Kunne ikke initiere sesjon for klient:</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="297"/>
+        <location filename="../src/core/core.cpp" line="423"/>
         <source>Closing server for basic setup.</source>
         <translation>Lukker tjener for grunnleggende oppsett.</translation>
     </message>
@@ -1572,27 +2075,23 @@ til å virke.</translation>
 <context>
     <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="497"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
         <source>Add Core Account</source>
         <translation>Legg til kjernekonto</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="289"/>
         <source>Missing information</source>
         <translation type="obsolete">Manglende informasjon</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="290"/>
         <source>Please enter all required information or discard changes to return to account selection.</source>
         <translation type="obsolete">Vennligst skriv inn all påkrevd informasjon, eller forkast endringene for å returnere til valg av konto.</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="297"/>
         <source>Non-unique account name</source>
         <translation type="obsolete">Ikke-unikt konto navn</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="299"/>
         <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
         <translation type="obsolete">Konto navn må være unike. Vennligst forsøk et annet navn, eller forkast alle endringene for å returnere til valg av konto.</translation>
     </message>
@@ -1607,22 +2106,18 @@ til å virke.</translation>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="40"/>
         <source>Host:</source>
         <translation type="obsolete">Vert:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="47"/>
         <source>Password:</source>
         <translation type="obsolete">Passord:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="63"/>
         <source>Account:</source>
         <translation type="obsolete">Konto:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="90"/>
         <source>User:</source>
         <translation type="obsolete">Bruker:</translation>
     </message>
@@ -1637,12 +2132,10 @@ til å virke.</translation>
         <translation>Kontonavn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="60"/>
         <source>Use built-in Quassel Core</source>
         <translation type="obsolete">Bruk innebygd Quassel Kjerne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="76"/>
         <source>Remote host:</source>
         <translation type="obsolete">Ekstern vert:</translation>
     </message>
@@ -1682,6 +2175,7 @@ til å virke.</translation>
         <translation>Proxyport:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="61"/>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
         <source>localhost</source>
         <translation>localhost</translation>
@@ -1710,29 +2204,24 @@ til å virke.</translation>
 <context>
     <name>CoreApplicationInternal</name>
     <message>
-        <location filename="../src/core/coreapplication.cpp" line="33"/>
         <source>The port quasselcore will listen at</source>
-        <translation>Porten Quasselkjernen vil lytte på</translation>
+        <translation type="obsolete">Porten Quasselkjernen vil lytte på</translation>
     </message>
     <message>
-        <location filename="../src/core/coreapplication.cpp" line="34"/>
         <source>Don&apos;t restore last core&apos;s state</source>
-        <translation>Ikke gjenopprett siste kjernes tilstand</translation>
+        <translation type="obsolete">Ikke gjenopprett siste kjernes tilstand</translation>
     </message>
     <message>
-        <location filename="../src/core/coreapplication.cpp" line="35"/>
         <source>Path to logfile</source>
-        <translation>Sti til loggfil</translation>
+        <translation type="obsolete">Sti til loggfil</translation>
     </message>
     <message>
-        <location filename="../src/core/coreapplication.cpp" line="36"/>
         <source>Loglevel Debug|Info|Warning|Error</source>
-        <translation>Lognivå Debug|Info|Advarsel|Feil</translation>
+        <translation type="obsolete">Lognivå Debug|Info|Advarsel|Feil</translation>
     </message>
     <message>
-        <location filename="../src/core/coreapplication.cpp" line="37"/>
         <source>Specify the directory holding datafiles like the Sqlite DB and the SSL Cert</source>
-        <translation>Skriv inn stien til katalogen med datafilene for Sqlite DB- og SSLsertifikatet</translation>
+        <translation type="obsolete">Skriv inn stien til katalogen med datafilene for Sqlite DB- og SSLsertifikatet</translation>
     </message>
 </context>
 <context>
@@ -1753,7 +2242,7 @@ til å virke.</translation>
         <translation>Kunne ikke konfigurer kjernen.&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Trykk &lt;em&gt;Neste&lt;/em&gt; for å starte på nytt.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="105"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="104"/>
         <source>Your are now logged into your freshly configured Quassel Core!&lt;br&gt;Please remember to configure your identities and networks now.</source>
         <translation>Du er nå logget inn i din nykonfigurerte Quasselkjerne!&lt;br&gt;Husk å konfigurere identiteter og nettverk.</translation>
     </message>
@@ -1786,7 +2275,6 @@ til å virke.</translation>
         <translation>Husk passord</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
         <source>&lt;em&gt;Note: Adding more users and changing your username/password has not been implemented yet.</source>
         <translation type="obsolete">&lt;em&gt;Merk: Å legge til flere brukere og endre ditt brukernavn/passord er ikke implementert enda.</translation>
     </message>
@@ -1817,12 +2305,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConfigWizardPages::AdminUserPage</name>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
         <source>Create User Account</source>
         <translation type="obsolete">Opprett Bruker Konto</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
         <source>First, we will create a user account on the core. This first user will have administrator privileges.</source>
         <translation type="obsolete">Først oppretter vi en bruker konto i Kjernen. Den første brukeren vil ha administrative rettigheter.</translation>
     </message>
@@ -1935,127 +2421,128 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConnectDlg</name>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="46"/>
         <source>New</source>
         <translation type="obsolete">Ny</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="90"/>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="48"/>
         <source>Properties...</source>
         <translation type="obsolete">Egenskaper...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="183"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="190"/>
         <source>Remove Account Settings</source>
         <translation>Fjern kontoinnstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="185"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="191"/>
         <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
         <translation>Vil du virkelig fjerne de lokale instillingene dine for denne Quasselkjernekontoen?&lt;br&gt;Merk: Dette vil &lt;em&gt;ikke&lt;/em&gt; fjerne, eller endre noen data i selve kjernen!</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="21"/>
         <source>Select Core Account</source>
         <translation type="obsolete">Velg Kjerne Konto</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="39"/>
         <source>Available Quassel Core accounts:</source>
         <translation type="obsolete">Tilgjengelige Quassel Kjerne kontoer:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="88"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="128"/>
         <source>Connect</source>
         <translation type="obsolete">Koble til</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="243"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="242"/>
         <source>Connect to %1</source>
         <translation>Koblet til %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="260"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="259"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <translation>&lt;div style=color:red;&gt;Kunne ikke koble til %1!&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="284"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="272"/>
+        <source>&lt;div&gt;Errors occurred while connecting to &quot;%1&quot;:&lt;/div&gt;</source>
+        <translation>&lt;div&gt;Feil oppstod under tilkobling til &quot;%1&quot;:&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="309"/>
         <source>Not connected to %1.</source>
         <translation>Ikke koblet til %1.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="285"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="310"/>
         <source>Looking up %1...</source>
         <translation>Slår opp %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="286"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="311"/>
         <source>Connecting to %1...</source>
         <translation>Kobler til %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="287"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
         <translation>Tilkoblet %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="288"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
         <source>Unknown connection state to %1</source>
         <translation>Ukjent tilkoblingstilstand til %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="340"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="365"/>
         <source>Logging in...</source>
         <translation>Logger inn...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="392"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="450"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Logg inn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="42"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="19"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Koble til Quasselkjerne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
         <source>Edit...</source>
         <translation>Rediger...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
         <source>Add...</source>
         <translation>Legg til...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="117"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="128"/>
         <source>Always use this account</source>
         <translation>Alltid bruk denne kontoen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="146"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
         <source>Initializing your connection</source>
         <translation>Forbreder å koble til</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="170"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="183"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation>Tilkoblet apollo.mindpool.net.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="211"/>
         <source>Core Info
 reserve
 some
@@ -2063,77 +2550,90 @@ space</source>
         <translation type="obsolete">Kjerne InfoReserveLedigPlass</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="294"/>
         <source>User:</source>
         <translation>Bruker:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="308"/>
         <source>Password:</source>
         <translation>Passord:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="314"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="322"/>
         <source>Remember</source>
         <translation>Husk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="336"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="356"/>
+        <source>view SSL Certificate</source>
+        <translation>Vis SSL sertifikat</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="393"/>
+        <source>add to known hosts</source>
+        <translation>Legg til i kjente verter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="413"/>
+        <source>Continue connection</source>
+        <translation>Fortsett tilkoblingen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="456"/>
         <source>Configure your Quassel Core</source>
         <translation>Konfigurer Quasselkjernen din</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="342"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="462"/>
         <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
         <translation>Quasselkjernen du koblet til er ikke konfigurert enda. Du kan starte en konfigurasjonsveiviser som vil hjelpe deg å konfigurere kjernen din.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="370"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="490"/>
         <source>Launch Wizard</source>
         <translation>Start veiviser</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="427"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="553"/>
         <source>Initializing your session...</source>
         <translation>Forbreder sesjonen din...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="435"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="561"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <translation>&lt;b&gt;Synkroniserer klienten med Quasselkjernen!&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="450"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="576"/>
         <source>Session state:</source>
         <translation>Sesjonstilstand:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="467"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="593"/>
         <source>Network states:</source>
         <translation>Nettverkstilstander:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="480"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="606"/>
         <source>0/0</source>
         <translation>0/0</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
         <source>Channel states:</source>
         <translation type="obsolete">Kanal tilstander:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
         <source>User states:</source>
         <translation type="obsolete">Bruker tilstander:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="114"/>
         <source>Use internal core</source>
         <translation>Bruk intern kjerne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="202"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="215"/>
         <source>THIS IS A PLACEHOLDER
 TO
 RESERVE
@@ -2147,37 +2647,30 @@ NOE PLASS</translation>
 <context>
     <name>CoreConnectProgressDlg</name>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="13"/>
         <source>Connection Progress</source>
         <translation type="obsolete">Tilkoblings Fremdrift</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="19"/>
         <source>Connecting to core...</source>
         <translation type="obsolete">Kobler til kjernen...</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="34"/>
         <source>Session</source>
         <translation type="obsolete">Sesjon</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="98"/>
         <source>%p%</source>
         <translation type="obsolete">%p%</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="54"/>
         <source>Networks</source>
         <translation type="obsolete">Nettverk</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="71"/>
         <source>Channels</source>
         <translation type="obsolete">Kanaler</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="88"/>
         <source>Users</source>
         <translation type="obsolete">Brukere</translation>
     </message>
@@ -2248,35 +2741,67 @@ NOE PLASS</translation>
         <translation> %1:%2:%3 (siden %4)</translation>
     </message>
 </context>
+<context>
+    <name>CoreNetwork</name>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="153"/>
+        <source>Connection failed. Cycling to next Server</source>
+        <translation>Greide ikke å koble til. Prøver neste tjener.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="161"/>
+        <location filename="../src/core/corenetwork.cpp" line="162"/>
+        <source>Connecting to %1:%2...</source>
+        <translation>Kobler til %1:%2...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="211"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Kobler fra (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="211"/>
+        <source>Core Shutdown</source>
+        <translation>Kjerne avslutting</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="307"/>
+        <source>Could not connect to %1 (%2)</source>
+        <translation>Kunne ikke koble til %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="309"/>
+        <source>Connection failure: %1</source>
+        <translation>Tilkoblingsfeil: %1</translation>
+    </message>
+</context>
 <context>
     <name>CoreSession</name>
     <message>
-        <location filename="../src/core/coresession.cpp" line="160"/>
         <source>Default Identity</source>
-        <translation>Standardidentitet</translation>
+        <translation type="obsolete">Standardidentitet</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="241"/>
         <source>Client %1 disconnected (UserId: %2).</source>
         <translation type="obsolete">Klient %1 frakoblet (BrukerId: %2).</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="419"/>
+        <location filename="../src/core/coresession.cpp" line="317"/>
         <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
         <translation>CoreSession::createNetwork(): Fikk ugyldig nettverksID fra kjernen under forsøket på å opprette nettverket %1!</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="434"/>
+        <location filename="../src/core/coresession.cpp" line="348"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
         <translation>CoreSession::createNetwork(): Forsøker å opprette et nettverk som allerede eksisterer, oppdaterer det i stedet!</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="254"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>Client</source>
         <translation>Klient</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="254"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>disconnected (UserId: %1).</source>
         <translation>Frakoblet (BrukerID: %1).</translation>
     </message>
@@ -2396,6 +2921,7 @@ NOE PLASS</translation>
         <translation>Posisjonshint:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="86"/>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="102"/>
         <source> px</source>
         <translation>px</translation>
@@ -2419,32 +2945,26 @@ NOE PLASS</translation>
 <context>
     <name>EditCoreAcctDlg</name>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="13"/>
         <source>Edit Core Account</source>
         <translation type="obsolete">Rediger Kjerne Konto</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="33"/>
         <source>Port:</source>
         <translation type="obsolete">Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="40"/>
         <source>Host:</source>
         <translation type="obsolete">Vert:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="47"/>
         <source>Password:</source>
         <translation type="obsolete">Passord:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="63"/>
         <source>Account:</source>
         <translation type="obsolete">Konto:</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="90"/>
         <source>User:</source>
         <translation type="obsolete">Bruker:</translation>
     </message>
@@ -2472,11 +2992,25 @@ NOE PLASS</translation>
         <translation>Tilpassede applikasjonsskrifter</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="53"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="104"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="158"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="212"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="254"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="322"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="357"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="392"/>
         <source>Font</source>
         <translation>Skrift</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="72"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="177"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="231"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="273"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="338"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="373"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="408"/>
         <source>Choose...</source>
         <translation>Velg...</translation>
@@ -2502,6 +3036,7 @@ NOE PLASS</translation>
         <translation>Skrivefelt:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="283"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="303"/>
         <source>General:</source>
         <translation>Generelt:</translation>
@@ -2530,14 +3065,12 @@ NOE PLASS</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Oppførsel</translation>
+        <translation type="obsolete">Oppførsel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Generelt</translation>
+        <translation type="obsolete">Generelt</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -2545,7 +3078,6 @@ NOE PLASS</translation>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
         <source>Use system tray icon:</source>
         <translation type="obsolete">Bruk system kurv ikon:</translation>
     </message>
@@ -2560,7 +3092,6 @@ NOE PLASS</translation>
         <translation>Mimimer til kurv ved lukkknapp</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
         <source>Tray icon:</source>
         <translation type="obsolete">Kurv ikon:</translation>
     </message>
@@ -2570,42 +3101,34 @@ NOE PLASS</translation>
         <translation>Vis systemkurvikon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
         <source>User Notification:</source>
         <translation type="obsolete">Bruk notifisering:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="70"/>
         <source>Animate tray icon</source>
         <translation type="obsolete">Animer kurv ikon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="80"/>
         <source>Display pop-up messages</source>
         <translation type="obsolete">Vis pop-up beskjeder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="93"/>
         <source>Display user related messages and private Notices:</source>
         <translation type="obsolete">Vi bruker relaterte beskjeder og private Merknader:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="73"/>
         <source>in status buffer</source>
         <translation type="obsolete">i status buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="86"/>
         <source>in query buffer (if exists)</source>
         <translation type="obsolete">i spørrings bugger (hvis den eksisterer)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="96"/>
         <source>in current buffer</source>
         <translation type="obsolete">i nåværende buffer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
         <source>Buffer view:</source>
         <translation type="obsolete">Buffer visning:</translation>
     </message>
@@ -2625,7 +3148,6 @@ NOE PLASS</translation>
         <translation>Endelsen som legges til et kallenavn ved fullføring via TAB. Standard er &quot;: &quot;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
         <source>Input Line:</source>
         <translation type="obsolete">Innskrivningslinje:</translation>
     </message>
@@ -2645,7 +3167,6 @@ NOE PLASS</translation>
         <translation>Systemkurvikon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
         <source>Display User-Related Messages And Private Notices:</source>
         <translation type="obsolete">Vis Bruker-relaterte beskjeder og Personlige merknader:</translation>
     </message>
@@ -2691,47 +3212,56 @@ NOE PLASS</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
+        <source>Errors:</source>
+        <translation>Feil:</translation>
+    </message>
+    <message>
         <source>Errors</source>
-        <translation>Feil</translation>
+        <translation type="obsolete">Feil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="274"/>
         <source>Backlog</source>
         <translation type="obsolete">Historikk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="280"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation type="obsolete">mengde beskjeder per buffer som forespørres etter at kjerne tilkoblingen har blitt etablert.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="283"/>
         <source>Initial backlog amount:</source>
         <translation type="obsolete">Initiell historikkmengde:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="303"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation type="obsolete">Antall beskjeder som skal forespørres fra kjernen når det rulles oppover i buffervisningen.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="306"/>
         <source>Dynamic backlog amount:</source>
         <translation type="obsolete">Dynamisk historikkmengde:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Oppførsel</translation>
+        <translation type="obsolete">Oppførsel</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
         <source>Highlight</source>
         <translation>Uthev</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="159"/>
         <source>this shouldn&apos;t be empty</source>
@@ -2748,7 +3278,6 @@ NOE PLASS</translation>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="19"/>
         <source>Highlight list</source>
         <translation type="obsolete">Uthev list</translation>
     </message>
@@ -2778,7 +3307,6 @@ NOE PLASS</translation>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="85"/>
         <source>Highlight nicks</source>
         <translation type="obsolete">Uthev kallenavn</translation>
     </message>
@@ -2816,309 +3344,567 @@ NOE PLASS</translation>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
         <source>General</source>
-        <translation>Generelt</translation>
+        <translation type="obsolete">Generelt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="30"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Identiteter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="180"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="178"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
         <translation>&lt;b&gt;Følgende problemer trengs å bli rettet før endringene dine kan bli påført:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="181"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="179"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <translation>&lt;li&gt;Alle identiteter trenger et identitets navnesett&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="182"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="180"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;Hver identitet trenger minst ett kallenavn definert&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="183"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="181"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Du må spesifiere et ekte navn for hver identitet&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="184"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="182"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Du må spesifisere en ident for hver identitet&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="185"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="183"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="186"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="184"/>
         <source>One or more identities are invalid</source>
         <translation>En, eller flere identiteter er ugyldig</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="347"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="310"/>
         <source>Delete Identity?</source>
         <translation>Slette identitet?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="348"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="311"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Vil du virkelig slette identiteten &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="322"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Omdøp Identitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="360"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="323"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Vennligst skriv inn navnet for identiteten &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="262"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="51"/>
         <source>Add Identity</source>
         <translation>Legg til Identitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="54"/>
         <source>Add...</source>
         <translation>Legg til...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="74"/>
         <source>Remove Identity</source>
         <translation>Fjern Identitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
         <source>Real Name:</source>
-        <translation>Ekte Navn:</translation>
+        <translation type="obsolete">Ekte Navn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation>Det &quot;ekte navnet&quot; blir vist i /whois.</translation>
+        <translation type="obsolete">Det &quot;ekte navnet&quot; blir vist i /whois.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
         <source>Nicknames</source>
-        <translation>Kallenavn</translation>
+        <translation type="obsolete">Kallenavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
         <source>Add Nickname</source>
-        <translation>Legg til Kallenavn</translation>
+        <translation type="obsolete">Legg til Kallenavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
         <source>&amp;Add...</source>
-        <translation>&amp;Legg til...</translation>
+        <translation type="obsolete">&amp;Legg til...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
         <source>Remove Nickname</source>
-        <translation>Fjern Kallenavn</translation>
+        <translation type="obsolete">Fjern Kallenavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
         <source>Remove</source>
-        <translation>Fjern</translation>
+        <translation type="obsolete">Fjern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
         <source>Re&amp;name...</source>
-        <translation>&amp;Omdøp...</translation>
+        <translation type="obsolete">&amp;Omdøp...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="245"/>
         <source>Move upwards in list</source>
-        <translation>Flytt oppover i listen</translation>
+        <translation type="obsolete">Flytt oppover i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="259"/>
         <source>Move downwards in list</source>
-        <translation>Flytt nedover i listen</translation>
+        <translation type="obsolete">Flytt nedover i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="315"/>
         <source>A&amp;way</source>
-        <translation>&amp;Borte</translation>
+        <translation type="obsolete">&amp;Borte</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="473"/>
         <source>Away Reason</source>
-        <translation>Bortegrunn</translation>
+        <translation type="obsolete">Bortegrunn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="445"/>
         <source>Return Message</source>
         <translation type="obsolete">Tilbake beskjed</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="365"/>
         <source>Away Nick</source>
-        <translation>Kallenavn når du er borte</translation>
+        <translation type="obsolete">Kallenavn når du er borte</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="379"/>
         <source>Auto Away</source>
         <translation type="obsolete">Auto Borte</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Auto away after</source>
         <translation type="obsolete">Auto Borte etter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="415"/>
         <source>minutes</source>
         <translation type="obsolete">minutter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="514"/>
         <source>Advanced</source>
-        <translation>Avansert</translation>
+        <translation type="obsolete">Avansert</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="522"/>
         <source>Ident:</source>
-        <translation>Ident:</translation>
+        <translation type="obsolete">Ident:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="529"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
-        <translation>&quot;Ident&quot; er en del av vertsmasken, og sammen med din vert, vil den identifisere deg unikt innenfor IRC nettverket.</translation>
+        <translation type="obsolete">&quot;Ident&quot; er en del av vertsmasken, og sammen med din vert, vil den identifisere deg unikt innenfor IRC nettverket.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="538"/>
         <source>Messages</source>
-        <translation>Beskjeder</translation>
+        <translation type="obsolete">Beskjeder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="546"/>
         <source>Part Reason:</source>
-        <translation>Forlatgrunn:</translation>
+        <translation type="obsolete">Forlatgrunn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="559"/>
         <source>Quit Reason:</source>
-        <translation>Avsluttgrunn:</translation>
+        <translation type="obsolete">Avsluttgrunn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="569"/>
         <source>Kick Reason:</source>
-        <translation>Sparkgrunn:</translation>
+        <translation type="obsolete">Sparkgrunn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
         <source>Default Away Settings</source>
-        <translation>Standard Borteinnstillinger</translation>
+        <translation type="obsolete">Standard Borteinnstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="362"/>
         <source>Nick to be used when being away</source>
-        <translation>Kallenavn som skal brukes når satt til borte</translation>
+        <translation type="obsolete">Kallenavn som skal brukes når satt til borte</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="352"/>
         <source>Default away reason</source>
-        <translation>Standard bortegrunn</translation>
+        <translation type="obsolete">Standard bortegrunn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="377"/>
         <source>Set away when all clients have detached from the core</source>
-        <translation>Sett til borte når alle klientene har koblet fra Kjernen</translation>
+        <translation type="obsolete">Sett til borte når alle klientene har koblet fra Kjernen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="380"/>
         <source>Away On Detach</source>
-        <translation>Borte ved frakobling</translation>
+        <translation type="obsolete">Borte ved frakobling</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="407"/>
         <source>Override default away reason for auto-away on detach</source>
-        <translation>Overstyr Standard bortegrunn for auto-borte ved frakobling</translation>
+        <translation type="obsolete">Overstyr Standard bortegrunn for auto-borte ved frakobling</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="422"/>
         <source>Not implemented yet</source>
-        <translation>Ikke implementert enda</translation>
+        <translation type="obsolete">Ikke implementert enda</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="425"/>
         <source>Away On Idle</source>
-        <translation>Borte ved uvirksomhet</translation>
+        <translation type="obsolete">Borte ved uvirksomhet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="439"/>
         <source>Set away after</source>
-        <translation>Sett til borte etter</translation>
+        <translation type="obsolete">Sett til borte etter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="449"/>
         <source>minutes of being idle</source>
-        <translation>minutter med uvirksomhet</translation>
+        <translation type="obsolete">minutter med uvirksomhet</translation>
     </message>
 </context>
 <context>
     <name>Identity</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
+        <location filename="../src/common/identity.cpp" line="149"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;empty&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
+        <location filename="../src/common/identity.cpp" line="121"/>
         <source>Quassel IRC User</source>
         <translation>Quassel IRC-Bruker</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
+        <location filename="../src/common/identity.cpp" line="155"/>
         <source>Gone fishing.</source>
         <translation>På fisketur.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="71"/>
         <source>Brought fish.</source>
         <translation type="obsolete">Kjøpte fisk.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
+        <location filename="../src/common/identity.cpp" line="159"/>
         <source>Not here. No, really. not here!</source>
         <translation>Ikke her. Nei, virkelig ikke her!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="77"/>
         <source>Back in action again!</source>
         <translation type="obsolete">Tilbake i aksjon igjen!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
+        <location filename="../src/common/identity.cpp" line="165"/>
         <source>Kindergarten is elsewhere!</source>
         <translation>Barnehagen finner du andre steder!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="84"/>
+        <location filename="../src/common/identity.cpp" line="166"/>
+        <location filename="../src/common/identity.cpp" line="167"/>
         <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
         <translation>http://quassel-irc.org - Chat komfortabelt. Hvor som helst.</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
+        <location filename="../src/common/identity.cpp" line="162"/>
         <source>All Quassel clients vanished from the face of the earth...</source>
         <translation>Alle Quasselklientene forsvant fra jordens overflate...</translation>
     </message>
 </context>
+<context>
+    <name>IdentityEditWidget</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="219"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Avansert</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Last inn en nøkkel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="317"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="328"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Ingen nøkkel lastet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="318"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="365"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="624"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Last inn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="322"/>
+        <source>RSA</source>
+        <translation>RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="325"/>
+        <source>DSA</source>
+        <translation>DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="330"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="369"/>
+        <source>Clear</source>
+        <translation>Tøm</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Last et sertifikat</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="363"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="364"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="662"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Ingen sertifikat lastet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
+        <source>Real Name:</source>
+        <translation>Ekte Navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation>Det &quot;ekte navnet&quot; blir vist i /whois.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="53"/>
+        <source>Nicknames</source>
+        <translation>Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
+        <source>Add Nickname</source>
+        <translation>Legg til Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
+        <source>Remove Nickname</source>
+        <translation>Fjern Kallenavn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Omdøp Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
+        <source>Re&amp;name...</source>
+        <translation>Om&amp;døp...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
+        <source>Move upwards in list</source>
+        <translation>Flytt oppover i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="167"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="181"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="178"/>
+        <source>Move downwards in list</source>
+        <translation>Flytt nedover i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
+        <source>A&amp;way</source>
+        <translation>&amp;Borte</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
+        <source>Default Away Settings</source>
+        <translation>Standard Borteinnstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
+        <source>Nick to be used when being away</source>
+        <translation>Kallenavn som skal brukes når satt til borte</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
+        <source>Default away reason</source>
+        <translation>Standard bortegrunn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Kallenavn når du er borte</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="267"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="296"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Bortegrunn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
+        <source>Set away when all clients have detached from the core</source>
+        <translation>Sett til borte når alle klientene har koblet fra Kjernen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
+        <source>Away On Detach</source>
+        <translation>Borte ved frakobling</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
+        <source>Not implemented yet</source>
+        <translation>Ikke implementert enda</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
+        <source>Away On Idle</source>
+        <translation>Borte ved uvirksomhet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
+        <source>Set away after</source>
+        <translation>Sett til borte etter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
+        <source>minutes of being idle</source>
+        <translation>minutter med uvirksomhet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
+        <source>Ident:</source>
+        <translation>Ident:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
+        <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
+        <translation>&quot;Ident&quot; er en del av vertsmasken, og sammen med din vert, vil den identifisere deg unikt innenfor IRC nettverket.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
+        <source>Messages</source>
+        <translation>Beskjeder</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
+        <source>Part Reason:</source>
+        <translation>Forlatgrunn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
+        <source>Quit Reason:</source>
+        <translation>Avsluttgrunn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
+        <source>Kick Reason:</source>
+        <translation>Sparkgrunn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="487"/>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation>Du trenger en klient som støtter SSL for å redigere din Kjernes SSL nøkkel og sertifikat</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="516"/>
+        <source>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
+        <translation>Advarsel: Du er ikke tilknyttet over en sikker tilknyttning til Quassel Kjernen!
+Å fortsette vil resultere i en ukryptert overføring av din SSL nøkkel og SSL sertifikat!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
+        <source>Continue</source>
+        <translation>Fortsett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
+        <source>Use SSL Key</source>
+        <translation>Bruk SSL nøkkel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
+        <source>Key Type:</source>
+        <translation>Nøkkel type:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
+        <source>Use SSL Certificate</source>
+        <translation>Bruk SSL sertifikat</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
+        <source>Organisation:</source>
+        <translation>Organisasjon:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
+        <source>CommonName:</source>
+        <translation>VanligNavn:</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Konfigurer Identitet</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Standardidentitet</translation>
+    </message>
+</context>
+<context>
+    <name>InputLine</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/inputline.cpp" line="148"/>
+        <source>Do you really want to paste %n lines?</source>
+        <translation>
+            <numerusform>Vil du virkelig lime inn %n linjer?</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="157"/>
+        <source>Paste Protection</source>
+        <translation>Innlimings-beskyttelse</translation>
+    </message>
+</context>
 <context>
     <name>InputWidget</name>
     <message>
@@ -3127,12 +3913,12 @@ NOE PLASS</translation>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="57"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="55"/>
         <source>Focus Input Line</source>
         <translation>Fokus på innskrivningslinjen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="58"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="56"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
@@ -3140,25 +3926,31 @@ NOE PLASS</translation>
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="49"/>
         <source>Introduction</source>
         <translation type="obsolete">Introduksjon</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="obsolete">Denne veiviseren vil guide deg gjennom innstillings prosessen for din skinnende nye Quassel IRC Klient.</translation>
     </message>
 </context>
+<context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Lagre &amp;&amp; koble til</translation>
+    </message>
+</context>
 <context>
     <name>IrcListModel</name>
     <message>
-        <location filename="../src/client/irclistmodel.cpp" line="60"/>
+        <location filename="../src/client/irclistmodel.cpp" line="59"/>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
-        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <location filename="../src/client/irclistmodel.cpp" line="60"/>
         <source>Users</source>
         <translation>Brukere</translation>
     </message>
@@ -3171,157 +3963,174 @@ NOE PLASS</translation>
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="194"/>
         <source>Received invalid MODE from %s: %s</source>
         <translation type="obsolete">Mottok ugyldig MODE fra %s: %s</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="462"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="476"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 har endret emne for %2 til: &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="568"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="582"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
         <translation>[Whois] %1 er borte: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="579"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="588"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="593"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 er borte: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="654"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="666"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="668"/>
         <source>[Whois] %1 is %2 (%3)</source>
         <translation>[Whois] %1 er %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="669"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="683"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 is online via %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="780"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="637"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="651"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="685"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="762"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="794"/>
         <source>[Whois] %1</source>
         <translation>[Whois] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="931"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="687"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="965"/>
         <source>[Whowas] %1</source>
         <translation>[Whowas] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="699"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
         <source>[Whowas] %1 was %2 (%3)</source>
         <translation>[Whowas] %1 var %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="727"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Slutt på /WHO listen for %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="733"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="747"/>
         <source>[Whois] %1 is logged in since %2</source>
         <translation>[Whois] %1 er logget inn siden %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="749"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
         <translation>[Whois] %1 har vært inaktiv for %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="738"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="752"/>
         <source>[Whois] idle message: %1</source>
         <translation>[Whois] inaktiv beskjed: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="770"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="784"/>
         <source>[Whois] %1 is a user on channels: %2</source>
         <translation>[Whois] %1 er en bruker på kanalene: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="786"/>
         <source>[Whois] %1 has voice on channels: %2</source>
         <translation>[Whois] %1 har stemme på kanalene: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="788"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
         <translation>[Whois] %1 er en operatør på kanalene: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="841"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
+        <source>Homepage for %1 is %2</source>
+        <translation>Hjemmeside for %1 er %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="861"/>
+        <source>Channel %1 created on %2</source>
+        <translation>Kanal %1 opprettet %2</translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="875"/>
         <source>No topic is set for %1.</source>
         <translation>Inget emne satt for %1.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="856"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="890"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Emne for %1 er &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="867"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="901"/>
         <source>Topic set by %1 on %2</source>
         <translation>Emne satt av %1 på %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="890"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="924"/>
         <source>[Who] %1</source>
         <translation>[Who] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="944"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation>Det er et Kallenavn i din identitetskallanavnsliste som inneholder ugyldige karakterer</translation>
+        <translation type="obsolete">Det er et Kallenavn i din identitetskallanavnsliste som inneholder ugyldige karakterer</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="945"/>
         <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
-        <translation>Grunnet en bug i Unreal IRCd (og kanskje andre irc-tjenere også) klarte vi ikke å avgjøre et feilbetjeningskallenavn</translation>
+        <translation type="obsolete">Grunnet en bug i Unreal IRCd (og kanskje andre irc-tjenere også) klarte vi ikke å avgjøre et feilbetjeningskallenavn</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="946"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Vennligst bruk: /nick &lt;annet_kallenavn&gt; for å fortsette, eller rydd opp i kallenavnslisten din</translation>
+        <translation type="obsolete">Vennligst bruk: /nick &lt;annet_kallenavn&gt; for å fortsette, eller rydd opp i kallenavnslisten din</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="949"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="983"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Kallenavn %1 inneholder ugyldige tegn</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="961"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="994"/>
         <source>Nick already in use: %1</source>
         <translation>Kallenavnet er allerede i bruk: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="984"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="1019"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation>Ingen ledige, eller gyldige kallenavn i kallanavnslisten ble funnet. Bruk /nick &lt;annet_kallenavn&gt; for å fortsette</translation>
     </message>
     <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
         <location filename="../src/core/ircserverhandler.cpp" line="533"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="540"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="547"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="802"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="816"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>Kanal %1 har %2 brukere. Emnet er: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="811"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="825"/>
         <source>End of channel list</source>
         <translation>Slutt på kanallisten</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="487"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="501"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>Mottok RPL_ISUPPORT (005) uten parametere</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="495"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="509"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>Mottok ikke RFC støttet RPL_ISUPPORT: dette kan føre til uventet oppførsel!</translation>
     </message>
@@ -3329,17 +4138,17 @@ NOE PLASS</translation>
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="723"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>inaktiv siden %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="726"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>Tid for pålogging: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="729"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>tjener: %1</translation>
     </message>
@@ -3347,17 +4156,14 @@ NOE PLASS</translation>
 <context>
     <name>MainWidget</name>
     <message>
-        <location filename="../src/qtopia/ui/mainwidget.ui" line="13"/>
         <source>Form</source>
         <translation type="obsolete">Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/mainwidget.ui" line="56"/>
         <source>background-color: rgba(220, 220, 255, 40%)</source>
         <translation type="obsolete">background-color: rgba(220, 220, 255, 40%)</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:10pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -3370,503 +4176,480 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="105"/>
         <source>Waiting for core...</source>
         <translation type="obsolete">Venter på kjernen...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="551"/>
+        <location filename="../src/qtui/mainwin.cpp" line="679"/>
         <source>Not connected to core.</source>
         <translation>Ikke koblet til kjernen.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="178"/>
         <source>Edit &amp;Networks...</source>
-        <translation>Rediger &amp;Nettverk...</translation>
+        <translation type="obsolete">Rediger &amp;Nettverk...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="177"/>
         <source>All Buffers</source>
         <translation type="obsolete">Alle Buffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="178"/>
         <source>All Channels</source>
         <translation type="obsolete">Alle Kanaler</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="179"/>
         <source>All Queries</source>
         <translation type="obsolete">Alle Spørringer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="180"/>
         <source>All Networks</source>
         <translation type="obsolete">Alle Nettverk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="181"/>
         <source>Full Custom</source>
         <translation type="obsolete">Full tilpassning</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="329"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Nicks</source>
         <translation>Kallenavn</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="349"/>
+        <location filename="../src/qtui/mainwin.cpp" line="461"/>
         <source>Chat Monitor</source>
         <translation>Skravlemonitor</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="364"/>
+        <location filename="../src/qtui/mainwin.cpp" line="476"/>
         <source>Inputline</source>
         <translation>Skrivelinje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="384"/>
+        <location filename="../src/qtui/mainwin.cpp" line="496"/>
         <source>Topic</source>
         <translation>Emne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="495"/>
+        <location filename="../src/qtui/mainwin.cpp" line="609"/>
         <source>Connected to core.</source>
         <translation>Koblet til kjernen.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="13"/>
         <source>MainWindow</source>
         <translation type="obsolete">HovedVindu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="215"/>
+        <location filename="../src/qtui/mainwin.cpp" line="298"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="220"/>
+        <location filename="../src/qtui/mainwin.cpp" line="311"/>
         <source>&amp;Networks</source>
         <translation>&amp;Nettverk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="235"/>
+        <location filename="../src/qtui/mainwin.cpp" line="332"/>
         <source>&amp;Settings</source>
         <translation>&amp;Innstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="77"/>
         <source>&amp;Views</source>
         <translation type="obsolete">&amp;Visninger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="238"/>
+        <location filename="../src/qtui/mainwin.cpp" line="339"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="94"/>
         <source>&amp;Debug</source>
         <translation type="obsolete">Feil&amp;søk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="124"/>
         <source>&amp;Network List...</source>
         <translation type="obsolete">&amp;Nettverks liste...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="127"/>
         <source>F2</source>
         <translation type="obsolete">F2</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="135"/>
         <source>Quick &amp;Connect...</source>
         <translation type="obsolete">Hurtig&amp;tilkobling...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="255"/>
         <source>Disconnect</source>
         <translation type="obsolete">Koble fra</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="151"/>
         <source>Reconnect</source>
         <translation type="obsolete">Koble til på nytt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="159"/>
         <source>Join Channel...</source>
         <translation type="obsolete">Bli med i Kanal...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="170"/>
         <source>Set Away globally</source>
         <translation type="obsolete">Sett Borte globalt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
         <source>Quit...</source>
         <translation type="obsolete">Avslutt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="190"/>
         <source>Edit Identities...</source>
         <translation type="obsolete">Rediger identiteter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="199"/>
         <source>Configure Quassel...</source>
         <translation type="obsolete">Konfigurere Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="197"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="217"/>
         <source>Manage Views...</source>
         <translation type="obsolete">Administrer Visninger...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="222"/>
         <source>About Qt...</source>
         <translation type="obsolete">Om Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="237"/>
         <source>About Quassel IRC...</source>
         <translation type="obsolete">Om Quassel IRC...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="245"/>
         <source>Import Backlog</source>
         <translation type="obsolete">Importer Historikk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="250"/>
         <source>Connect</source>
         <translation type="obsolete">Koble til</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="260"/>
         <source>Internal</source>
         <translation type="obsolete">Internt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="272"/>
         <source>Disconnect from Core</source>
         <translation type="obsolete">Koble fra Kjernen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="284"/>
         <source>Connect to Core...</source>
         <translation type="obsolete">Koble til Kjerne...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="289"/>
         <source>Debug &amp;Console</source>
         <translation type="obsolete">Feilsøkings&amp;konsoll</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
         <source>Disconnect from Network...</source>
         <translation type="obsolete">Koble fra Nettverk...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="281"/>
         <source>&amp;Edit Networks...</source>
         <translation type="obsolete">&amp;Rediger Nettverk...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="354"/>
         <source>Statusbar</source>
         <translation type="obsolete">Statuslinje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="81"/>
         <source>Buffer Views</source>
         <translation type="obsolete">Buffer visninger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
         <source>Manage Buffer Views</source>
         <translation type="obsolete">Administrer Buffer visninger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="311"/>
         <source>Lock Dock Positions</source>
         <translation type="obsolete">Lås Dock posisjonene</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <location filename="../src/qtui/mainwin.cpp" line="347"/>
         <source>Debug</source>
         <translation>Feilsøk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="329"/>
         <source>Core Info</source>
         <translation type="obsolete">Kjerne Info</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="334"/>
         <source>NetworkModel</source>
         <translation type="obsolete">NettverksModell</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="514"/>
         <source>Core Lag: %1 msec</source>
-        <translation>Kjerneforsinkelse: %1 ms</translation>
+        <translation type="obsolete">Kjerneforsinkelse: %1 ms</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="172"/>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
         <source>&amp;Connect to Core...</source>
         <translation>&amp;Koble til kjerne...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="174"/>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
         <source>&amp;Disconnect from Core</source>
         <translation>K&amp;oble fra kjernen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="176"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Core &amp;Info...</source>
         <translation>Kjerne&amp;info</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="180"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
+        <source>Configure &amp;Networks...</source>
+        <translation>Rediger &amp;Nettverk...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avslutt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="181"/>
+        <location filename="../src/qtui/mainwin.cpp" line="261"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="184"/>
         <source>&amp;Manage Buffer Views...</source>
-        <translation>Administrer &amp;buffervisninger</translation>
+        <translation type="obsolete">Administrer &amp;buffervisninger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="186"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>&amp;Lås Dock posisjonene</translation>
+        <translation type="obsolete">&amp;Lås Dock posisjonene</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="190"/>
+        <location filename="../src/qtui/mainwin.cpp" line="271"/>
         <source>Show &amp;Search Bar</source>
         <translation>Vis &amp;Søkelinje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="191"/>
+        <location filename="../src/qtui/mainwin.cpp" line="272"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="192"/>
+        <location filename="../src/qtui/mainwin.cpp" line="275"/>
         <source>Show Status &amp;Bar</source>
         <translation>Vis &amp;Statuslinje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="196"/>
+        <location filename="../src/qtui/mainwin.cpp" line="279"/>
         <source>&amp;Configure Quassel...</source>
         <translation>Konfi&amp;gurere Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="200"/>
         <source>&amp;About Quassel...</source>
-        <translation>O&amp;m Quassel</translation>
+        <translation type="obsolete">O&amp;m Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="202"/>
         <source>About &amp;Qt...</source>
-        <translation>O&amp;m Qt...</translation>
+        <translation type="obsolete">O&amp;m Qt...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="264"/>
+        <source>&amp;Configure Buffer Views...</source>
+        <translation>Konfigurer &amp;buffervisninger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
+        <source>&amp;Lock Layout</source>
+        <translation>&amp;Lås oppsett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="273"/>
+        <source>Show Away Log</source>
+        <translation>Vis Borte-loggen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="283"/>
+        <source>&amp;About Quassel</source>
+        <translation>&amp;Om Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="204"/>
+        <location filename="../src/qtui/mainwin.cpp" line="285"/>
+        <source>About &amp;Qt</source>
+        <translation>About &amp;Qt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Debug &amp;NettverksModell</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="206"/>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
         <source>Debug &amp;MessageModel</source>
         <translation>Debug &amp;Beskjedmodell</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="208"/>
+        <location filename="../src/qtui/mainwin.cpp" line="291"/>
         <source>Debug &amp;Log</source>
         <translation>Debug &amp;Logg</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="226"/>
+        <location filename="../src/qtui/mainwin.cpp" line="317"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="227"/>
+        <location filename="../src/qtui/mainwin.cpp" line="318"/>
         <source>&amp;Buffer Views</source>
         <translation>&amp;Buffervisninger:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="338"/>
+        <location filename="../src/qtui/mainwin.cpp" line="320"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Verktøylinjer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="450"/>
         <source>Show Nick List</source>
         <translation>Vis &amp;kallenavnliste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="360"/>
+        <location filename="../src/qtui/mainwin.cpp" line="472"/>
         <source>Show Chat Monitor</source>
         <translation>Vis &amp;Skravlemonitor</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="373"/>
+        <location filename="../src/qtui/mainwin.cpp" line="485"/>
         <source>Show Input Line</source>
         <translation>Vis &amp;Innskrivningslinjen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="396"/>
+        <location filename="../src/qtui/mainwin.cpp" line="508"/>
         <source>Show Topic Line</source>
         <translation>Vis &amp;Emnelinjen</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="643"/>
+        <source>Core Lag: %1</source>
+        <translation>Kjerneforsinkelse: %1</translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../src/common/message.cpp" line="105"/>
         <source>%DT[%1]</source>
         <translation type="obsolete">%DT[%1]</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="110"/>
         <source>%DS&lt;%1&gt;</source>
         <translation type="obsolete">%DS&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="110"/>
         <source>%D0%1</source>
         <translation type="obsolete">%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn[%1]</source>
         <translation type="obsolete">%Dn[%1]</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn%1</source>
         <translation type="obsolete">%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds*</source>
         <translation type="obsolete">%Ds*</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds%1</source>
         <translation type="obsolete">%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="116"/>
         <source>%De*</source>
         <translation type="obsolete">%De*</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="151"/>
         <source>%De%1</source>
         <translation type="obsolete">%De%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj--&gt;</source>
         <translation type="obsolete">%Dj--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation type="obsolete">%Dj%DN%1%DN %DH(%2@%3)%DH har blitt med i %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp&lt;--</source>
         <translation type="obsolete">%Dp&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation type="obsolete">%Dp%DN%1%DN %DH(%2@%3)%DH har forlatt %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq&lt;--</source>
         <translation type="obsolete">%Dq&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
         <translation type="obsolete">%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH har avsluttet</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="128"/>
         <source>%Dk&lt;-*</source>
         <translation type="obsolete">%Dk&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="132"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation type="obsolete">%Dk%DN%1%DN har sparket %DN%2%DN fra %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="137"/>
         <source>%Dr&lt;-&gt;</source>
         <translation type="obsolete">%Dr&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="138"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation type="obsolete">%DrDu er nå kjent som %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="139"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation type="obsolete">%Dr%DN%1%DN er nå kjent som %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="142"/>
         <source>%Dm***</source>
         <translation type="obsolete">%Dm***</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="143"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation type="obsolete">%DmBruker modus: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="144"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation type="obsolete">%DmModus %DM%1%DM av %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="147"/>
         <source>%Da-*-</source>
         <translation type="obsolete">%Da-*-</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="148"/>
         <source>%Da%DN%1%DN %2</source>
         <translation type="obsolete">%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="152"/>
         <source>%De[%1]</source>
         <translation type="obsolete">%De[%1]</translation>
     </message>
+    <message>
+        <location filename="../src/common/message.h" line="68"/>
+        <source>Day changed to %1</source>
+        <translation>Dagen er nå %1</translation>
+    </message>
 </context>
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="370"/>
+        <location filename="../src/client/messagemodel.cpp" line="361"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Spør etter %1 beskjeder fra historikken for buffer %2.%3</translation>
     </message>
@@ -3880,36 +4663,83 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Mottar historikken</translation>
+    </message>
+    <message>
         <source>Processing Messages</source>
-        <translation>Behandler beskjeder</translation>
+        <translation type="obsolete">Behandler beskjeder</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkAddDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="13"/>
+        <source>Add Network</source>
+        <translation>Legg til nettverk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="21"/>
+        <source>Use preset:</source>
+        <translation>Bruk forhåndsdefinert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="56"/>
+        <source>Manually specify network settings</source>
+        <translation>Spesifiser nettverksinnstillingene manuelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="66"/>
+        <source>Manual Settings</source>
+        <translation>Manuelle innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="74"/>
+        <source>Network name:</source>
+        <translation>Nettverksnavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="84"/>
+        <source>Server address:</source>
+        <translation>Tjeneradresse:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="94"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="114"/>
+        <source>Server password:</source>
+        <translation>Tjener passord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="130"/>
+        <source>Use secure connection</source>
+        <translation>Bruk sikker tilkobling</translation>
     </message>
 </context>
 <context>
     <name>NetworkConnection</name>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="194"/>
         <source>Connection failed. Cycling to next Server</source>
-        <translation>Greide ikke å koble til. Prøver neste tjener.</translation>
+        <translation type="obsolete">Greide ikke å koble til. Prøver neste tjener.</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="204"/>
         <source>Connecting to %1:%2...</source>
-        <translation>Kobler til %1:%2...</translation>
+        <translation type="obsolete">Kobler til %1:%2...</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="260"/>
         <source>Disconnecting.</source>
-        <translation>Kobler fra.</translation>
+        <translation type="obsolete">Kobler fra.</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="286"/>
         <source>Could not connect to %1 (%2)</source>
-        <translation>Kunne ikke koble til %1 (%2)</translation>
+        <translation type="obsolete">Kunne ikke koble til %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="288"/>
         <source>Connection failure: %1</source>
-        <translation>Tilkoblingsfeil: %1</translation>
+        <translation type="obsolete">Tilkoblingsfeil: %1</translation>
     </message>
 </context>
 <context>
@@ -3925,7 +4755,7 @@ p, li { white-space: pre-wrap; }
         <translation>Skriv inn et nettverksnavn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="647"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="705"/>
         <source>Add Network</source>
         <translation>Legg til nettverk</translation>
     </message>
@@ -3933,17 +4763,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="167"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Tjener: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="168"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Brukere: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="171"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Forsinkelse: %1 ms</translation>
     </message>
@@ -3951,17 +4781,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="748"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Buffer</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="748"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Emne</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="748"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Antall kallenavn</translation>
     </message>
@@ -3969,255 +4799,269 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkModelActionProvider</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="39"/>
         <source>Connect</source>
-        <translation>Koble til</translation>
+        <translation type="obsolete">Koble til</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
         <source>Disconnect</source>
-        <translation>Koble fra</translation>
+        <translation type="obsolete">Koble fra</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="42"/>
         <source>Join</source>
-        <translation>Bli med</translation>
+        <translation type="obsolete">Bli med</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
         <source>Part</source>
-        <translation>Forlat</translation>
+        <translation type="obsolete">Forlat</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
         <source>Delete Buffer...</source>
-        <translation>Slett buffer...</translation>
+        <translation type="obsolete">Slett buffer...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
         <source>Show Buffer</source>
-        <translation>Vis buffer...</translation>
+        <translation type="obsolete">Vis buffer...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="47"/>
         <source>Joins</source>
-        <translation>Tilknytninger</translation>
+        <translation type="obsolete">Tilknytninger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
         <source>Parts</source>
-        <translation>Frakoblinger</translation>
+        <translation type="obsolete">Frakoblinger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
         <source>Quits</source>
-        <translation>Avsluttelser</translation>
+        <translation type="obsolete">Avsluttelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
         <source>Nick Changes</source>
-        <translation>Kallenavnsendringer</translation>
+        <translation type="obsolete">Kallenavnsendringer</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
         <source>Mode Changes</source>
-        <translation>Modusendringer</translation>
+        <translation type="obsolete">Modusendringer</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Day Changes</source>
-        <translation>Dagendringer</translation>
+        <translation type="obsolete">Dagendringer</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
         <source>Apply to All Chat Views...</source>
-        <translation>Bruk på alle skravlevisninger...</translation>
+        <translation type="obsolete">Bruk på alle skravlevisninger...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="55"/>
         <source>Join Channel...</source>
-        <translation>Bli med i kanal...</translation>
+        <translation type="obsolete">Bli med i kanal...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="57"/>
         <source>Start Query</source>
-        <translation>Start samtale</translation>
+        <translation type="obsolete">Start samtale</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="58"/>
         <source>Show Query</source>
-        <translation>Vis samtale</translation>
+        <translation type="obsolete">Vis samtale</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
         <source>Whois</source>
-        <translation>Informasjon</translation>
+        <translation type="obsolete">Informasjon</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="61"/>
         <source>Version</source>
-        <translation>Versjon</translation>
+        <translation type="obsolete">Versjon</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="62"/>
         <source>Time</source>
-        <translation>Tid</translation>
+        <translation type="obsolete">Tid</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
         <source>Ping</source>
-        <translation>Ping</translation>
+        <translation type="obsolete">Ping</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
         <source>Finger</source>
-        <translation>Finger</translation>
+        <translation type="obsolete">Finger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
         <source>Give Operator Status</source>
-        <translation>Gi operatørstatus</translation>
+        <translation type="obsolete">Gi operatørstatus</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="67"/>
         <source>Take Operator Status</source>
-        <translation>Ta operatørstatus</translation>
+        <translation type="obsolete">Ta operatørstatus</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Give Voice</source>
-        <translation>Gi stemme</translation>
+        <translation type="obsolete">Gi stemme</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Take Voice</source>
-        <translation>Ta stemme</translation>
+        <translation type="obsolete">Ta stemme</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Kick From Channel</source>
-        <translation>Spark ut av kanal</translation>
+        <translation type="obsolete">Spark ut av kanal</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
         <source>Ban From Channel</source>
-        <translation>Bannlys fra kanal</translation>
+        <translation type="obsolete">Bannlys fra kanal</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
         <source>Kick &amp;&amp; Ban</source>
-        <translation>Spark og bannlys</translation>
+        <translation type="obsolete">Spark og bannlys</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
         <source>Hide Buffer(s) Temporarily</source>
-        <translation>Sjule buffere midlertidig</translation>
+        <translation type="obsolete">Sjule buffere midlertidig</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="75"/>
         <source>Hide Buffer(s) Permanently</source>
-        <translation>Sjule buffere permanent</translation>
+        <translation type="obsolete">Sjule buffere permanent</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
         <source>Show Channel List</source>
-        <translation>Vis kanallisten</translation>
+        <translation type="obsolete">Vis kanallisten</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
         <source>Show Ignore List</source>
-        <translation>Vis ignoreringslisten</translation>
+        <translation type="obsolete">Vis ignoreringslisten</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="92"/>
         <source>Hide Events</source>
-        <translation>Skjul hendelser</translation>
+        <translation type="obsolete">Skjul hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="100"/>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="112"/>
         <source>Actions</source>
-        <translation>Hendelser</translation>
+        <translation type="obsolete">Hendelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="458"/>
         <source>Remove buffer permanently?</source>
-        <translation>Slett buffer permanent?</translation>
+        <translation type="obsolete">Slett buffer permanent?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="460"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
-        <translation>Vil du slette bufferet &quot;%1&quot; permanent? Dette vil slette alle relaterte data, inkludert all historikkdata, fra databasen til kjernen!</translation>
+        <translation type="obsolete">Vil du slette bufferet &quot;%1&quot; permanent? Dette vil slette alle relaterte data, inkludert all historikkdata, fra databasen til kjernen!</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="521"/>
         <source>Join Channel</source>
-        <translation>Bli med i kanal</translation>
+        <translation type="obsolete">Bli med i kanal</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="521"/>
         <source>Input channel name:</source>
-        <translation>Skriv inn kanalnavnet:</translation>
+        <translation type="obsolete">Skriv inn kanalnavnet:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="152"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation>
+            <numerusform>Vil du virkelig slette følgende buffer(e) permanent?</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation>&lt;b&gt;Merk:&lt;/b&gt; Dette vil slette alle relaterte data, inklusiv all historikk data fra Kjernens database og kan ikke bli angret.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation>&lt;br&gt;Aktive kanal buffer kan ikke bli slettet, vennligst forlat kanalen først.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
+        <source>Remove buffers permanently?</source>
+        <translation>Slette buffer permanent?</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Join Channel</source>
+        <translation>Bli med i kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="423"/>
+        <source>Network:</source>
+        <translation>Nettverk:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="425"/>
+        <source>Channel:</source>
+        <translation>Kanal:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Konfigurer Nettverkstilkoblinger</translation>
     </message>
 </context>
 <context>
     <name>NetworksSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Generelt</translation>
+        <translation type="obsolete">Generelt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="155"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
         <translation>&lt;b&gt;Følgende problemer må bli rettet før dine endringer kan blir påført:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="156"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;Må definere minst en tjener på alle nettverk&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="157"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="158"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Ugyldige Nettverksinnstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="195"/>
         <source>Connect</source>
-        <translation>Koble til</translation>
+        <translation type="obsolete">Koble til</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="198"/>
         <source>Disconnect</source>
-        <translation>Koble fra</translation>
+        <translation type="obsolete">Koble fra</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="202"/>
         <source>Apply first!</source>
-        <translation>Bruk først!</translation>
+        <translation type="obsolete">Bruk først!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="544"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="542"/>
         <source>Delete Network?</source>
         <translation>Slette Nettverk?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="543"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation>Vil du virkelig slette nettverket &quot;%1&quot; og alle relaterte innstillinger, inkludert historikken?</translation>
     </message>
@@ -4227,215 +5071,231 @@ p, li { white-space: pre-wrap; }
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="47"/>
         <source>Re&amp;name...</source>
         <translation>Om&amp;døp...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="217"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="64"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
         <source>&amp;Add...</source>
         <translation>&amp;Legg til...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="87"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
         <source>De&amp;lete</source>
         <translation>&amp;Slett</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
-        <translation>Koble til nå</translation>
+        <translation type="obsolete">Koble til nå</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="123"/>
         <source>Network Details</source>
         <translation>Nettverksdetaljer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="131"/>
         <source>Identity:</source>
         <translation>Identitet:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="516"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="654"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="668"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Dette spesifiserer hvordan kontrollbeskjeder, kallenavn og tjenernavn blir kodet.
 Med mindre du *virkelig* vet hva du gjør, la denne stå til ISO-8859-1!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="170"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="189"/>
         <source>Servers</source>
         <translation>Tjenere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="199"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="216"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Rediger...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
         <source>Move upwards in list</source>
         <translation>Flytt opp i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="148"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="280"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="294"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="274"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="291"/>
         <source>Move downwards in list</source>
         <translation>Flytt ned i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="323"/>
         <source>Choose random server for connecting</source>
-        <translation>Velg en tilfeldig tjener for tilkobling</translation>
+        <translation type="obsolete">Velg en tilfeldig tjener for tilkobling</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Perform</source>
-        <translation>Utfør</translation>
+        <translation type="obsolete">Utfør</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="340"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="345"/>
         <source>Commands to execute on connect:</source>
         <translation>Kommandoer som skal utføres ved tilkobling:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="364"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="500"/>
         <source>Auto Identify</source>
         <translation>Autoidentifiser</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Service:</source>
         <translation>Tjeneste:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
         <source>NickServ</source>
         <translation>NickServ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="406"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="542"/>
         <source>Password:</source>
         <translation>Passord:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="417"/>
         <source>Advanced</source>
-        <translation>Avansert</translation>
+        <translation type="obsolete">Avansert</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="432"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="566"/>
         <source>Encodings</source>
         <translation>Koding</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="596"/>
         <source>Send messages in:</source>
         <translation>Send beskjeder i:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="431"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.</source>
         <translation type="obsolete">Innkommende beskjeder kodet i UTF8 vil alltid blir behandlet slik. Denne innstillinger definerer kodingen av beskjeder som ikke er UTF8.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="475"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="627"/>
         <source>Receive fallback:</source>
         <translation>Mottareserve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="506"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="658"/>
         <source>Server encoding:</source>
         <translation>Tjenerkoding:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Use defaults</source>
-        <translation>Bruk standard</translation>
+        <translation type="obsolete">Bruk standard</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="551"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="385"/>
         <source>Automatic Reconnect</source>
         <translation>Automatisk gjenoppkobling</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
         <source>Interval:</source>
         <translation>Intervall:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="403"/>
         <source> s</source>
         <translation> s</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="585"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="419"/>
         <source>Retries:</source>
         <translation>Forsøk:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="605"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="439"/>
         <source>Unlimited</source>
         <translation>Ubegrenset</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="617"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="464"/>
         <source>Rejoin all channels on reconnect</source>
         <translation>gjenoppkoble medlemskapet i alle kanaler ved gjenoppkobling</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="192"/>
         <source>Manage servers for this network</source>
         <translation>Administrer tjenere for dette nettverket</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="334"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="336"/>
+        <source>Commands</source>
+        <translation>Kommandoer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="339"/>
         <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
         <translation>Konfigurer automatisk identifikasjon, eller forskjellige kommandoer som skal kjøres etter tilkoblin til en tjener</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="361"/>
         <source>Specify a list of IRC commands to be executed upon connect.
 Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
         <translation>Spesifiser en list av IRC kommandoer som skal kjøres ved tilkobling.
 Husk at Quassel IRC automatisk gjenoppkobler til kanaler, så /join trengs sjeldent her!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="373"/>
+        <source>Connection</source>
+        <translation>Tilkobling</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
         <source>Configure advanced settings such as message encodings and automatic reconnect</source>
         <translation>Konfigurer avanserte innstillinger, slik som beskjed koding og automatisk gjenoppkobling</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="429"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="578"/>
         <source>Control encodings for in- and outgoing messages</source>
         <translation>Kontroller koding for inn- og utgående beskjeder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="460"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="581"/>
+        <source>Use Custom Encodings</source>
+        <translation>Bruk tilpasset koding</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="592"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="612"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
         <translation>Spefiser hvilken koding dine beskjed skal bli sendt i.
 UTF-8 burde være det fornuftigste for de fleste nettverk.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="623"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="643"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</source>
         <translation>Innkommende beskjeder som er kodet i Utf8 vil alltid bli behandlet slik.
 Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="529"/>
         <source>Use default settings for encodings (recommended)</source>
-        <translation>Bruk standard innstillinger for kodinger (anbefalt)</translation>
+        <translation type="obsolete">Bruk standard innstillinger for kodinger (anbefalt)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="548"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="382"/>
         <source>Control automatic reconnect to the network</source>
         <translation>Kontroller automatisk gjenoppkobling til nettverket</translation>
     </message>
@@ -4443,7 +5303,7 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="507"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="420"/>
         <source>Add Nickname</source>
         <translation>Legg til kallenavn</translation>
     </message>
@@ -4466,7 +5326,6 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>NickListWidget</name>
     <message>
-        <location filename="../src/qtopia/ui/nicklistwidget.ui" line="13"/>
         <source>Nicks in Channel</source>
         <translation type="obsolete">Kallenavn i Kanal</translation>
     </message>
@@ -4474,82 +5333,66 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>NickView</name>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="100"/>
         <source>WHOIS</source>
         <translation type="obsolete">WHOIS</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="101"/>
         <source>VERSION</source>
         <translation type="obsolete">VERSION</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="102"/>
         <source>PING</source>
         <translation type="obsolete">PING</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="106"/>
         <source>Modes</source>
         <translation type="obsolete">Modes</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="107"/>
         <source>Op %1</source>
         <translation type="obsolete">Op %1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="108"/>
         <source>Deop %1</source>
         <translation type="obsolete">Deop %1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="109"/>
         <source>Voice %1</source>
         <translation type="obsolete">Voice %1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="110"/>
         <source>Devoice %1</source>
         <translation type="obsolete">Devoice %1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="112"/>
         <source>Kick/Ban</source>
         <translation type="obsolete">Kick/Ban</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="113"/>
         <source>Kick %1</source>
         <translation type="obsolete">Kick %1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="115"/>
         <source>Kickban %1</source>
         <translation type="obsolete">Kickban %1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="116"/>
         <source>Ignore</source>
         <translation type="obsolete">Ignore</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="121"/>
         <source>Query</source>
         <translation type="obsolete">Query</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="122"/>
         <source>DCC-Chat</source>
         <translation type="obsolete">DCC-Chat</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="124"/>
         <source>Send file</source>
         <translation type="obsolete">Send fil</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="114"/>
         <source>Ban %1</source>
         <translation type="obsolete">Ban %1</translation>
     </message>
@@ -4557,9 +5400,8 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>NotificationsSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Oppførsel</translation>
+        <translation type="obsolete">Oppførsel</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
@@ -4567,108 +5409,132 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
         <translation>Informative beskjeder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
         <source>Form</source>
         <translation type="obsolete">Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="19"/>
         <source>System Tray</source>
         <translation type="obsolete">Systemstatusfelt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="25"/>
         <source>Animate tray icon</source>
         <translation type="obsolete">Animer kurv ikon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="35"/>
         <source>Show Bubble</source>
         <translation type="obsolete">Vis Bobble</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="45"/>
         <source>Sends Quassel&apos;s notifications to a notification daemon compliant to Freedesktop&apos;s Notification specification (org.freedesktop.Notification).</source>
         <translation type="obsolete">Sender Quassels informative beskjeder til en beskjed tjeneste i henhold til Freedesktop Notification spesifikasjonen (org.freedesktop.Notification).</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="48"/>
         <source>Desktop Notification (via DBus)</source>
         <translation type="obsolete">Skrivebords beskjed (via DBus)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="59"/>
         <source>Timeout</source>
         <translation type="obsolete">Timeout</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="79"/>
         <source>X</source>
         <translation type="obsolete">X</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="93"/>
         <source>Y</source>
         <translation type="obsolete">Y</translation>
     </message>
 </context>
+<context>
+    <name>PhononNotificationBackend::ConfigWidget</name>
+    <message>
+        <location filename="../src/qtui/phononnotificationbackend.cpp" line="143"/>
+        <source>Select Audio File</source>
+        <translation>Velg Lydfil</translation>
+    </message>
+</context>
+<context>
+    <name>PhononNotificationConfigWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/phononnotificationconfigwidget.ui" line="13"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/phononnotificationconfigwidget.ui" line="19"/>
+        <source>Audio Notification (via Phonon)</source>
+        <translation>Lydvarsel (via Phonon)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/phononnotificationconfigwidget.ui" line="28"/>
+        <source>Play File:</source>
+        <translation>Spill fil:</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
-        <translation type="unfinished">Henter totalt opp til %1 historikkbeskjeder for %2 buffere</translation>
+        <translation>Henter totalt opp til %1 historikkbeskjeder for %2 buffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="520"/>
         <source>Copy to Clipboard</source>
         <translation type="obsolete">Kopier til Utklippstavlen</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="78"/>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
         <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
         <translation>Henter opp til %1 av alle uleste historikkmeldinger (pluss %2 tilleggsmeldinger)</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="96"/>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
         <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
         <translation>Henter totalt opp til %1 uleste historimeldinger for %2 buffere.</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Velkommen til Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="58"/>
+        <source>This wizard will help you to set up your default identity and your IRC network connection.&lt;br&gt;This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes.</source>
+        <translation>Denne veiviseren vil hjelpe deg med å konfigurere din standardidentitet og dine IRC nettverkstilkoblinger.&lt;br&gt;Den tar for seg kun de enkleste innstillingene. Du kan avbryte denne veiviseren når som helst og benytte innstillings dialogboksen for mer detaljerte endringer.</translation>
+    </message>
 </context>
 <context>
     <name>QtopiaMainWin</name>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="74"/>
         <source>Show Toolbar</source>
         <translation type="obsolete">Vis Verktøylinje</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
         <source>Quit Quassel IRC?</source>
         <translation type="obsolete">Avslutte Quassel IRC?</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
         <source>Do you really want to quit Quassel IRC?</source>
         <translation type="obsolete">Vil du virkelig avslutte Quassel IRC?</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="108"/>
         <source>Quit</source>
         <translation type="obsolete">Avslutt</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="119"/>
         <source>Show Buffers</source>
         <translation type="obsolete">Vis Buffere</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="120"/>
         <source>Show Nicks</source>
         <translation type="obsolete">Vis Kallenavn</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="129"/>
         <source>About...</source>
         <translation type="obsolete">Om...</translation>
     </message>
@@ -4676,40 +5542,38 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>Quassel</name>
     <message>
-        <location filename="../src/common/quassel.cpp" line="64"/>
         <source>Enable debug output</source>
-        <translation>Aktiver feilsøkingsutdata</translation>
+        <translation type="obsolete">Aktiver feilsøkingsutdata</translation>
     </message>
     <message>
-        <location filename="../src/common/quassel.cpp" line="65"/>
         <source>Display this help and exit</source>
-        <translation>Vis denne hjelpen og avslutt</translation>
+        <translation type="obsolete">Vis denne hjelpen og avslutt</translation>
     </message>
 </context>
 <context>
     <name>Quassel::secondsToString()</name>
     <message>
-        <location filename="../src/common/util.cpp" line="211"/>
+        <location filename="../src/common/util.cpp" line="129"/>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="212"/>
+        <location filename="../src/common/util.cpp" line="130"/>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="213"/>
+        <location filename="../src/common/util.cpp" line="131"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="214"/>
+        <location filename="../src/common/util.cpp" line="132"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="215"/>
+        <location filename="../src/common/util.cpp" line="133"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
@@ -4717,22 +5581,22 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="334"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Samtale med %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="352"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>inaktiv siden %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="355"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>Tid for pålogging: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="358"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>tjener: %1</translation>
     </message>
@@ -4763,30 +5627,105 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="37"/>
+        <source>Server Info</source>
+        <translation>Server Informasjon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="45"/>
         <source>Server address:</source>
         <translation>Tjeneradresse:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="28"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="52"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="242"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="55"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="79"/>
         <source>Password:</source>
         <translation>Passord:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="77"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="101"/>
         <source>Use SSL</source>
         <translation>Bruk SSL</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="134"/>
+        <source>Advanced</source>
+        <translation>Avansert</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="155"/>
+        <source>SSL Version:</source>
+        <translation>SSL Versjon:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="162"/>
+        <source>Do not change unless you&apos;re going to connect to a server not supporting SSLv3!</source>
+        <translation>Ikke endre med mindre du kommer til å koble til en tjener som ikke støtter SSLv3!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="166"/>
+        <source>SSLv3 (default)</source>
+        <translation>SSLv3 (standard)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="171"/>
+        <source>SSLv2</source>
+        <translation>SSLv2</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="176"/>
+        <source>TLSv1</source>
+        <translation>TLSv1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="186"/>
+        <source>Use a Proxy</source>
+        <translation>Bruk en Proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="203"/>
+        <source>Proxy Type:</source>
+        <translation>Proxy Type:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="211"/>
+        <source>Socks 5</source>
+        <translation>Socks 5</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="216"/>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="228"/>
+        <source>Proxy Host:</source>
+        <translation>Proxyvert:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="235"/>
+        <source>localhost</source>
+        <translation>localhost</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="266"/>
+        <source>Proxy Username:</source>
+        <translation>Proxybrukernavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="276"/>
+        <source>Proxy Password:</source>
+        <translation>Proxypassord:</translation>
+    </message>
 </context>
 <context>
     <name>SessionThread</name>
     <message>
-        <location filename="../src/core/sessionthread.cpp" line="73"/>
         <source>Could not initialize session!</source>
         <translation type="obsolete">Kunne ikke initialisere sesjonen!</translation>
     </message>
@@ -4794,32 +5733,38 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>SettingsDlg</name>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="73"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Lagre endringer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="74"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation>Det er endringer som ikke er lagert i konfigurasjonssiden som er oppe. Vil du bruke endringene nå?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="149"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="104"/>
+        <source>Configure %1</source>
+        <translation>Konfigurer %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="171"/>
         <source>Reload Settings</source>
         <translation>Last inn instillinger på nytt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="149"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="171"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Vil du laste inn innstillingene og angre endringene dine på denne siden?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="158"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="180"/>
         <source>Restore Defaults</source>
         <translation>Gjenopprett standard</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="158"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="180"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Vil du gjenopprette standardverdier for denne siden?</translation>
     </message>
@@ -4829,6 +5774,8 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
         <translation>Konfigurer Quassel</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="77"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="34"/>
         <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
@@ -4837,27 +5784,31 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>SettingsPageDlg</name>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="36"/>
+        <source>Configure %1</source>
+        <translation>Konfigurer %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="104"/>
         <source>Reload Settings</source>
         <translation>Last inn innstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="104"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Vil du laste inn innstillingene og angre endringene dine på denne siden?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="113"/>
         <source>Restore Defaults</source>
         <translation>Gjenopprett Standard</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="113"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Vil du gjenopprette standard verdier for denne siden?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
         <source>Dialog</source>
         <translation type="obsolete">Dialog</translation>
     </message>
@@ -4875,58 +5826,228 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>SignalProxy</name>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1066"/>
         <source>Client tried to send package larger than max package size!</source>
-        <translation>Klienten prøvde å sende en pakke større en maks pakkestørrelse!</translation>
+        <translation type="obsolete">Klienten prøvde å sende en pakke større en maks pakkestørrelse!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
+        <source>Peer tried to send package larger than max package size!</source>
+        <translation>Likemann forsøkte å sende en pakke som var større en maks pakkestørrelse!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Peer tried to send 0 byte package!</source>
+        <translation>Likemann forsøkte å sende 0 byte pakke!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
+        <source>Peer sent corrupted compressed data!</source>
+        <translation>Likemann sendte komprimerte data som er korrupte!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
+        <source>Peer sent corrupt data: unable to load QVariant!</source>
+        <translation>Likemann sendte korrupte data: ikke i stand til å laste QVariant!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1245"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Kobler fra</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="958"/>
         <source>local client</source>
         <translation type="obsolete">Lokal klient</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1071"/>
         <source>Client tried to send 0 byte package!</source>
-        <translation>Klienten prøvde å sende 0 byte pakke!</translation>
+        <translation type="obsolete">Klienten prøvde å sende 0 byte pakke!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Client sent corrupted compressed data!</source>
-        <translation>Klient sendte ødelagte komprimerte data!</translation>
+        <translation type="obsolete">Klient sendte ødelagte komprimerte data!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1103"/>
         <source>Client sent corrupt data: unable to load QVariant!</source>
-        <translation>Klient sendte ødelagte data: umulig å lese QVariant!</translation>
+        <translation type="obsolete">Klient sendte ødelagte data: umulig å lese QVariant!</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Nettverksnavn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Navnet på IRC nettverket du konfigurerer</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Tjenere</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Liste over IRC servere som hører til dette nettverket</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Rediger denne server oppføringen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Rediger...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>Legg til en annen IRC server</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Legg til...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Fjerne denne server oppføringen fra listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Slett</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>Flytt oppover i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="168"/>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="182"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="179"/>
+        <source>Move downwards in list</source>
+        <translation>Flytt nedover i listen</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Bli med i kanaler automatisk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="250"/>
+        <source>A list of IRC channels you will join automatically after connecting to the network</source>
+        <translation>En liste over IRC kanaler du ønsker å koble til automatisk etter oppkobling til nettverket</translation>
     </message>
 </context>
 <context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="52"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="49"/>
         <source>SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
         <translation>SQLite er en filbasert databasemotor som ikke krever konfigurering. Den passer for små og medium store databaser som ikke krever tilgang fra nettverk. Bruk SQLite hvis Quasselkjernen din skal lagre dataene på den samme maskinen som den kjører på, og bare hvis du forventer at et fåtall personer skal benytte din Kjerne.</translation>
     </message>
 </context>
+<context>
+    <name>SslCertDisplayDialog</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
+        <source>SSL Certificate used by %1</source>
+        <translation>SSL sertifikat benyttet av %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
+        <source>Issuer Info</source>
+        <translation>Utsteder info</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="574"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <source>Organization:</source>
+        <translation>Organisasjon:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="575"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
+        <source>Locality Name:</source>
+        <translation>Plass Navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="576"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <source>Organizational Unit Name:</source>
+        <translation>Navn på organisasjonsenheten:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="577"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <source>Country Name:</source>
+        <translation>Navn på land:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="578"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <source>State or Province Name:</source>
+        <translation>Stat, eller provins navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
+        <source>Subject Info</source>
+        <translation>Emne-info</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
+        <source>Additional Info</source>
+        <translation>Tilleggsinfo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <source>Valid From:</source>
+        <translation>Gyldig fra:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
+        <source>Valid To:</source>
+        <translation>Gyldig til:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
+        <source>Hostname %1:</source>
+        <translation>Vertsnavn %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
+        <source>E-Mail Address %1:</source>
+        <translation>Epost adresse %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <source>Digest:</source>
+        <translation>Fordøy:</translation>
+    </message>
+</context>
 <context>
     <name>StatusBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="295"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Statusbuffer til %1&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Statusbuffer til %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
-        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.h" line="143"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Statusbuffer</translation>
     </message>
@@ -4934,37 +6055,30 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>StorageDetailsPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="118"/>
         <source>Setup Storage Provider</source>
         <translation type="obsolete">Konfigurer Lagringsleverandør</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="119"/>
         <source>Please enter credentials for the selected storage provider.</source>
         <translation type="obsolete">Vennligst skriv inn autentisieringsdetaljene for valgt lagrings leverandør.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="121"/>
         <source>Host:</source>
         <translation type="obsolete">Vert:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="125"/>
         <source>Port:</source>
         <translation type="obsolete">Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="131"/>
         <source>Database:</source>
         <translation type="obsolete">Database:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="135"/>
         <source>User:</source>
         <translation type="obsolete">Bruker:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="139"/>
         <source>Password:</source>
         <translation type="obsolete">Passord:</translation>
     </message>
@@ -4972,12 +6086,10 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>StorageSelectionPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="94"/>
         <source>Select Storage Provider</source>
         <translation type="obsolete">Velg Lagringsleverandør</translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="95"/>
         <source>Please select the storage provider you want to use.</source>
         <translation type="obsolete">Vennligst velg lagringsleverandøren du ønsker å benytte.</translation>
     </message>
@@ -4985,17 +6097,17 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="123"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
         <source>System Tray Icon</source>
         <translation>Systemkurvikon</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="125"/>
         <source>Animate</source>
         <translation>Animer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="126"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="127"/>
         <source>Show bubble</source>
         <translation>Vis bobble</translation>
     </message>
@@ -5023,15 +6135,156 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
         <translation> s</translation>
     </message>
 </context>
+<context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Koble til IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Koble fra</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Koble fra IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Forlat</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Forlat nåværende valgt kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Bli med</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Bli med i en kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Spørring</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Start en privat samtale</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Forespør brukerinformasjon</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation>Op</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Gi operatørstatus til bruker</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation>Deop</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Ta operatørstatus fra bruker</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation>Voice</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Gi stemme til bruker</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation>Devoice</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Ta stemme fra bruker</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Spark</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Spark bruker fra kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Bannlys</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Bannlys bruker fra kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Kick/Ban</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Spark og bannlys bruker fra kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Koble til alle</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Koble fra alle</translation>
+    </message>
+</context>
 <context>
     <name>TopicButton</name>
     <message>
-        <location filename="../src/qtui/topicbutton.cpp" line="39"/>
         <source>Click to edit!</source>
         <translation type="obsolete">Klikk for å redigere!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/topicbutton.cpp" line="80"/>
         <source>%1
 
 Click to edit!</source>
@@ -5054,7 +6307,6 @@ Click to edit!</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/topicwidget.ui" line="65"/>
         <source>...</source>
         <translation type="obsolete">...</translation>
     </message>
@@ -5062,137 +6314,110 @@ Click to edit!</source>
 <context>
     <name>UiStyle</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="324"/>
         <source>%DT[%1]</source>
         <translation type="obsolete">%DT[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="329"/>
         <source>%DS&lt;%1&gt;</source>
         <translation type="obsolete">%DS&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="329"/>
         <source>%D0%1</source>
         <translation type="obsolete">%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="331"/>
         <source>%Dn[%1]</source>
         <translation type="obsolete">%Dn[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="331"/>
         <source>%Dn%1</source>
         <translation type="obsolete">%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="333"/>
         <source>%Ds*</source>
         <translation type="obsolete">%Ds*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="333"/>
         <source>%Ds%1</source>
         <translation type="obsolete">%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="335"/>
         <source>%De*</source>
         <translation type="obsolete">%De*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="370"/>
         <source>%De%1</source>
         <translation type="obsolete">%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="337"/>
         <source>%Dj--&gt;</source>
         <translation type="obsolete">%Dj--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="337"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation type="obsolete">%Dj%DN%1%DN %DH(%2@%3)%DH har blitt med i %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="339"/>
         <source>%Dp&lt;--</source>
         <translation type="obsolete">%Dp&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="339"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation type="obsolete">%Dp%DN%1%DN %DH(%2@%3)%DH har forlatt %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="343"/>
         <source>%Dq&lt;--</source>
         <translation type="obsolete">%Dq&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
         <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
         <translation type="obsolete">%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH har avsluttet</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
         <source>%Dk&lt;-*</source>
         <translation type="obsolete">%Dk&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="351"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation type="obsolete">%Dk%DN%1%DN har sparket %DN%2%DN fra %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="356"/>
         <source>%Dr&lt;-&gt;</source>
         <translation type="obsolete">%Dr&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation type="obsolete">%DrDu er nå kjent som %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation type="obsolete">%Dr%DN%1%DN er nå kjent som %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Dm***</source>
         <translation type="obsolete">%Dm***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="362"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation type="obsolete">%DmBruker modus: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="363"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation type="obsolete">%DmModus %DM%1%DM av %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="366"/>
         <source>%Da-*-</source>
         <translation type="obsolete">%Da-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="367"/>
         <source>%Da%DN%1%DN %2</source>
         <translation type="obsolete">%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
         <source>%De[%1]</source>
         <translation type="obsolete">%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="343"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation type="obsolete">%Dq%DN%1%DN %DH(%2@%3)%DH har avsluttet</translation>
     </message>
@@ -5200,122 +6425,124 @@ Click to edit!</source>
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="339"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="343"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="345"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation>%Dj%DN%1%DN %DH(%2@%3)%DH har blitt med i %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH har forlatt %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="351"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%1%DN %DH(%2@%3)%DH har avsluttet</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation>%Dk%DN%1%DN har sparket %DN%2%DN fra %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="363"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrDu er nå kjent som %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation>%Dr%DN%1%DN er nå kjent som %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="367"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmBruker modus: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="368"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmModus %DM%1%DM av %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="401"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="403"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="407"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="390"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="409"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="413"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="396"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="415"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="417"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="419"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="421"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="423"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -5323,7 +6550,7 @@ Click to edit!</source>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="599"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n eier</numerusform>
@@ -5331,7 +6558,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="600"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n administrator</numerusform>
@@ -5339,7 +6566,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="601"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n Operatør</numerusform>
@@ -5347,7 +6574,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="602"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n Halv-Op</numerusform>
@@ -5355,7 +6582,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="603"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n taleberettiged</numerusform>
@@ -5363,7 +6590,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="604"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n Bruker</numerusform>
@@ -5374,7 +6601,12 @@ Click to edit!</source>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="131"/>
+        <location filename="../src/core/userinputhandler.cpp" line="69"/>
+        <source>away</source>
+        <translation>borte</translation>
+    </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="138"/>
         <source>sending CTCP-%1 request</source>
         <translation>Sender CTCP-%1 forespørsel</translation>
     </message>