Update other translation files to allow heuristic fonctionality providing more transl...

author ZRegis <crperrin@gmail.com>

Sat, 2 Aug 2008 17:04:22 +0000 (19:04 +0200)

committer Manuel Nickschas <sputnick@quassel-irc.org>

Tue, 5 Aug 2008 14:59:38 +0000 (16:59 +0200)
author ZRegis <crperrin@gmail.com>
Sat, 2 Aug 2008 17:04:22 +0000 (19:04 +0200)
committer Manuel Nickschas <sputnick@quassel-irc.org>
Tue, 5 Aug 2008 14:59:38 +0000 (16:59 +0200)
diff --git a/i18n/quassel_da.ts b/i18n/quassel_da.ts

index 921793b..34d4667 100644 (file)
--- a/i18n/quassel_da.ts
+++ b/i18n/quassel_da.ts
@@ -31,17 +31,17 @@ p, li { white-space: pre-wrap; }
          <translation>Om Quassel</translation>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="47"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="48"/>
          <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
          <translation>&lt;b&gt;En moderne, distribueret IRC klient&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 af Quassel projektet&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; på &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC er dobbelt-licenseret under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; og &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;De fleste ikoner &amp;copy; af &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen teamet&lt;/a&gt; og benyttet under &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Brug &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; for at rapportere bugs.</translation>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="56"/>
          <source>Quassel IRC is mainly developed by:</source>
          <translation>Quassel IRC er hovedsagligt udviklet af:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="70"/>
          <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
          <translation>Vi vil gerne takke de følgende bidragsydere (i alfabetisk rækkefølge) og alle dem vi har glemt at nævne her:</translation>
      </message>
@@ -87,7 +87,7 @@ p, li { white-space: pre-wrap; }
          <translation>&amp;Tak til</translation>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="96"/>
          <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
          <translation type="unfinished"></translation>
      </message>
@@ -116,83 +116,99 @@ p, li { white-space: pre-wrap; }
      </message>
  </context>
  <context>
-    <name>AppearanceSettingsPage</name>
+    <name>AliasesModel</name>
      <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
-        <source>Appearance</source>
-        <translation type="unfinished">Udseende</translation>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="139"/>
+        <source>Alias</source>
+        <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
-        <source>General</source>
-        <translation type="unfinished">Generelt</translation>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="139"/>
+        <source>Expansion</source>
+        <translation type="unfinished"></translation>
      </message>
+</context>
+<context>
+    <name>AliasesSettingsPage</name>
      <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="27"/>
+        <source>Behaviour</source>
+        <translation type="unfinished">Opførsel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="27"/>
+        <source>Aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="13"/>
          <source>Form</source>
          <translation type="unfinished">Formular</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
-        <source>Client style:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="27"/>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
      </message>
-</context>
-<context>
-    <name>BufferItem</name>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="157"/>
-        <source>Status Buffer</source>
-        <translation>Status buffer</translation>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="41"/>
+        <source>Delete</source>
+        <translation type="unfinished">Slet</translation>
      </message>
+</context>
+<context>
+    <name>AppearanceSettingsPage</name>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="295"/>
-        <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="31"/>
+        <source>Appearance</source>
+        <translation type="unfinished">Udseende</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="299"/>
-        <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="31"/>
+        <source>General</source>
+        <translation type="unfinished">Generelt</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="302"/>
-        <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Formular</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="312"/>
-        <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <source>Client style:</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="318"/>
-        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
+        <source>Language:</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="321"/>
-        <source>Not active &lt;br /&gt; Double-click to join</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <source>&lt;System&gt;</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="325"/>
-        <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <source>&lt;Original&gt;</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="326"/>
-        <source>Away Message: %1</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
+        <source>Note: needs client restart for full effect!</source>
          <translation type="unfinished"></translation>
      </message>
+</context>
+<context>
+    <name>BufferItem</name>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="329"/>
-        <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <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="333"/>
-        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <location filename="../src/client/networkmodel.cpp" line="235"/>
+        <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
@@ -209,7 +225,7 @@ p, li { white-space: pre-wrap; }
          <translation>Afbryd</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="489"/>
          <source>Join Channel</source>
          <translation type="unfinished"></translation>
      </message>
@@ -229,7 +245,7 @@ p, li { white-space: pre-wrap; }
          <translation>Slet buffer</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="393"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="395"/>
          <source>Hide Events</source>
          <translation>Skjul hændelser</translation>
      </message>
@@ -269,17 +285,17 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">WHO</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="489"/>
          <source>Input channel name:</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="516"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="521"/>
          <source>Remove buffer permanently?</source>
          <translation>Fjern buffer permanent?</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="518"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="523"/>
          <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
          <translation>Vil du slette bufferen &quot;%1&quot; permanent? Det vil slette alt tilhørende data, inklusive log-filer, fra serverens database!</translation>
      </message>
@@ -302,7 +318,7 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>BufferViewDock</name>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="586"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="591"/>
          <source>All Buffers</source>
          <translation type="unfinished">Alle buffere</translation>
      </message>
@@ -513,6 +529,39 @@ p, li { white-space: pre-wrap; }
          <translation type="unfinished"></translation>
      </message>
  </context>
+<context>
+    <name>ChannelBufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="373"/>
+        <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="376"/>
+        <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
+        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="391"/>
+        <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="395"/>
+        <source>Not active &lt;br /&gt; Double-click to join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>ChannelListDlg</name>
      <message>
@@ -525,14 +574,35 @@ p, li { white-space: pre-wrap; }
          <source>Search Pattern:</source>
          <translation type="unfinished"></translation>
      </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="85"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
      <message>
          <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
-        <source>Search Channels</source>
+        <source>Toggle between simple and advanced mode.
+Advanced mode allows to pass search strings to the IRC Server.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
-        <source>Filter:</source>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="61"/>
+        <source>Show Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="97"/>
+        <source>Errors Occured:</source>
+        <translation type="unfinished"></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; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&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;SUPER EVIL CATASTROPHIC ERROR!!11&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
@@ -924,12 +994,12 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>Core</name>
      <message>
-        <location filename="../src/core/core.cpp" line="57"/>
+        <location filename="../src/core/core.cpp" line="58"/>
          <source>Could not initialize any storage backend! Exiting...</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="117"/>
+        <location filename="../src/core/core.cpp" line="118"/>
          <source>Calling restoreState() even though active sessions exist!</source>
          <translation type="unfinished"></translation>
      </message>
@@ -939,82 +1009,107 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Servertilstand for gammel, ignorerer...</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="145"/>
+        <location filename="../src/core/core.cpp" line="146"/>
          <source>Admin user or password not set.</source>
          <translation>Administratorbruger eller -password ikke angivet.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="148"/>
+        <location filename="../src/core/core.cpp" line="149"/>
          <source>Could not setup storage!</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="152"/>
+        <location filename="../src/core/core.cpp" line="153"/>
          <source>Creating admin user...</source>
          <translation>Operetter administrator bruger...</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="388"/>
+        <location filename="../src/core/core.cpp" line="400"/>
          <source>Antique client trying to connect... refusing.</source>
          <translation>Antik klient prøver at forbinde... nægter.</translation>
      </message>
      <message>
          <location filename="../src/core/core.cpp" line="404"/>
          <source>Client %1 too old, rejecting.</source>
-        <translation>Klienten %1 er for gammel, afviser.</translation>
+        <translation type="obsolete">Klienten %1 er for gammel, afviser.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="482"/>
+        <location filename="../src/core/core.cpp" line="496"/>
          <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="484"/>
-        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/core.cpp" line="504"/>
+        <location filename="../src/core/core.cpp" line="518"/>
          <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
          <translation>&lt;b&gt;Ugyldigt brugernavn eller kodeord!&lt;/b&gt;&lt;br&gt;Brugernavn/password-kombinationen du indtastede kunne ikke findes i databasen.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="522"/>
+        <location filename="../src/core/core.cpp" line="535"/>
          <source>Non-authed client disconnected.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="545"/>
-        <source>Could not initialize session for client %1!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/core.cpp" line="60"/>
+        <location filename="../src/core/core.cpp" line="61"/>
          <source>Currently, Quassel only supports SQLite3. You need to build your
  Qt library with the sqlite plugin enabled in order for quasselcore
  to work.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="402"/>
+        <location filename="../src/core/core.cpp" line="416"/>
          <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="419"/>
+        <location filename="../src/core/core.cpp" line="433"/>
          <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="510"/>
-        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <location filename="../src/core/core.cpp" line="377"/>
+        <source>Client connected from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="524"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="418"/>
+        <source>too old, rejecting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="478"/>
+        <source>Starting TLS for Client:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="498"/>
+        <source>did not send an init message before trying to login, rejecting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="524"/>
+        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="541"/>
+        <source>Non-authed client disconnected. (socket allready destroyed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="583"/>
+        <source>Could not initialize session for client:</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
  <context>
      <name>CoreAccountEditDlg</name>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="461"/>
          <source>Add Core Account</source>
          <translation>Tilføj konto</translation>
      </message>
@@ -1034,67 +1129,67 @@ to work.</source>
          <translation>Konto navn:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="56"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="60"/>
          <source>Use built-in Quassel Core</source>
          <translation>Brug indbygget Quassel server</translation>
      </message>
      <message>
          <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="76"/>
          <source>Remote host:</source>
-        <translation>Fjernvært:</translation>
+        <translation type="obsolete">Fjernvært:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="86"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="90"/>
          <source>Port:</source>
          <translation>Port:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="117"/>
          <source>Use secure connection (SSL)</source>
          <translation>Brug sikker forbindelse (SSL)</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="124"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="133"/>
          <source>Use a proxy:</source>
          <translation>Brug en proxy:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="136"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="145"/>
          <source>Proxy Type:</source>
          <translation>Proxy type:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="153"/>
          <source>Socks 5</source>
          <translation>Socks 5</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="149"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="158"/>
          <source>HTTP</source>
          <translation>HTTP</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="157"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="166"/>
          <source>Proxy Host:</source>
          <translation>Proxy vært:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="164"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="173"/>
          <source>Proxy Port:</source>
          <translation>Proxy port:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="171"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="180"/>
          <source>localhost</source>
          <translation>localhost</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="188"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="197"/>
          <source>Proxy Username:</source>
          <translation>Proxy brugernavn:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="198"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="207"/>
          <source>Proxy Password:</source>
          <translation>Proxy password:</translation>
      </message>
@@ -1138,6 +1233,16 @@ to work.</source>
          <source>User:</source>
          <translation type="unfinished">Bruger:</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="36"/>
+        <source>Local Core</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="80"/>
+        <source>Hostname:</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>CoreConfigWizard</name>
@@ -1409,52 +1514,52 @@ p, li { white-space: pre-wrap; }
          <translation>Forbind</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="172"/>
          <source>Remove Account Settings</source>
          <translation>Fjern konto-indstillinger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
          <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
          <translation>Vil du virkeligt fjerne dine lokale indstillinger for denne konto?&lt;br&gt;Note: Dette vil &lt;em&gt;ikke&lt;/em&gt; fjerne eller ændre noget på serveren!</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="219"/>
          <source>Connect to %1</source>
          <translation>Forbind til %1</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="236"/>
          <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
          <translation>&lt;div style=color:red;&gt;Forbindelse til %1 mislykkedes!&lt;/div&gt;</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="260"/>
          <source>Not connected to %1.</source>
          <translation>Ikke forbundet til %1.</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="261"/>
          <source>Looking up %1...</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
          <source>Connecting to %1...</source>
          <translation>Forbinder til %1...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="265"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
          <source>Connected to %1</source>
          <translation>Forbundet til %1</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="266"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
          <source>Unknown connection state to %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="316"/>
          <source>Logging in...</source>
          <translation>Logger på...</translation>
      </message>
@@ -1527,20 +1632,10 @@ space</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="522"/>
          <source>0/0</source>
          <translation type="unfinished">0/0</translation>
      </message>
-    <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
-        <source>Channel states:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
-        <source>User states:</source>
-        <translation type="unfinished"></translation>
-    </message>
  </context>
  <context>
      <name>CoreConnectProgressDlg</name>
@@ -1602,26 +1697,84 @@ space</source>
          <translation type="unfinished">Brugere</translation>
      </message>
  </context>
+<context>
+    <name>CoreInfoDlg</name>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="13"/>
+        <source>Core Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="21"/>
+        <source>Version:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="28"/>
+        <source>&lt;core version&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="35"/>
+        <source>Uptime:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="42"/>
+        <source>Connected Clients:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="49"/>
+        <source>&lt;connected clients&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="56"/>
+        <source>&lt;core uptime&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="63"/>
+        <source>Build date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="70"/>
+        <source>&lt;build date&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="81"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>CoreSession</name>
      <message>
-        <location filename="../src/core/coresession.cpp" line="153"/>
+        <location filename="../src/core/coresession.cpp" line="162"/>
          <source>Default Identity</source>
          <translation>Normal identitet</translation>
      </message>
      <message>
-        <location filename="../src/core/coresession.cpp" line="241"/>
-        <source>Client %1 disconnected (UserId: %2).</source>
+        <location filename="../src/core/coresession.cpp" line="419"/>
+        <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/coresession.cpp" line="410"/>
-        <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
+        <location filename="../src/core/coresession.cpp" line="434"/>
+        <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/coresession.cpp" line="425"/>
-        <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
+        <location filename="../src/core/coresession.cpp" line="250"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="250"/>
+        <source>disconnected (UserId: %1).</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
@@ -1850,7 +2003,7 @@ space</source>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
          <source>Use system tray icon:</source>
-        <translation>Brug statusikon:</translation>
+        <translation type="obsolete">Brug statusikon:</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="28"/>
@@ -1865,7 +2018,7 @@ space</source>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
          <source>Tray icon:</source>
-        <translation>Tray ikon:</translation>
+        <translation type="obsolete">Tray ikon:</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="51"/>
@@ -1875,66 +2028,86 @@ space</source>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
          <source>User Notification:</source>
-        <translation>Bruger-påmindelser:</translation>
+        <translation type="obsolete">Bruger-påmindelser:</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="70"/>
          <source>Animate tray icon</source>
-        <translation>Animér tray ikon</translation>
+        <translation type="obsolete">Animér tray ikon</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="80"/>
          <source>Display pop-up messages</source>
-        <translation>Vis pop-up beskeder</translation>
+        <translation type="obsolete">Vis pop-up beskeder</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="93"/>
          <source>Display user related messages and private Notices:</source>
-        <translation>Vis bruger-relaterede beskeder og private påmindelser:</translation>
+        <translation type="obsolete">Vis bruger-relaterede beskeder og private påmindelser:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="102"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="73"/>
          <source>in status buffer</source>
          <translation>i status bufferen</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="115"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="86"/>
          <source>in query buffer (if exists)</source>
          <translation>i forespørgsels buffer (hvis den eksisterer)</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="125"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="96"/>
          <source>in current buffer</source>
          <translation>i nuværende buffer</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
          <source>Buffer view:</source>
-        <translation>Buffervisning:</translation>
+        <translation type="obsolete">Buffervisning:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="141"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="112"/>
          <source>Display topic in tooltip</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="119"/>
          <source>Mouse wheel changes displayed buffers</source>
          <translation>Scrollhjul skifter den viste buffer</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="132"/>
          <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
-        <source>Input Line:</source>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="143"/>
+        <source>Completion suffix:</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
-        <source>Completion suffix:</source>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
+        <source>Show System Tray Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
+        <source>Tray Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
+        <source>Display User-Related Messages And Private Notices:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="106"/>
+        <source>Buffer View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
+        <source>Input Line</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
@@ -2179,7 +2352,7 @@ space</source>
          <translation>Vil du virkeligt slette identiteten &quot;%1&quot;?</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="33"/>
          <source>Rename Identity</source>
          <translation>Omdøb identitet</translation>
      </message>
@@ -2223,6 +2396,11 @@ space</source>
          <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
          <translation>Ident er en del af dit hostmask, og udgør, sammen med dit hostname, din unikke identitetet på IRC-netværket.</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <source>Rename Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>Identity</name>
@@ -2309,22 +2487,22 @@ space</source>
  <context>
      <name>IrcServerHandler</name>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="411"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="436"/>
          <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
          <translation>%1 har skiftet emne for %2 til: &quot;%3&quot;</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
          <source>No topic is set for %1.</source>
          <translation>Intet emne er sat for %1.</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="789"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="816"/>
          <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="800"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="827"/>
          <source>Topic set by %1 on %2</source>
          <translation>Emne valg af %1 på %2</translation>
      </message>
@@ -2334,22 +2512,22 @@ space</source>
          <translation type="obsolete">Modtog ugyldig MODE fra %s: %s</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="515"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="542"/>
          <source>[Whois] %1 is away: &quot;%2&quot;</source>
          <translation>[Whois] %1 er ikke tilstede: &quot;%2&quot;</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="553"/>
          <source>%1 is away: &quot;%2&quot;</source>
          <translation>%1 er ikke tilstede: &quot;%2&quot;</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="723"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="750"/>
          <source>[Whois] %1</source>
          <translation>[Whois] %1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="891"/>
          <source>[Whowas] %1</source>
          <translation>[Whowas] %1</translation>
      </message>
@@ -2359,105 +2537,115 @@ space</source>
          <translation type="obsolete">[Whois] %1 har været logget på i %2 sekunder</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="681"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="708"/>
          <source>[Whois] idle message: %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="877"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="904"/>
          <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="878"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="905"/>
          <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="879"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="906"/>
          <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="882"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="909"/>
          <source>Nick %1 contains illegal characters</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="894"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="921"/>
          <source>Nick already in use: %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="917"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="944"/>
          <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="480"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="507"/>
          <source>%1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="597"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="624"/>
          <source>[Whois] %1 is %2 (%3)</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="612"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="639"/>
          <source>%1 is online via %2 (%3)</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="642"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="669"/>
          <source>[Whowas] %1 was %2 (%3)</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="683"/>
          <source>[Who] End of /WHO list for %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="676"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="703"/>
          <source>[Whois] %1 is logged in since %2</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="678"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="705"/>
          <source>[Whois] %1 is idling for %2 (%3)</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
          <source>[Whois] %1 is a user on channels: %2</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="742"/>
          <source>[Whois] %1 has voice on channels: %2</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="717"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="744"/>
          <source>[Whois] %1 is an operator on channels: %2</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="745"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
          <source>Channel %1 has %2 users. Topic is: %3</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="754"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="781"/>
          <source>End of channel list</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="823"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="850"/>
          <source>[Who] %1</source>
          <translation type="unfinished"></translation>
      </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="461"/>
+        <source>Received RPL_ISUPPORT (005) without parameters!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="469"/>
+        <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>IrcUserItem</name>
@@ -2487,17 +2675,17 @@ space</source>
          <translation type="obsolete">sek</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="606"/>
+        <location filename="../src/client/networkmodel.cpp" line="684"/>
          <source>idling since %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="609"/>
+        <location filename="../src/client/networkmodel.cpp" line="687"/>
          <source>login time: %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="612"/>
+        <location filename="../src/client/networkmodel.cpp" line="690"/>
          <source>server: %1</source>
          <translation type="unfinished"></translation>
      </message>
@@ -2528,12 +2716,12 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>MainWin</name>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="88"/>
+        <location filename="../src/qtui/mainwin.cpp" line="97"/>
          <source>Waiting for core...</source>
          <translation>Venter på serveren...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="485"/>
+        <location filename="../src/qtui/mainwin.cpp" line="497"/>
          <source>Not connected to core.</source>
          <translation>Ikke forbundet til serveren.</translation>
      </message>
@@ -2548,62 +2736,62 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Alle netværk</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="107"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="124"/>
          <source>&amp;Network List...</source>
          <translation>&amp;Netværks liste...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="110"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="127"/>
          <source>F2</source>
          <translation>F2</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="229"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="255"/>
          <source>Disconnect</source>
          <translation>Afbryd forbindelsen</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="173"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="190"/>
          <source>Edit Identities...</source>
          <translation>Rediger identiteter...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="199"/>
          <source>Configure Quassel...</source>
          <translation>Konfigurer Quassel...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="185"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
          <source>F7</source>
          <translation>F7</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="222"/>
          <source>About Qt...</source>
          <translation>Om Qt...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="214"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="237"/>
          <source>About Quassel IRC...</source>
          <translation>Om Quassel IRC...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="224"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="250"/>
          <source>Connect</source>
          <translation>Forbind</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="234"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="260"/>
          <source>Internal</source>
          <translation>Intern</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="246"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="272"/>
          <source>Disconnect from Core</source>
          <translation>Afbryd forbindelsen til serveren</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="258"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="284"/>
          <source>Connect to Core...</source>
          <translation>Forbind til server...</translation>
      </message>
@@ -2623,7 +2811,7 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Brugerdefineret</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="426"/>
+        <location filename="../src/qtui/mainwin.cpp" line="439"/>
          <source>Connected to core.</source>
          <translation>Forbundet til server.</translation>
      </message>
@@ -2633,67 +2821,67 @@ p, li { white-space: pre-wrap; }
          <translation>HovedVindue</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="118"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="135"/>
          <source>Quick &amp;Connect...</source>
          <translation>&amp;Hurtig forbind...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="134"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="151"/>
          <source>Reconnect</source>
          <translation>Gen-forbind</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="159"/>
          <source>Join Channel...</source>
          <translation>Deltag i kanal...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="153"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="170"/>
          <source>Set Away globally</source>
          <translation>Sæt Away globalt</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="165"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
          <source>Quit...</source>
          <translation>Afslut...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="197"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="217"/>
          <source>Manage Views...</source>
          <translation>Administrér visninger...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="219"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="245"/>
          <source>Import Backlog</source>
          <translation>Importér logfil</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="289"/>
          <source>Debug &amp;Console</source>
          <translation>Debug &amp;konsol</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="264"/>
+        <location filename="../src/qtui/mainwin.cpp" line="271"/>
          <source>Nicks</source>
          <translation>Navneliste</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="169"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="320"/>
          <source>Edit &amp;Networks...</source>
          <translation>Redigér &amp;netværk...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="283"/>
+        <location filename="../src/qtui/mainwin.cpp" line="290"/>
          <source>Chat Monitor</source>
          <translation>Char monitor</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="305"/>
+        <location filename="../src/qtui/mainwin.cpp" line="312"/>
          <source>Inputline</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="322"/>
+        <location filename="../src/qtui/mainwin.cpp" line="329"/>
          <source>Topic</source>
          <translation>Emne</translation>
      </message>
@@ -2708,17 +2896,17 @@ p, li { white-space: pre-wrap; }
          <translation>&amp;Netværk</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="69"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="71"/>
          <source>&amp;Settings</source>
          <translation>&amp;Indstillinger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="75"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="77"/>
          <source>&amp;Views</source>
          <translation>&amp;Visninger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="82"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="92"/>
          <source>&amp;Help</source>
          <translation>&amp;Hjælp</translation>
      </message>
@@ -2728,20 +2916,50 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">&amp;Debug</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
          <source>Disconnect from Network...</source>
          <translation>Afbryd fra netværk...</translation>
      </message>
      <message>
          <location filename="../src/qtui/ui/mainwin.ui" line="276"/>
          <source>&amp;Edit Networks...</source>
-        <translation>&amp;Rediger netværk...</translation>
+        <translation type="obsolete">&amp;Rediger netværk...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="343"/>
+        <location filename="../src/qtui/mainwin.cpp" line="356"/>
          <source>Statusbar</source>
          <translation type="unfinished"></translation>
      </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="81"/>
+        <source>Buffer Views</source>
+        <translation type="unfinished">Buffer visninger</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="96"/>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
+        <source>Manage Buffer Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="311"/>
+        <source>Lock Dock Positions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="329"/>
+        <source>Core Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="334"/>
+        <source>NetworkModel</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>Message</name>
@@ -2879,27 +3097,27 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>NetworkConnection</name>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="190"/>
+        <location filename="../src/core/networkconnection.cpp" line="194"/>
          <source>Connection failed. Cycling to next Server</source>
          <translation>Forbindelse mislykkedes. Prøver næste server</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="200"/>
+        <location filename="../src/core/networkconnection.cpp" line="204"/>
          <source>Connecting to %1:%2...</source>
          <translation>Forbinder til %1:%2...</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="253"/>
+        <location filename="../src/core/networkconnection.cpp" line="260"/>
          <source>Disconnecting.</source>
          <translation>Afbryder.</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="276"/>
+        <location filename="../src/core/networkconnection.cpp" line="281"/>
          <source>Could not connect to %1 (%2)</source>
          <translation>Kunne ikke forbinde til %1 (%2)</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="278"/>
+        <location filename="../src/core/networkconnection.cpp" line="283"/>
          <source>Connection failure: %1</source>
          <translation>Forbindelsesfejl: %1</translation>
      </message>
@@ -2925,17 +3143,17 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>NetworkModel</name>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="711"/>
          <source>Buffer</source>
          <translation>Buffer</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="711"/>
          <source>Topic</source>
          <translation>Emne</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="711"/>
          <source>Nick Count</source>
          <translation>Brugere</translation>
      </message>
@@ -3241,86 +3459,144 @@ This setting defines the encoding for messages that are not Utf8.</source>
  <context>
      <name>NickView</name>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="114"/>
+        <location filename="../src/uisupport/nickview.cpp" line="100"/>
          <source>WHOIS</source>
          <translation>WHOIS</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="115"/>
+        <location filename="../src/uisupport/nickview.cpp" line="101"/>
          <source>VERSION</source>
          <translation>VERSION</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="116"/>
+        <location filename="../src/uisupport/nickview.cpp" line="102"/>
          <source>PING</source>
          <translation>PING</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="120"/>
+        <location filename="../src/uisupport/nickview.cpp" line="106"/>
          <source>Modes</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="121"/>
+        <location filename="../src/uisupport/nickview.cpp" line="107"/>
          <source>Op %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="122"/>
+        <location filename="../src/uisupport/nickview.cpp" line="108"/>
          <source>Deop %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="123"/>
+        <location filename="../src/uisupport/nickview.cpp" line="109"/>
          <source>Voice %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="124"/>
+        <location filename="../src/uisupport/nickview.cpp" line="110"/>
          <source>Devoice %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="126"/>
+        <location filename="../src/uisupport/nickview.cpp" line="112"/>
          <source>Kick/Ban</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="127"/>
+        <location filename="../src/uisupport/nickview.cpp" line="113"/>
          <source>Kick %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="129"/>
+        <location filename="../src/uisupport/nickview.cpp" line="115"/>
          <source>Kickban %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="130"/>
+        <location filename="../src/uisupport/nickview.cpp" line="116"/>
          <source>Ignore</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="135"/>
+        <location filename="../src/uisupport/nickview.cpp" line="121"/>
          <source>Query</source>
          <translation>Forespørgsel</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="136"/>
+        <location filename="../src/uisupport/nickview.cpp" line="122"/>
          <source>DCC-Chat</source>
          <translation>DCC-chat</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="138"/>
+        <location filename="../src/uisupport/nickview.cpp" line="124"/>
          <source>Send file</source>
          <translation>Send fil</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="128"/>
+        <location filename="../src/uisupport/nickview.cpp" line="114"/>
          <source>Ban %1</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
+<context>
+    <name>NotificationsSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Behaviour</source>
+        <translation type="unfinished">Opførsel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Formular</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="19"/>
+        <source>System Tray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="25"/>
+        <source>Animate tray icon</source>
+        <translation type="unfinished">Animér tray ikon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="35"/>
+        <source>Show Bubble</source>
+        <translation type="unfinished"></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="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="48"/>
+        <source>Desktop Notification (via DBus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="59"/>
+        <source>Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="79"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="93"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>QtopiaMainWin</name>
      <message>
@@ -3362,31 +3638,54 @@ This setting defines the encoding for messages that are not Utf8.</source>
  <context>
      <name>Quassel::secondsToString()</name>
      <message>
-        <location filename="../src/common/util.cpp" line="165"/>
+        <location filename="../src/common/util.cpp" line="192"/>
          <source>year</source>
          <translation type="unfinished">år</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="166"/>
+        <location filename="../src/common/util.cpp" line="193"/>
          <source>day</source>
          <translation type="unfinished">dag</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="167"/>
+        <location filename="../src/common/util.cpp" line="194"/>
          <source>h</source>
          <translation type="unfinished">t</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="168"/>
+        <location filename="../src/common/util.cpp" line="195"/>
          <source>min</source>
          <translation type="unfinished">min</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="169"/>
+        <location filename="../src/common/util.cpp" line="196"/>
          <source>sec</source>
          <translation type="unfinished">sek</translation>
      </message>
  </context>
+<context>
+    <name>QueryBufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="311"/>
+        <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="329"/>
+        <source>idling since %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="332"/>
+        <source>login time: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="335"/>
+        <source>server: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>SaveIdentitiesDlg</name>
      <message>
@@ -3522,14 +3821,50 @@ This setting defines the encoding for messages that are not Utf8.</source>
          <translation type="unfinished">Konfigurer Quassel</translation>
      </message>
  </context>
+<context>
+    <name>SignalProxy</name>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Client tried to send package larger than max package size!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="958"/>
+        <source>Disconnecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="958"/>
+        <source>local client</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>SqliteStorage</name>
      <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="49"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="50"/>
          <source>SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
          <translation>SQLite er en filbaseret database engine der ikke kræver noget setup. Det brugbart for små og mellem-store databaser der ikke kræver adgang over netværk. Brug SQLite hvis din Quassel server skal gemme dens data på den samme maskine som den kører på, og hvis du kun forventer at nogle få brugere skal bruge serveren.</translation>
      </message>
  </context>
+<context>
+    <name>StatusBufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="275"/>
+        <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="277"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.h" line="139"/>
+        <source>Status Buffer</source>
+        <translation type="unfinished">Status buffer</translation>
+    </message>
+</context>
  <context>
      <name>StorageDetailsPage</name>
      <message>
@@ -3763,7 +4098,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
          <translation type="obsolete">Brugere</translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="489"/>
+        <location filename="../src/client/networkmodel.cpp" line="566"/>
          <source>%n Owner(s)</source>
          <translation type="unfinished">
              <numerusform></numerusform>
@@ -3771,7 +4106,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="490"/>
+        <location filename="../src/client/networkmodel.cpp" line="567"/>
          <source>%n Admin(s)</source>
          <translation type="unfinished">
              <numerusform></numerusform>
@@ -3779,7 +4114,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="491"/>
+        <location filename="../src/client/networkmodel.cpp" line="568"/>
          <source>%n Operator(s)</source>
          <translation type="unfinished">
              <numerusform></numerusform>
@@ -3787,7 +4122,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="492"/>
+        <location filename="../src/client/networkmodel.cpp" line="569"/>
          <source>%n Half-Op(s)</source>
          <translation type="unfinished">
              <numerusform></numerusform>
@@ -3795,7 +4130,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="493"/>
+        <location filename="../src/client/networkmodel.cpp" line="570"/>
          <source>%n Voiced</source>
          <translation type="unfinished">
              <numerusform></numerusform>
@@ -3803,7 +4138,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="494"/>
+        <location filename="../src/client/networkmodel.cpp" line="571"/>
          <source>%n User(s)</source>
          <translation type="unfinished">
              <numerusform></numerusform>
@@ -3814,7 +4149,7 @@ This setting defines the encoding for messages that are not Utf8.</source>
  <context>
      <name>UserInputHandler</name>
      <message>
-        <location filename="../src/core/userinputhandler.cpp" line="113"/>
+        <location filename="../src/core/userinputhandler.cpp" line="121"/>
          <source>sending CTCP-%1 request</source>
          <translation>sender CTCP-%1 forespørgsel</translation>
      </message>
diff --git a/i18n/quassel_nb_NO.ts b/i18n/quassel_nb_NO.ts

index d0d86b1..6771e68 100644 (file)
--- a/i18n/quassel_nb_NO.ts
+++ b/i18n/quassel_nb_NO.ts
@@ -1,6 +1,5 @@
  <?xml version="1.0" encoding="utf-8"?>
  <!DOCTYPE TS><TS version="1.1" language="nb_NO">
-<defaultcodec></defaultcodec>
  <context>
      <name>AboutDlg</name>
      <message>
@@ -27,17 +26,17 @@ 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;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="47"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="48"/>
          <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>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="56"/>
          <source>Quassel IRC is mainly developed by:</source>
          <translation>Quassel IRC er hovedsakelig utviklet av:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="70"/>
          <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
          <translation>Vi vil takke følgende bidragsytere (i alfabetisk rekkefølge) og alle vi glemte å nevne her:</translation>
      </message>
@@ -98,7 +97,7 @@ p, li { white-space: pre-wrap; }
          <translation>&amp;Takk til</translation>
      </message>
      <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="96"/>
          <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>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>
@@ -126,15 +125,56 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Passord:</translation>
      </message>
  </context>
+<context>
+    <name>AliasesModel</name>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="139"/>
+        <source>Alias</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="139"/>
+        <source>Expansion</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AliasesSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="27"/>
+        <source>Behaviour</source>
+        <translation type="unfinished">Oppførsel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="27"/>
+        <source>Aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="27"/>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="41"/>
+        <source>Delete</source>
+        <translation type="unfinished">Slett</translation>
+    </message>
+</context>
  <context>
      <name>AppearanceSettingsPage</name>
      <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="31"/>
          <source>Appearance</source>
          <translation>Utseende</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="31"/>
          <source>General</source>
          <translation>Generelt</translation>
      </message>
@@ -148,63 +188,88 @@ p, li { white-space: pre-wrap; }
          <source>Client style:</source>
          <translation>Klient stil:</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
+        <source>Language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <source>&lt;System&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <source>&lt;Original&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
+        <source>Note: needs client restart for full effect!</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>BufferItem</name>
      <message>
          <location filename="../src/client/networkmodel.cpp" line="157"/>
          <source>Status Buffer</source>
-        <translation>Status buffer</translation>
+        <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>&lt;b&gt;Status buffer av %1&lt;/b&gt;</translation>
+        <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>&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
+        <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>&lt;b&gt;Brukere:&lt;/b&gt; %1</translation>
+        <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>&lt;b&gt;Emne:&lt;/b&gt; %1</translation>
+        <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>Ikke aktive &lt;br/&gt; Dobbelt-klikk for å bli med</translation>
+        <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>&lt;b&gt;Spørring med %1&lt;/b&gt;</translation>
+        <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>Fraværs melding: %1</translation>
+        <translation type="obsolete">Fraværs melding: %1</translation>
      </message>
      <message>
          <location filename="../src/client/networkmodel.cpp" line="329"/>
          <source>%1 - %2</source>
-        <translation>%1 - %2</translation>
+        <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>&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.cpp" line="318"/>
          <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
-        <translation>&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
+        <translation type="obsolete">&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="235"/>
+        <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
      </message>
  </context>
  <context>
@@ -220,7 +285,7 @@ p, li { white-space: pre-wrap; }
          <translation>Koble fra</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="489"/>
          <source>Join Channel</source>
          <translation>Bli med i kanal</translation>
      </message>
@@ -280,17 +345,17 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">WHO</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="488"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="489"/>
          <source>Input channel name:</source>
          <translation>Skriv inn kanal navnet:</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="520"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="521"/>
          <source>Remove buffer permanently?</source>
          <translation>Slette buffer permanent?</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="522"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="523"/>
          <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 do slette bufferen &quot;%1&quot; permanent? Dette vil slette alle relaterte data, inkludert all historikk-data, fra Kjernens database!</translation>
      </message>
@@ -313,7 +378,7 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>BufferViewDock</name>
      <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="590"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="591"/>
          <source>All Buffers</source>
          <translation>Alle Buffere</translation>
      </message>
@@ -529,6 +594,39 @@ p, li { white-space: pre-wrap; }
          <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;:/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>
  </context>
+<context>
+    <name>ChannelBufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="373"/>
+        <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="376"/>
+        <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
+        <translation type="unfinished">&lt;b&gt;Brukere:&lt;/b&gt; %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
+        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
+        <translation type="unfinished">&lt;b&gt;Modus:&lt;/b&gt; %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="391"/>
+        <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
+        <translation type="unfinished">&lt;b&gt;Emne:&lt;/b&gt; %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="395"/>
+        <source>Not active &lt;br /&gt; Double-click to join</source>
+        <translation type="unfinished">Ikke aktive &lt;br/&gt; Dobbelt-klikk for å bli med</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt; %1 &lt;/p&gt;</translation>
+    </message>
+</context>
  <context>
      <name>ChannelListDlg</name>
      <message>
@@ -544,13 +642,39 @@ p, li { white-space: pre-wrap; }
      <message>
          <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
          <source>Search Channels</source>
-        <translation>Søk i Kanalene</translation>
+        <translation type="obsolete">Søk i Kanalene</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="85"/>
          <source>Filter:</source>
          <translation>Filter:</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
+        <source>Toggle between simple and advanced mode.
+Advanced mode allows to pass search strings to the IRC Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="61"/>
+        <source>Show Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="97"/>
+        <source>Errors Occured:</source>
+        <translation type="unfinished"></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; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&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;SUPER EVIL CATASTROPHIC ERROR!!11&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>Client</name>
@@ -588,17 +712,17 @@ p, li { white-space: pre-wrap; }
          <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="210"/>
+        <location filename="../src/client/clientsyncer.cpp" line="208"/>
          <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
          <translation>&lt;b&gt;Quassel Kjernen du forsøker å koble til, støtter ikke SSL!&lt;/b&gt;&lt;br /&gt;Hvis du alikevel ønsker å koble til, deaktiver bruken av SSL i konto innstillingene.</translation>
      </message>
      <message>
-        <location filename="../src/client/clientsyncer.cpp" line="240"/>
+        <location filename="../src/client/clientsyncer.cpp" line="238"/>
          <source>Logging in...</source>
          <translation>Logger inn...</translation>
      </message>
      <message>
-        <location filename="../src/client/clientsyncer.cpp" line="194"/>
+        <location filename="../src/client/clientsyncer.cpp" line="192"/>
          <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
          <translation>&lt;b&gt;Quassel Kjernen du forsøker å koble til er for gammel!&lt;/b&gt;&lt;br&gt;Trenger minst Kjerne/Klient protokoll v%1 for å koble til.</translation>
      </message>
@@ -940,12 +1064,12 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>Core</name>
      <message>
-        <location filename="../src/core/core.cpp" line="57"/>
+        <location filename="../src/core/core.cpp" line="58"/>
          <source>Could not initialize any storage backend! Exiting...</source>
          <translation>Kunne ikke initiere noen lagrings motor! Avslutter...</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="117"/>
+        <location filename="../src/core/core.cpp" line="118"/>
          <source>Calling restoreState() even though active sessions exist!</source>
          <translation>Kaller restoreState() selv om aktive sesjoner eksisterer!</translation>
      </message>
@@ -955,22 +1079,22 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Kjerne status for gammel, ignorerer...</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="145"/>
+        <location filename="../src/core/core.cpp" line="146"/>
          <source>Admin user or password not set.</source>
          <translation>Administrasjons bruker, eller passord er ikke satt.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="148"/>
+        <location filename="../src/core/core.cpp" line="149"/>
          <source>Could not setup storage!</source>
          <translation>Kunne ikke konfigurere lagring!</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="152"/>
+        <location filename="../src/core/core.cpp" line="153"/>
          <source>Creating admin user...</source>
          <translation>Oppretter administrasjons bruker...</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="388"/>
+        <location filename="../src/core/core.cpp" line="400"/>
          <source>Antique client trying to connect... refusing.</source>
          <translation>Antikk klient forsøker å koble til... Nekter.</translation>
      </message>
@@ -987,20 +1111,20 @@ p, li { white-space: pre-wrap; }
      <message>
          <location filename="../src/core/core.cpp" line="406"/>
          <source>Client %1 too old, rejecting.</source>
-        <translation>Klient %1 for gammel, avviser.</translation>
+        <translation type="obsolete">Klient %1 for gammel, avviser.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="484"/>
+        <location filename="../src/core/core.cpp" line="496"/>
          <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 trenger å sende en init beskjed før du forsøker å logge inn.</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>Klient %1 sendte ikke en init beskjed før den forsøkte å logge inn, avviser.</translation>
+        <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="506"/>
+        <location filename="../src/core/core.cpp" line="518"/>
          <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 du oppga kunne ikke bli funnet i databasen.</translation>
      </message>
@@ -1010,17 +1134,17 @@ p, li { white-space: pre-wrap; }
          <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="523"/>
+        <location filename="../src/core/core.cpp" line="535"/>
          <source>Non-authed client disconnected.</source>
          <translation>Uautorisert klient frakoblet.</translation>
      </message>
      <message>
          <location filename="../src/core/core.cpp" line="568"/>
          <source>Could not initialize session for client %1!</source>
-        <translation>Kunne ikke initiere sesjonen for klient %1!</translation>
+        <translation type="obsolete">Kunne ikke initiere sesjonen for klient %1!</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="60"/>
+        <location filename="../src/core/core.cpp" line="61"/>
          <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>
@@ -1029,25 +1153,65 @@ kompilere ditt Qt bibliotek med sqlite aktivert for å få Quassel
  Kjernen til å virke.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="404"/>
+        <location filename="../src/core/core.cpp" line="416"/>
          <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;Din Quassel Klient er for gammel!&lt;/b&gt;&lt;br&gt;Denne Kjernen trenger minst Klient/Kjerne protokoll versjon %1.&lt;br&gt;Vennligst vurder å oppgradere klienten din.</translation>
      </message>
      <message>
-        <location filename="../src/core/core.cpp" line="421"/>
+        <location filename="../src/core/core.cpp" line="433"/>
          <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;Quassel Kjerne 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>Klient %1 initialisert og autentisiert suksessfullt som &quot;%2&quot; (BrukerID: %3).</translation>
+        <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="377"/>
+        <source>Client connected from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="524"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="418"/>
+        <source>too old, rejecting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="478"/>
+        <source>Starting TLS for Client:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="498"/>
+        <source>did not send an init message before trying to login, rejecting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="524"/>
+        <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="541"/>
+        <source>Non-authed client disconnected. (socket allready destroyed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="583"/>
+        <source>Could not initialize session for client:</source>
+        <translation type="unfinished"></translation>
      </message>
  </context>
  <context>
      <name>CoreAccountEditDlg</name>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="461"/>
          <source>Add Core Account</source>
          <translation>Legg til Kjerne Konto</translation>
      </message>
@@ -1077,7 +1241,7 @@ Kjernen til å virke.</translation>
          <translation>Rediger Kjerne Konto</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="86"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="90"/>
          <source>Port:</source>
          <translation>Port:</translation>
      </message>
@@ -1112,65 +1276,75 @@ Kjernen til å virke.</translation>
          <translation>Konto Navn:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="56"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="60"/>
          <source>Use built-in Quassel Core</source>
          <translation>Bruk innebygd Quassel Kjerne</translation>
      </message>
      <message>
          <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="76"/>
          <source>Remote host:</source>
-        <translation>Ekstern vert:</translation>
+        <translation type="obsolete">Ekstern vert:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="117"/>
          <source>Use secure connection (SSL)</source>
          <translation>Bruk sikker tilkobling (SSL)</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="124"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="133"/>
          <source>Use a proxy:</source>
          <translation>Bruk en proxy: </translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="136"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="145"/>
          <source>Proxy Type:</source>
          <translation>Proxy Type:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="153"/>
          <source>Socks 5</source>
          <translation>Socks 5</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="149"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="158"/>
          <source>HTTP</source>
          <translation>HTTP</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="157"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="166"/>
          <source>Proxy Host:</source>
          <translation>Proxy Vert:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="164"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="173"/>
          <source>Proxy Port:</source>
          <translation>Proxy Port:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="171"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="180"/>
          <source>localhost</source>
          <translation>localhost</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="188"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="197"/>
          <source>Proxy Username:</source>
          <translation>Proxy Brukernavn:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="198"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="207"/>
          <source>Proxy Password:</source>
          <translation>Proxy Passord:</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="36"/>
+        <source>Local Core</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="80"/>
+        <source>Hostname:</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>CoreConfigWizard</name>
@@ -1387,12 +1561,12 @@ p, li { white-space: pre-wrap; }
          <translation>Egenskaper...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="172"/>
          <source>Remove Account Settings</source>
          <translation>Fjern Konto Innstillinger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
          <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 dine lokale innstillinger for denne Quassel Kjerne kontoen?&lt;br&gt;Merk: Dette vil &lt;em&gt;ikke&lt;/em&gt; fjerne, eller endre noen data i selve Kjernen!</translation>
      </message>
@@ -1417,42 +1591,42 @@ p, li { white-space: pre-wrap; }
          <translation>Koble til</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="219"/>
          <source>Connect to %1</source>
          <translation>Koblet til %1</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="236"/>
          <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
          <translation>&lt;div style=color:red;&gt;Tilkobling til %1 feilet!&lt;/div&gt;</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="260"/>
          <source>Not connected to %1.</source>
          <translation>Ikke tilkoblet %1.</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="261"/>
          <source>Looking up %1...</source>
          <translation>Slår opp %1...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
          <source>Connecting to %1...</source>
          <translation>Kobler til %1...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="265"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
          <source>Connected to %1</source>
          <translation>Tilkoblet %1</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="266"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
          <source>Unknown connection state to %1</source>
          <translation>Ukjent tilkoblings tilstand til %1</translation>
      </message>
      <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="316"/>
          <source>Logging in...</source>
          <translation>Logger inn...</translation>
      </message>
@@ -1550,19 +1724,19 @@ space</source>
          <translation>Nettverks tilstander:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="522"/>
          <source>0/0</source>
          <translation>0/0</translation>
      </message>
      <message>
          <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
          <source>Channel states:</source>
-        <translation>Kanal tilstander:</translation>
+        <translation type="obsolete">Kanal tilstander:</translation>
      </message>
      <message>
          <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
          <source>User states:</source>
-        <translation>Bruker tilstander:</translation>
+        <translation type="obsolete">Bruker tilstander:</translation>
      </message>
  </context>
  <context>
@@ -1603,28 +1777,91 @@ space</source>
          <translation>Brukere</translation>
      </message>
  </context>
+<context>
+    <name>CoreInfoDlg</name>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="13"/>
+        <source>Core Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="21"/>
+        <source>Version:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="28"/>
+        <source>&lt;core version&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="35"/>
+        <source>Uptime:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="42"/>
+        <source>Connected Clients:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="49"/>
+        <source>&lt;connected clients&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="56"/>
+        <source>&lt;core uptime&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="63"/>
+        <source>Build date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="70"/>
+        <source>&lt;build date&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreinfodlg.ui" line="81"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>CoreSession</name>
      <message>
-        <location filename="../src/core/coresession.cpp" line="153"/>
+        <location filename="../src/core/coresession.cpp" line="162"/>
          <source>Default Identity</source>
          <translation>Standard Identitet</translation>
      </message>
      <message>
          <location filename="../src/core/coresession.cpp" line="241"/>
          <source>Client %1 disconnected (UserId: %2).</source>
-        <translation>Klient %1 frakoblet (BrukerId: %2).</translation>
+        <translation type="obsolete">Klient %1 frakoblet (BrukerId: %2).</translation>
      </message>
      <message>
-        <location filename="../src/core/coresession.cpp" line="410"/>
+        <location filename="../src/core/coresession.cpp" line="419"/>
          <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
          <translation>CoreSession::createNetwork(): Fikk ugyldig nettverks ID fra Kjernen under forsøket på å opprette nettverket %1!</translation>
      </message>
      <message>
-        <location filename="../src/core/coresession.cpp" line="425"/>
+        <location filename="../src/core/coresession.cpp" line="434"/>
          <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 i stedet for!</translation>
      </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="250"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="250"/>
+        <source>disconnected (UserId: %1).</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>CreateIdentityDlg</name>
@@ -1831,7 +2068,7 @@ space</source>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
          <source>Use system tray icon:</source>
-        <translation>Bruk system kurv ikon:</translation>
+        <translation type="obsolete">Bruk system kurv ikon:</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="28"/>
@@ -1846,7 +2083,7 @@ space</source>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
          <source>Tray icon:</source>
-        <translation>Kurv ikon:</translation>
+        <translation type="obsolete">Kurv ikon:</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="51"/>
@@ -1856,68 +2093,93 @@ space</source>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
          <source>User Notification:</source>
-        <translation>Bruk notifisering:</translation>
+        <translation type="obsolete">Bruk notifisering:</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="70"/>
          <source>Animate tray icon</source>
-        <translation>Animer kurv ikon</translation>
+        <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>Vis pop-up beskjeder</translation>
+        <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>Vi bruker relaterte beskjeder og private Merknader:</translation>
+        <translation type="obsolete">Vi bruker relaterte beskjeder og private Merknader:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="102"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="73"/>
          <source>in status buffer</source>
          <translation>i status buffer</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="115"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="86"/>
          <source>in query buffer (if exists)</source>
          <translation>i spørrings bugger (hvis den eksisterer)</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="125"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="96"/>
          <source>in current buffer</source>
          <translation>i nåværende buffer</translation>
      </message>
      <message>
          <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
          <source>Buffer view:</source>
-        <translation>Buffer visning:</translation>
+        <translation type="obsolete">Buffer visning:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="141"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="112"/>
          <source>Display topic in tooltip</source>
          <translation>Vis emne i verktøytips</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="119"/>
          <source>Mouse wheel changes displayed buffers</source>
          <translation>Rulleknappen på musen endrer viste buffere</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="132"/>
          <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
          <translation>Endelsen tillagt 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>Innskrivningslinje:</translation>
+        <translation type="obsolete">Innskrivningslinje:</translation>
      </message>
      <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="143"/>
          <source>Completion suffix:</source>
          <translation>Fullførings suffiks:</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="19"/>
+        <source>Show System Tray Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="45"/>
+        <source>Tray Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
+        <source>Display User-Related Messages And Private Notices:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="106"/>
+        <source>Buffer View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="135"/>
+        <source>Input Line</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>HighlightSettingsPage</name>
@@ -2055,7 +2317,7 @@ space</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.ui" line="33"/>
          <source>Rename Identity</source>
          <translation>Omdøp Identitet</translation>
      </message>
@@ -2204,6 +2466,11 @@ space</source>
          <source>Kick Reason:</source>
          <translation>Spark Grunn:</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <source>Rename Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>Identity</name>
@@ -2295,160 +2562,170 @@ space</source>
          <translation type="obsolete">Mottok ugyldig MODE fra %s: %s</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="411"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="436"/>
          <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="515"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="542"/>
          <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="526"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="553"/>
          <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="597"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="624"/>
          <source>[Whois] %1 is %2 (%3)</source>
          <translation>[Whois] %1 er %2 (%3)</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="612"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="639"/>
          <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="723"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="750"/>
          <source>[Whois] %1</source>
          <translation>[Whois] %1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="891"/>
          <source>[Whowas] %1</source>
          <translation>[Whowas] %1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="642"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="669"/>
          <source>[Whowas] %1 was %2 (%3)</source>
          <translation>[Whowas] %1 var %2 (%3)</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="683"/>
          <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="676"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="703"/>
          <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="678"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="705"/>
          <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="681"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="708"/>
          <source>[Whois] idle message: %1</source>
          <translation>[Whois] inaktiv beskjed: %1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
          <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="715"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="742"/>
          <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="717"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="744"/>
          <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="777"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
          <source>No topic is set for %1.</source>
          <translation>Inget emne satt for %1.</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="789"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="816"/>
          <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="800"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="827"/>
          <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="823"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="850"/>
          <source>[Who] %1</source>
          <translation>[Who] %1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="877"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="904"/>
          <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
          <translation>Det er et Kallenavn i din identitets kallanavnsliste som inneholder ugyldige karakterer</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="878"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="905"/>
          <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-servere også) klarte vi ikke å avgjøre et feilbetjenings kallenavn</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="879"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="906"/>
          <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>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="882"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="909"/>
          <source>Nick %1 contains illegal characters</source>
          <translation>Kallenavn %1 inneholder ugyldige karakterer</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="894"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="921"/>
          <source>Nick already in use: %1</source>
          <translation>Kallenavnet er allerede i bruk: %1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="917"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="944"/>
          <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="480"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="507"/>
          <source>%1</source>
          <translation>%1</translation>
      </message>
      <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="745"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
          <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="754"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="781"/>
          <source>End of channel list</source>
          <translation>Slutt på Kanal listen</translation>
      </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="461"/>
+        <source>Received RPL_ISUPPORT (005) without parameters!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="469"/>
+        <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>IrcUserItem</name>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="606"/>
+        <location filename="../src/client/networkmodel.cpp" line="684"/>
          <source>idling since %1</source>
          <translation>inaktiv siden %1</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="609"/>
+        <location filename="../src/client/networkmodel.cpp" line="687"/>
          <source>login time: %1</source>
          <translation>Tid for pålogging: %1</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="612"/>
+        <location filename="../src/client/networkmodel.cpp" line="690"/>
          <source>server: %1</source>
          <translation>server: %1</translation>
      </message>
@@ -2479,17 +2756,17 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>MainWin</name>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="88"/>
+        <location filename="../src/qtui/mainwin.cpp" line="97"/>
          <source>Waiting for core...</source>
          <translation>Venter på kjernen...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="468"/>
+        <location filename="../src/qtui/mainwin.cpp" line="497"/>
          <source>Not connected to core.</source>
          <translation>Ikke tilkoblet kjernen.</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="320"/>
          <source>Edit &amp;Networks...</source>
          <translation>Rediger &amp;Nettverk...</translation>
      </message>
@@ -2519,27 +2796,27 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Full tilpassning</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="255"/>
+        <location filename="../src/qtui/mainwin.cpp" line="271"/>
          <source>Nicks</source>
          <translation>Kallenavn</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="274"/>
+        <location filename="../src/qtui/mainwin.cpp" line="290"/>
          <source>Chat Monitor</source>
          <translation>Chat Monitor</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="296"/>
+        <location filename="../src/qtui/mainwin.cpp" line="312"/>
          <source>Inputline</source>
          <translation>Skrivelinje</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="313"/>
+        <location filename="../src/qtui/mainwin.cpp" line="329"/>
          <source>Topic</source>
          <translation>Emne</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="416"/>
+        <location filename="../src/qtui/mainwin.cpp" line="439"/>
          <source>Connected to core.</source>
          <translation>Tilkoblet kjernen.</translation>
      </message>
@@ -2559,17 +2836,17 @@ p, li { white-space: pre-wrap; }
          <translation>&amp;Nettverk</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="70"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="71"/>
          <source>&amp;Settings</source>
          <translation>&amp;Innstillinger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="76"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="77"/>
          <source>&amp;Views</source>
          <translation>&amp;Visninger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="91"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="92"/>
          <source>&amp;Help</source>
          <translation>&amp;Hjelp</translation>
      </message>
@@ -2579,107 +2856,107 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">Feil&amp;søk</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="116"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="124"/>
          <source>&amp;Network List...</source>
          <translation>&amp;Nettverks liste...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="119"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="127"/>
          <source>F2</source>
          <translation>F2</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="127"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="135"/>
          <source>Quick &amp;Connect...</source>
          <translation>Hurtig&amp;tilkobling...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="238"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="255"/>
          <source>Disconnect</source>
          <translation>Koble fra</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="143"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="151"/>
          <source>Reconnect</source>
          <translation>Koble til på nytt</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="151"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="159"/>
          <source>Join Channel...</source>
          <translation>Bli med i Kanal...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="162"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="170"/>
          <source>Set Away globally</source>
          <translation>Sett Borte globalt</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="174"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
          <source>Quit...</source>
          <translation>Avslutt...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="190"/>
          <source>Edit Identities...</source>
          <translation>Rediger identiteter...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="191"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="199"/>
          <source>Configure Quassel...</source>
          <translation>Konfigurere Quassel...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="194"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
          <source>F7</source>
          <translation>F7</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="206"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="217"/>
          <source>Manage Views...</source>
          <translation>Administrer Visninger...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="211"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="222"/>
          <source>About Qt...</source>
          <translation>Om Qt...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="223"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="237"/>
          <source>About Quassel IRC...</source>
          <translation>Om Quassel IRC...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="228"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="245"/>
          <source>Import Backlog</source>
          <translation>Importer Historikk</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="233"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="250"/>
          <source>Connect</source>
          <translation>Koble til</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="243"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="260"/>
          <source>Internal</source>
          <translation>Internt</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="255"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="272"/>
          <source>Disconnect from Core</source>
          <translation>Koble fra Kjernen</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="267"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="284"/>
          <source>Connect to Core...</source>
          <translation>Koble til Kjerne...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="272"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="289"/>
          <source>Debug &amp;Console</source>
          <translation>Feilsøkings&amp;konsoll</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="277"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
          <source>Disconnect from Network...</source>
          <translation>Koble fra Nettverk...</translation>
      </message>
@@ -2689,25 +2966,40 @@ p, li { white-space: pre-wrap; }
          <translation type="obsolete">&amp;Rediger Nettverk...</translation>
      </message>
      <message>
-        <location filename="../src/qtui/mainwin.cpp" line="334"/>
+        <location filename="../src/qtui/mainwin.cpp" line="356"/>
          <source>Statusbar</source>
          <translation>Statuslinje</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="80"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="81"/>
          <source>Buffer Views</source>
          <translation>Buffer visninger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="286"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="303"/>
          <source>Manage Buffer Views</source>
          <translation>Administrer Buffer visninger</translation>
      </message>
      <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="294"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="311"/>
          <source>Lock Dock Positions</source>
          <translation>Lås Dock posisjonene</translation>
      </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="96"/>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="329"/>
+        <source>Core Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/mainwin.ui" line="334"/>
+        <source>NetworkModel</source>
+        <translation type="unfinished"></translation>
+    </message>
  </context>
  <context>
      <name>Message</name>
@@ -2845,27 +3137,27 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>NetworkConnection</name>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="190"/>
+        <location filename="../src/core/networkconnection.cpp" line="194"/>
          <source>Connection failed. Cycling to next Server</source>
          <translation>Tilkobling feilet. Forsøker med neste Server</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="200"/>
+        <location filename="../src/core/networkconnection.cpp" line="204"/>
          <source>Connecting to %1:%2...</source>
          <translation>Kobler til %1:%2...</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="253"/>
+        <location filename="../src/core/networkconnection.cpp" line="260"/>
          <source>Disconnecting.</source>
          <translation>Kobler fra.</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="276"/>
+        <location filename="../src/core/networkconnection.cpp" line="281"/>
          <source>Could not connect to %1 (%2)</source>
          <translation>Kunne ikke koble til %1 (%2)</translation>
      </message>
      <message>
-        <location filename="../src/core/networkconnection.cpp" line="278"/>
+        <location filename="../src/core/networkconnection.cpp" line="283"/>
          <source>Connection failure: %1</source>
          <translation>Tilkoblingsfeil: %1</translation>
      </message>
@@ -2891,17 +3183,17 @@ p, li { white-space: pre-wrap; }
  <context>
      <name>NetworkModel</name>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="711"/>
          <source>Buffer</source>
          <translation>Buffer</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="711"/>
          <source>Topic</source>
          <translation>Emne</translation>
      </message>
      <message>
-        <location filename="../src/client/networkmodel.cpp" line="637"/>
+        <location filename="../src/client/networkmodel.cpp" line="711"/>
          <source>Nick Count</source>
          <translation>Antall Kallenavn</translation>
      </message>
@@ -3216,86 +3508,144 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
  <context>
      <name>NickView</name>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="114"/>
+        <location filename="../src/uisupport/nickview.cpp" line="100"/>
          <source>WHOIS</source>
          <translation>WHOIS</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="115"/>
+        <location filename="../src/uisupport/nickview.cpp" line="101"/>
          <source>VERSION</source>
          <translation>VERSION</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="116"/>
+        <location filename="../src/uisupport/nickview.cpp" line="102"/>
          <source>PING</source>
          <translation>PING</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="120"/>
+        <location filename="../src/uisupport/nickview.cpp" line="106"/>
          <source>Modes</source>
          <translation>Modes</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="121"/>
+        <location filename="../src/uisupport/nickview.cpp" line="107"/>
          <source>Op %1</source>
          <translation>Op %1</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="122"/>
+        <location filename="../src/uisupport/nickview.cpp" line="108"/>
          <source>Deop %1</source>
          <translation>Deop %1</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="123"/>
+        <location filename="../src/uisupport/nickview.cpp" line="109"/>
          <source>Voice %1</source>
          <translation>Voice %1</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="124"/>
+        <location filename="../src/uisupport/nickview.cpp" line="110"/>
          <source>Devoice %1</source>
          <translation>Devoice %1</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="126"/>
+        <location filename="../src/uisupport/nickview.cpp" line="112"/>
          <source>Kick/Ban</source>
          <translation>Kick/Ban</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="127"/>
+        <location filename="../src/uisupport/nickview.cpp" line="113"/>
          <source>Kick %1</source>
          <translation>Kick %1</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="129"/>
+        <location filename="../src/uisupport/nickview.cpp" line="115"/>
          <source>Kickban %1</source>
          <translation>Kickban %1</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="130"/>
+        <location filename="../src/uisupport/nickview.cpp" line="116"/>
          <source>Ignore</source>
          <translation>Ignore</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="135"/>
+        <location filename="../src/uisupport/nickview.cpp" line="121"/>
          <source>Query</source>
          <translation>Query</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="136"/>
+        <location filename="../src/uisupport/nickview.cpp" line="122"/>
          <source>DCC-Chat</source>
          <translation>DCC-Chat</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="138"/>
+        <location filename="../src/uisupport/nickview.cpp" line="124"/>
          <source>Send file</source>
          <translation>Send fil</translation>
      </message>
      <message>
-        <location filename="../src/uisupport/nickview.cpp" line="128"/>
+        <location filename="../src/uisupport/nickview.cpp" line="114"/>
          <source>Ban %1</source>
          <translation>Ban %1</translation>
      </message>
  </context>
+<context>
+    <name>NotificationsSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Behaviour</source>
+        <translation type="unfinished">Oppførsel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Skjema</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="19"/>
+        <source>System Tray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="25"/>
+        <source>Animate tray icon</source>
+        <translation type="unfinished">Animer kurv ikon</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="35"/>
+        <source>Show Bubble</source>
+        <translation type="unfinished"></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="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="48"/>
+        <source>Desktop Notification (via DBus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="59"/>
+        <source>Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="79"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.ui" line="93"/>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>QtopiaMainWin</name>
      <message>
@@ -3337,31 +3687,54 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
  <context>
      <name>Quassel::secondsToString()</name>
      <message>
-        <location filename="../src/common/util.cpp" line="165"/>
+        <location filename="../src/common/util.cpp" line="192"/>
          <source>year</source>
          <translation>år</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="166"/>
+        <location filename="../src/common/util.cpp" line="193"/>
          <source>day</source>
          <translation>dag</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="167"/>
+        <location filename="../src/common/util.cpp" line="194"/>
          <source>h</source>
          <translation>t</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="168"/>
+        <location filename="../src/common/util.cpp" line="195"/>
          <source>min</source>
          <translation>min</translation>
      </message>
      <message>
-        <location filename="../src/common/util.cpp" line="169"/>
+        <location filename="../src/common/util.cpp" line="196"/>
          <source>sec</source>
          <translation>sek</translation>
      </message>
  </context>
+<context>
+    <name>QueryBufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="311"/>
+        <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;Spørring med %1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="329"/>
+        <source>idling since %1</source>
+        <translation type="unfinished">inaktiv siden %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="332"/>
+        <source>login time: %1</source>
+        <translation type="unfinished">Tid for pålogging: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="335"/>
+        <source>server: %1</source>
+        <translation type="unfinished">server: %1</translation>
+    </message>
+</context>
  <context>
      <name>SaveIdentitiesDlg</name>
      <message>
@@ -3497,14 +3870,50 @@ Disse innstillingene definerer kodingen for beskjeder som ikke er Utf8.</transla
          <translation>Konfigurer Quassel</translation>
      </message>
  </context>
+<context>
+    <name>SignalProxy</name>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Client tried to send package larger than max package size!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="958"/>
+        <source>Disconnecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="958"/>
+        <source>local client</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
  <context>
      <name>SqliteStorage</name>
      <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="49"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="50"/>
          <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 database motor som ikke krever konfigurering. Den passer for små og medium store databaser som ikke krever tilgang fra nettverk. Bruk SQLite hvis din Quassel Kjerne skal lagre dataene på den samme maskinen som den kjører på, og kun hvis du forventer at et fåtall personer skal benytte din Kjerne.</translation>
      </message>
  </context>
+<context>
+    <name>StatusBufferItem</name>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="275"/>
+        <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;Status buffer av %1&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="277"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt; %1 &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.h" line="139"/>
+        <source>Status Buffer</source>
+        <translation type="unfinished">Status buffer</translation>
+    </message>
+</context>
  <context>
      <name>StorageDetailsPage</name>
      <message>
@@ -3728,7 +4137,7 @@ Click to edit!</source>
  <context>
      <name>UserCategoryItem</name>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="489"/>
+        <location filename="../src/client/networkmodel.cpp" line="566"/>
          <source>%n Owner(s)</source>
          <translation>
              <numerusform>%n Owner</numerusform>
@@ -3736,7 +4145,7 @@ Click to edit!</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="490"/>
+        <location filename="../src/client/networkmodel.cpp" line="567"/>
          <source>%n Admin(s)</source>
          <translation>
              <numerusform>%n Admin</numerusform>
@@ -3744,7 +4153,7 @@ Click to edit!</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="491"/>
+        <location filename="../src/client/networkmodel.cpp" line="568"/>
          <source>%n Operator(s)</source>
          <translation>
              <numerusform>%n Operator</numerusform>
@@ -3752,7 +4161,7 @@ Click to edit!</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="492"/>
+        <location filename="../src/client/networkmodel.cpp" line="569"/>
          <source>%n Half-Op(s)</source>
          <translation>
              <numerusform>%n Half-Op</numerusform>
@@ -3760,7 +4169,7 @@ Click to edit!</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="493"/>
+        <location filename="../src/client/networkmodel.cpp" line="570"/>
          <source>%n Voiced</source>
          <translation>
              <numerusform>%n Voiced</numerusform>
@@ -3768,7 +4177,7 @@ Click to edit!</source>
          </translation>
      </message>
      <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="494"/>
+        <location filename="../src/client/networkmodel.cpp" line="571"/>
          <source>%n User(s)</source>
          <translation>
              <numerusform>%n User</numerusform>
@@ -3779,7 +4188,7 @@ Click to edit!</source>
  <context>
      <name>UserInputHandler</name>
      <message>
-        <location filename="../src/core/userinputhandler.cpp" line="113"/>
+        <location filename="../src/core/userinputhandler.cpp" line="121"/>
          <source>sending CTCP-%1 request</source>
          <translation>Sender CTCP-%1 forespørsel</translation>
      </message>
author	ZRegis <crperrin@gmail.com>
	Sat, 2 Aug 2008 17:04:22 +0000 (19:04 +0200)
committer	Manuel Nickschas <sputnick@quassel-irc.org>
	Tue, 5 Aug 2008 14:59:38 +0000 (16:59 +0200)
i18n/quassel_da.ts		patch \| blob \| history
i18n/quassel_nb_NO.ts		patch \| blob \| history