From 16782a0cffe92acd212d3885361302db0a21263b Mon Sep 17 00:00:00 2001
From: Jure Repinc <jlp@holodeck1.com>
Date: Fri, 20 Feb 2009 16:26:53 +0100
Subject: [PATCH] Updated Slovenian translation for Quassel IRC 0.4.0

---
 i18n/quassel_sl.ts | 2134 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 1559 insertions(+), 575 deletions(-)

diff --git a/i18n/quassel_sl.ts b/i18n/quassel_sl.ts
index a37add9..5f6c088 100644
--- a/i18n/quassel_sl.ts
+++ b/i18n/quassel_sl.ts
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="sl">
+<!DOCTYPE TS>
+<TS version="2.0" language="sl">
 <context>
     <name></name>
     <message>
-        <location filename="../src/common/message.h" line="68"/>
         <source>Day changed to %1</source>
-        <translation>Dan se je spremenil v %1</translation>
+        <translation type="obsolete">Dan se je spremenil v %1</translation>
     </message>
 </context>
 <context>
@@ -16,32 +16,36 @@
         <translation>&lt;b&gt;Različica:&lt;/b&gt; %1&lt;br&gt;&lt;b&gt;Različica protokola:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Zgrajeno:&lt;/b&gt; %3</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="46"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
         <translation>&lt;b&gt;Moderen, porazdeljen odjemalec za IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 projekt Quassel&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; na &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC je izdan pod pogoji licenc &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; in &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Večina ikon je &amp;copy; s strani &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;ekipe Oxygen&lt;/a&gt; in uporabljenih pod pogoji &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Za poročanje o napakah obiščite stran &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;bugs.quassel-irc.org&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="63"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="62"/>
         <source>Quassel IRC is mainly developed by:</source>
         <translation>Quassel IRC v glavnem razvijajo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="78"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="77"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
         <translation>Radi bi se zahvalili sledečim sodelavcem (v abecednem vrstnem redu) in vsem, ki smo jih pozabili omeniti tu:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="118"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="115"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for the original Quassel icon - The All-Seeing Eye&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating all the artwork you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more&lt;/dd&gt;&lt;dt&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
+        <translation>Posebno zahvalo si zaslužijo:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/quassel-eye.png&quot;&gt;&amp;nbsp;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za originalno ikono za Quassel - Vse-vidno oko&lt;/dt&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/oxygen.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Ekipa Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo vse grafike, ki jo vidite v Quassel&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/qt-logo-32.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, nekdaj znani kot Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo Qt in Qtopia ter sponzoriranje razvoja QuasselTopia z Greenphone in ostalim&lt;/dd&gt;&lt;dt&gt;&lt;img src=&quot;:/pics/nokia.png&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za nadaljnji razvoj Qt in za sponzoriranje razvoja Quassel Mobile z večimi N810&lt;/dd&gt;</translation>
+    </message>
+    <message>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software formerly known as Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s&lt;/dd&gt;</source>
-        <translation>Posebno zahvalo si zaslužijo:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za odlično grafiko in logo/ikono za Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;ekipa Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo večine ostalih čudovitih ikon, ki jih vidite v Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, nekdaj znani kot Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo Qt in Qtopia ter sponzoriranje razvoja QuasselTopia z Greenphone in ostalim&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za nadaljnji razvoj Qt in za sponzoriranje razvoja Quassel Mobile z večimi N810&lt;/dd&gt;</translation>
+        <translation type="obsolete">Posebno zahvalo si zaslužijo:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za odlično grafiko in logo/ikono za Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;ekipa Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo večine ostalih čudovitih ikon, ki jih vidite v Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, nekdaj znani kot Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za izdelavo Qt in Qtopia ter sponzoriranje razvoja QuasselTopia z Greenphone in ostalim&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.nokia.com&quot;&gt;Nokia&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;za nadaljnji razvoj Qt in za sponzoriranje razvoja Quassel Mobile z večimi N810&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="17"/>
         <source>About Quassel</source>
         <translation>O Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="59"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -52,7 +56,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="75"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -63,22 +67,22 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Različica 0.2.0-pre, gradnja &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>A&amp;vtorji</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="155"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Sodelavci</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Zahvale</translation>
     </message>
@@ -86,15 +90,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AbstractSqlStorage</name>
     <message>
-        <location filename="../src/core/abstractsqlstorage.cpp" line="103"/>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="104"/>
         <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
         <translation>Nameščena shema (različica %1) ni ažurna. Nadgradnja na različico %2 ...</translation>
     </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="106"/>
+        <source>Upgrade failed...</source>
+        <translation>Nadgradnja ni uspela.</translation>
+    </message>
 </context>
 <context>
     <name>AliasesModel</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/aliasesmodel.cpp" line="159"/>
         <source>Alias</source>
         <translation>Vzdevek</translation>
     </message>
@@ -107,9 +116,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AliasesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
@@ -117,6 +125,11 @@ p, li { white-space: pre-wrap; }
         <translation>Vzdevki</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.ui" line="13"/>
         <source>Form</source>
         <translation>Obrazec</translation>
@@ -135,67 +148,175 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="36"/>
         <source>Appearance</source>
         <translation>Videz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="68"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
         <translation>&lt;sistemsko privzeto&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="14"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Slog odjemalca</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Nastavite slog programa</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Jezik</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Nastavite jezik programa. Potreben je ponovni zagon programa.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Pisave</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="68"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Nastavite pisavo za glavno okno klepeta in nadzorovalnik klepeta</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Okno klepeta:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="93"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="141"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Pisava</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="109"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="157"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Izbor ...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="116"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Nastavite pisavo za seznama kanalov in vzdevkov</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Seznam kanalov:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="164"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Nastavite pisavo za vnosno vrstico</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Vnosna vrstica:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="221"/>
+        <source>Show a website preview window when hovering the mouse over a web address</source>
+        <translation>Prikaži namig z ogledom spletne strani, ko miška lebdi nad spletno povezavo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Ob lebdenju nad povezavo prikaži ogled strani</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>V seznamih kanalov in vzdevkov prikaži ikone stanj</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>V seznamih kanalov in vzdevkov prikaži ikone</translation>
+    </message>
+    <message>
         <source>Client style:</source>
-        <translation>Slog odjemalca:</translation>
+        <translation type="obsolete">Slog odjemalca:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Jezik:</translation>
+        <translation type="obsolete">Jezik:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>&lt;Original&gt;</source>
         <translation>&lt;prvotni&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>Pomnite: za uveljavitev je potrebno znova zagnati program!</translation>
+        <translation type="obsolete">Pomnite: za uveljavitev je potrebno znova zagnati program!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Razno:</translation>
+        <translation type="obsolete">Razno:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Prikaži oglede spletnih strani</translation>
+        <translation type="obsolete">Prikaži oglede spletnih strani</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Za prikaz stanja uporabnikov uporabi ikone</translation>
+        <translation type="obsolete">Za prikaz stanja uporabnikov uporabi ikone</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Dnevnik ob odsotnosti</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Prikaži ime omrežja</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Prikaži ime prikaza</translation>
     </message>
 </context>
 <context>
     <name>BacklogSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
@@ -203,91 +324,111 @@ p, li { white-space: pre-wrap; }
         <translation>Stara sporočila</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
         <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="13"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
         <source>Backlog Request Method:</source>
         <translation>Način zahtevanja starih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
         <source>Fixed Amount per Buffer</source>
         <translation>Fiksno število na prikaz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
         <source>Unread Messages per Buffer</source>
         <translation>Neprebranih sporočil na prikaz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="39"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
         <source>Global Unread Messages</source>
         <translation>Globalno neprebranih sporočil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="69"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="122"/>
         <source>The simplest Requester. It fetches a fixed amount of lines for each buffer from the Backlog.</source>
         <translation>Najbolj preprost način. Iz zgodovine sporočil pridobi fiksno število vrstic za vsak prikaz.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="84"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="137"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
         <translation>Število sporočil na prikaz, ki so zahtevana po vzpostavljeni povezavi z jedrom.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
         <source>Initial backlog amount:</source>
         <translation>Začetno število starih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="103"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="156"/>
         <source>FixedBacklogAmount</source>
         <translation>FixedBacklogAmount</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="145"/>
         <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
 
 You can also chose to fetch additional older chatlines to provide a better context.</source>
+        <translation type="obsolete">Pridobi neprebrana sporočila za vsak prikaz posebaj. Število vrstic lahko omejite za vsak prikaz.
+
+Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="198"/>
+        <source>This requester fetches unread messages for each buffer individually. The amount of lines can be limited per buffer.
+
+You can also choose to fetch additional older chatlines to provide a better context.</source>
         <translation>Pridobi neprebrana sporočila za vsak prikaz posebaj. Število vrstic lahko omejite za vsak prikaz.
 
 Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="288"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="215"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="225"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
         <source>Maximum amount of messages to be fetched per buffer.</source>
         <translation>Največje število pridobljenih sporočil na prikaz.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="281"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="218"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
         <source>Limit:</source>
         <translation>Omejitev:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="237"/>
         <source>PerBufferUnreadBacklogLimit</source>
         <translation>PerBufferUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="320"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="247"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="257"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="363"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="373"/>
         <source>Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here.</source>
         <translation>Število sporočil, ki naj se pridobijo poleg neprebranih sporočil. Omejitev tu nima veljave.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="250"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
         <source>Additional Messages:</source>
         <translation>Dodatna sporočila:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="269"/>
         <source>PerBufferUnreadBacklogAdditional</source>
         <translation>PerBufferUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="258"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
         <source>This requester fetches all messages newer than the oldest unread message for all buffers.
 
 Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
@@ -302,32 +443,32 @@ Uporaben je za omejitev skupnega števila starih sporočil in je verjetno najhit
 Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="278"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
         <source>Maximum amount of messages to be fetched over all buffers.</source>
         <translation>Največje število sporočil, pridobljenih za vse prikaze.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="300"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="353"/>
         <source>GlobalUnreadBacklogLimit</source>
         <translation>GlobalUnreadBacklogLimit</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="332"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="385"/>
         <source>GlobalUnreadBacklogAdditional</source>
         <translation>GlobalUnreadBacklogAdditional</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="376"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="21"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
         <translation>Število sporočil, ki se jih zahteva od jedra ob pomiku proti vrhu prikazu prikaza.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
         <source>Dynamic backlog amount:</source>
         <translation>Dinamično število starih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="395"/>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="40"/>
         <source>DynamicBacklogAmount</source>
         <translation>DynamicBacklogAmount</translation>
     </message>
@@ -335,7 +476,7 @@ Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.<
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="296"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 - %2 &lt;/p&gt;</translation>
     </message>
@@ -343,12 +484,12 @@ Za boljši kontekst lahko izberete tudi pridobivanje dodatnih starih sporočil.<
 <context>
     <name>BufferView</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="241"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
         <source>Merge buffers permanently?</source>
         <translation>Trajno združim prikaza?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="242"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
         <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
  This cannot be reversed!</source>
         <translation>Ali želite trajno združiti prikaz »%1« v prikaz »%2«?
@@ -368,7 +509,7 @@ Tega kasneje ni moč razveljaviti!</translation>
         <translation>Vnesite ime za prikaz:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="519"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Dodaj prikaz</translation>
     </message>
@@ -376,35 +517,44 @@ Tega kasneje ni moč razveljaviti!</translation>
 <context>
     <name>BufferViewFilter</name>
     <message>
-        <location filename="../src/uisupport/bufferviewfilter.cpp" line="51"/>
         <source>Edit Mode</source>
-        <translation>Način za urejanje</translation>
+        <translation type="obsolete">Način za urejanje</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Prikaži/skrij prikaze</translation>
     </message>
 </context>
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
         <source>Buffer Views</source>
         <translation>Prikazi</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="117"/>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="99"/>
         <source>All</source>
         <translation>Vsa</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="338"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Zbrišem prikaz?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="339"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Ali res želite zbrisati prikaz »%1«?</translation>
     </message>
@@ -537,14 +687,13 @@ V tem načinu ni ločenega prikaza stanja.</translation>
         <translation>Dejanska velikost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="64"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -555,32 +704,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="458"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kanal %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="461"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Uporabniki:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="465"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Način:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="477"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Tema:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="481"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Ni aktiven &lt;br /&gt; Za pridružitev dvo-kliknite</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="484"/>
+        <location filename="../src/client/networkmodel.cpp" line="487"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
@@ -638,9 +787,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatMonitorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
@@ -648,6 +796,11 @@ p, li { white-space: pre-wrap; }
         <translation>Nadzorovalnik klepeta</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
+    <message>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="58"/>
         <source>Opt In</source>
         <translation>Vključi</translation>
@@ -658,6 +811,7 @@ p, li { white-space: pre-wrap; }
         <translation>Izvzemi</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="236"/>
         <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="132"/>
         <source>Show:</source>
         <translation>Prikaži:</translation>
@@ -751,7 +905,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChatScene</name>
     <message>
-        <location filename="../src/qtui/chatscene.cpp" line="582"/>
+        <location filename="../src/qtui/chatscene.cpp" line="580"/>
         <source>Copy Selection</source>
         <translation>Skopiraj izbor</translation>
     </message>
@@ -764,6 +918,8 @@ p, li { white-space: pre-wrap; }
         <translation>Obrazec</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="19"/>
+        <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="33"/>
         <location filename="../src/qtui/ui/chatviewsearchbar.ui" line="44"/>
         <source>...</source>
         <translation>...</translation>
@@ -797,20 +953,19 @@ p, li { white-space: pre-wrap; }
         <translation>Identiteta v odjemalcu že obstaja!</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="320"/>
+        <location filename="../src/client/client.cpp" line="317"/>
         <source>All Buffers</source>
         <translation>Vsi prikazi</translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="330"/>
         <source>Default Identity</source>
-        <translation>Privzeta identiteta</translation>
+        <translation type="obsolete">Privzeta identiteta</translation>
     </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="119"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>Obdelanih %1 sporočil v %2 sekundah.</translation>
     </message>
@@ -828,32 +983,33 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;b&gt;Od jedra je bil prejet neveljaven podatek.&lt;/b&gt;&lt;br&gt;Prekinjam povezavo.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="104"/>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
         <source>No Host to connect to specified.</source>
         <translation>Podanega ni nobenega gostitelja za povezavo.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="113"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
         <translation>&lt;b&gt;Odjemalec je bil zgrajen brez podpore za SSL.&lt;/b&gt;&lt;br /&gt;V nastavitvah računa onemogočite uporabo SSL.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="198"/>
+        <location filename="../src/client/clientsyncer.cpp" line="195"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
         <translation>&lt;b&gt;Jedro Quassel, s katerim se želite povezati, je prestaro.&lt;/b&gt;&lt;br&gt;Za povezavo je potreben vsaj protokol različice %1.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="221"/>
+        <location filename="../src/client/clientsyncer.cpp" line="219"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
         <translation>&lt;b&gt;Jedro Quassel, s katerim se želite povezati, ne podpira SSL.&lt;/b&gt;&lt;br /&gt;Če se vseeno želite povezati, v nastavitvah računa onemogočite uporabo SSL.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="250"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Prijavljanje ...</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="409"/>
+        <location filename="../src/client/clientsyncer.cpp" line="382"/>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
         <source>Cert Digest changed! was: %1</source>
         <translation>Povzetek potrdila se je spremenil. Bil je: %1</translation>
     </message>
@@ -871,39 +1027,32 @@ p, li { white-space: pre-wrap; }
         <translation>Nastavitve barv</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="565"/>
         <source>Buffers</source>
-        <translation>Prikazi</translation>
+        <translation type="obsolete">Prikazi</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="567"/>
         <source>Network</source>
-        <translation>Omrežje</translation>
+        <translation type="obsolete">Omrežje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="571"/>
         <source>#incative</source>
-        <translation>#neaktiven</translation>
+        <translation type="obsolete">#neaktiven</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="575"/>
         <source>#regular</source>
-        <translation>#običajen</translation>
+        <translation type="obsolete">#običajen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="578"/>
         <source>#highlight</source>
-        <translation>#poudarek</translation>
+        <translation type="obsolete">#poudarek</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="584"/>
         <source>#new message</source>
-        <translation>#novo sporočilo</translation>
+        <translation type="obsolete">#novo sporočilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="590"/>
         <source>#other activity</source>
-        <translation>#druga aktivnost</translation>
+        <translation type="obsolete">#druga aktivnost</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="19"/>
@@ -911,293 +1060,526 @@ p, li { white-space: pre-wrap; }
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="37"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="29"/>
         <source>Bufferview</source>
         <translation>Prikaz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="43"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="35"/>
         <source>Activities:</source>
         <translation>Aktivnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="49"/>
         <source>FG</source>
-        <translation>OS</translation>
+        <translation type="obsolete">OS</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="59"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="51"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>OZ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="958"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="64"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="404"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="648"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1026"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Uporabi OZ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="85"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Poudarek:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="128"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Novo sporočilo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="171"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Druga aktivnost:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="230"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Ogled:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="237"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="270"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Prikaz klepeta</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="294"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Aktivnost strežnika</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="935"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="41"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="384"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="625"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1003"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Ospredje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="945"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
+        <source>Default:</source>
+        <translation>Privzeto:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
+        <source>Inactive:</source>
+        <translation>Neaktivno:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="394"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="635"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="333"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Sporočilo napake:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Sporočilo opombe:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Navadno sporočilo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="471"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Sporočilo strežnika:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="517"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Poudarjeno sporočilo:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="556"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Uporabniška aktivnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="661"/>
         <source>Action Message:</source>
         <translation>Sporočilo aktivnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="644"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Sporočilo pridružitve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="690"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Sporočilo brce:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="736"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Sporočilo načina:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="782"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Sporočilo zapustitve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="828"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Sporočilo končanja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="874"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Sporočilo preimenovanja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="929"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Sporočilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="971"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Časovna oznaka:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1017"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Pošiljatelj:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1063"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Vzdevek:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1109"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Maska gostitelja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Ime kanala:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1201"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Zastavice načina:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1247"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1293"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Označevalnik novih sporočil:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1320"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Omogoči</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Samodejno barvanje pošiljateljev:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Barvne kode mIRCa</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1332"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Barvne kode</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1338"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Barva 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1359"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Barva 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1380"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Barva 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1401"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Barva 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1422"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Barva 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1443"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Barva 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1464"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Barva 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1485"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Barva 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1506"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Barva 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Barva 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1520"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Barva 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1527"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Barva 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Barva 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1541"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Barva 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1548"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Barva 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Barva 9:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
+        <source>Nickview</source>
+        <translation>Prikaz vzdevkov</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
+        <source>Nick status:</source>
+        <translation>Stanje vzdevka:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
+        <source>Online:</source>
+        <translation>Na zvazi:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
+        <source>Away:</source>
+        <translation>Odsoten:</translation>
+    </message>
 </context>
 <context>
     <name>ContentsChatItem</name>
     <message>
-        <location filename="../src/qtui/chatitem.cpp" line="610"/>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
         <source>Copy Link Address</source>
         <translation>Skopiraj naslov povezave</translation>
     </message>
 </context>
 <context>
+    <name>ContextMenuActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>Poveži se</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Prekini povezavo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Pridruži se</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Zapusti</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>Zbriši prikaz(e) ...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Prikaži prikaz</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Pridružitve</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Zapustitve</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Končanja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Spremembe vzdevkov</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>Spremembe načina</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Spremembe dneva</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Nastavi kot privzeto ...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Uporabi privzeto ...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Pridruži se kanalu ...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Zaženi poizvedbo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Prikaži poizvedbo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Kdoje</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Različica</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation>Podrobnosti</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Podeli status operaterja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>Odvzemi status operaterja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Daj besedo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>Odvzemi besedo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Brcni s kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Izloči s kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Brcni in izloči</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Začasno skrij prikaz(e)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Trajno skrij prikaz(e)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Prikaži seznam kanalov</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Prikaži seznam spregledanih</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Skrij dogodke</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="94"/>
+        <source>CTCP</source>
+        <translation>CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="106"/>
+        <source>Actions</source>
+        <translation>Dejanja</translation>
+    </message>
+</context>
+<context>
     <name>Core</name>
     <message>
-        <location filename="../src/core/core.cpp" line="135"/>
+        <location filename="../src/core/core.cpp" line="146"/>
         <source>Could not initialize any storage backend! Exiting...</source>
         <translation>Ni bilo moč inicializirati nobene hrbtenice za shranjevanje. Končujem ...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="138"/>
+        <location filename="../src/core/core.cpp" line="147"/>
         <source>Currently, Quassel only supports SQLite3. You need to build your
 Qt library with the sqlite plugin enabled in order for quasselcore
 to work.</source>
@@ -1215,122 +1597,124 @@ morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
         <translation>Skrbniški uporabnik, ali geslo zanj, ni nastavljen.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="230"/>
+        <location filename="../src/core/core.cpp" line="231"/>
         <source>Could not setup storage!</source>
         <translation>Ni moč nastaviti shranjevanja!</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="234"/>
+        <location filename="../src/core/core.cpp" line="235"/>
         <source>Creating admin user...</source>
         <translation>Ustvarjanje skrbniškega uporabnika ...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="321"/>
+        <location filename="../src/core/core.cpp" line="334"/>
         <source>Invalid listen address %1</source>
         <translation>Neveljaven naslov za poslušanje (%1)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="329"/>
+        <location filename="../src/core/core.cpp" line="342"/>
         <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
         <translation>Odjemalce poslušam na IPv4 %1, vratih %2, z uporabo protokola različice %3</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="337"/>
+        <location filename="../src/core/core.cpp" line="350"/>
         <source>Could not open IPv4 interface %1:%2: %3</source>
         <translation>Ni moč odpreti vmesnika IPv4 %1:%2: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="345"/>
+        <location filename="../src/core/core.cpp" line="358"/>
         <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
         <translation>Odjemalce poslušam na IPv6 %1, vratih %2, z uporabo protokola različice %3</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="356"/>
+        <location filename="../src/core/core.cpp" line="369"/>
         <source>Could not open IPv6 interface %1:%2: %3</source>
         <translation>Ni moč odpreti vmesnika IPv6 %1:%2: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="364"/>
+        <location filename="../src/core/core.cpp" line="377"/>
         <source>Invalid listen address %1, unknown network protocol</source>
         <translation>Neveljaven naslov za poslušanje (%1), neznan omrežni protokol</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="372"/>
+        <location filename="../src/core/core.cpp" line="386"/>
         <source>Could not open any network interfaces to listen on!</source>
         <translation>Ni moč odpreti nobenega omrežnega vmesnika za poslušanje!</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="406"/>
+        <location filename="../src/core/core.cpp" line="420"/>
         <source>Client connected from</source>
         <translation>Odjemalec se je povezal z</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="409"/>
+        <location filename="../src/core/core.cpp" line="423"/>
         <source>Closing server for basic setup.</source>
         <translation>Zapiram strežnik za osnovno nastavitev.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="428"/>
+        <location filename="../src/core/core.cpp" line="442"/>
         <source>Antique client trying to connect... refusing.</source>
         <translation>Zastarel odjemalec se poskupa povezati... Zavračam ga.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="442"/>
+        <location filename="../src/core/core.cpp" line="454"/>
         <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
         <translation>&lt;b&gt;Vaš odjemalec Quassel je prestar.&lt;/b&gt;&lt;br&gt;To jedro potrebuje vsaj protokol različice %1.&lt;br&gt;Razmislite o nadgradnji odjemalca.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="548"/>
+        <location filename="../src/core/core.cpp" line="458"/>
+        <location filename="../src/core/core.cpp" line="538"/>
+        <location filename="../src/core/core.cpp" line="562"/>
         <source>Client</source>
         <translation>Odjemalec</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="444"/>
+        <location filename="../src/core/core.cpp" line="458"/>
         <source>too old, rejecting.</source>
         <translation>je prestar, zavračam ga.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="458"/>
+        <location filename="../src/core/core.cpp" line="470"/>
         <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
         <translation>&lt;b&gt;Jedro Quassel različice %1&lt;/b&gt;&lt;br&gt;Zgrajeno: %2&lt;br&gt;Teče %3d %4u %5m (od %6)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="504"/>
+        <location filename="../src/core/core.cpp" line="518"/>
         <source>Starting TLS for Client:</source>
         <translation>Zaganjanje TLS za odjemalca:</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="522"/>
+        <location filename="../src/core/core.cpp" line="536"/>
         <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
         <translation>&lt;b&gt;Odjemalec ni inicializiran.&lt;/b&gt;&lt;br&gt;Preden se poskusi prijaviti mora poslati inicializacijsko sporočilo.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="524"/>
+        <location filename="../src/core/core.cpp" line="538"/>
         <source>did not send an init message before trying to login, rejecting.</source>
         <translation>pred prijavo ni poslal inicializacijskega sporočila, zavračam ga.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="542"/>
+        <location filename="../src/core/core.cpp" line="556"/>
         <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
         <translation>&lt;b&gt;Neveljavno uporabniško ime ali geslo.&lt;/b&gt;&lt;br&gt;Podane kombinacije uporabniškega imena in gesla ni moč najti v podatkovni zbirki.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="548"/>
+        <location filename="../src/core/core.cpp" line="562"/>
         <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
         <translation>je uspešno inicializiran in overjen kot »%1« (uporabniški ID: %2).</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="559"/>
+        <location filename="../src/core/core.cpp" line="573"/>
         <source>Non-authed client disconnected.</source>
         <translation>Prekinjena povezava z neoverjenim odjemalcem.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="565"/>
+        <location filename="../src/core/core.cpp" line="579"/>
         <source>Non-authed client disconnected. (socket allready destroyed)</source>
         <translation>Prekinjena povezava z neoverjenim odjemalcem. (vtičnica je že bila uničena)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="609"/>
+        <location filename="../src/core/core.cpp" line="623"/>
         <source>Could not initialize session for client:</source>
         <translation>Ni moč inicializirati seje za odjemalca:</translation>
     </message>
@@ -1373,6 +1757,7 @@ morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
         <translation>Vrata:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="61"/>
         <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
         <source>localhost</source>
         <translation>localhost</translation>
@@ -1441,7 +1826,7 @@ morate knjižnico Qt zgraditi z omogočenim vstavkom sqlite.</translation>
         <translation>Nastavitev jedra ni uspela.&lt;br&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;Kliknite &lt;em&gt;Naprej&lt;/em&gt;, da začnete znova.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconfigwizard.cpp" line="105"/>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="104"/>
         <source>Your are now logged into your freshly configured Quassel Core!&lt;br&gt;Please remember to configure your identities and networks now.</source>
         <translation>Prijavljeni ste v sveže nastavljeno jedro Quassel.&lt;br&gt;Ne pozabite sedaj nastaviti svojih identitet in omrežij.</translation>
     </message>
@@ -1618,7 +2003,7 @@ p, li { white-space: pre-wrap; }
         <translation>Odstrani nastavitve računa</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="192"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="191"/>
         <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
         <translation>Ali res želite odstraniti svoje krajevne nastavitve za ta račun pri jedru Quassel.&lt;br&gt;Pomnite: s tem &lt;em&gt;ne&lt;/em&gt; odstranite ali spremenite nobenih podatkov pri jedru samem!</translation>
     </message>
@@ -1655,7 +2040,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
-        <translation>Povezan s %1</translation>
+        <translation type="unfinished">Povezan na %1</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
@@ -1668,11 +2053,14 @@ p, li { white-space: pre-wrap; }
         <translation>Prijavljanje ...</translation>
     </message>
     <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="392"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="450"/>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Prijava</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="19"/>
         <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Poveži se z jedrom Quassel</translation>
@@ -1865,27 +2253,37 @@ SOME SPACE</translation>
 <context>
     <name>CoreNetwork</name>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="145"/>
+        <location filename="../src/core/corenetwork.cpp" line="151"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation>Povezovanje ni uspelo. Prehajam na naslednji strežnik</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="154"/>
+        <location filename="../src/core/corenetwork.cpp" line="159"/>
+        <location filename="../src/core/corenetwork.cpp" line="160"/>
         <source>Connecting to %1:%2...</source>
         <translation>Povezujem se z %1:%2 ...</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="184"/>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Prekinjanje povezave ... (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Core Shutdown</source>
+        <translation>Zaustavitev jedra</translation>
+    </message>
+    <message>
         <source>Disconnecting.</source>
-        <translation>Prekinjam povezavo.</translation>
+        <translation type="obsolete">Prekinjam povezavo.</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="280"/>
+        <location filename="../src/core/corenetwork.cpp" line="304"/>
         <source>Could not connect to %1 (%2)</source>
         <translation>Ni se moč povezati z %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/corenetwork.cpp" line="282"/>
+        <location filename="../src/core/corenetwork.cpp" line="306"/>
         <source>Connection failure: %1</source>
         <translation>Neuspeh pri povezovanju: %1</translation>
     </message>
@@ -2028,6 +2426,7 @@ SOME SPACE</translation>
         <translation>Položaj:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="86"/>
         <location filename="../src/qtui/ui/desktopnotificationconfigwidget.ui" line="102"/>
         <source> px</source>
         <translation> pik</translation>
@@ -2071,11 +2470,25 @@ SOME SPACE</translation>
         <translation>Pisave po meri</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="53"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="104"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="158"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="212"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="254"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="322"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="357"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="392"/>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="72"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="177"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="231"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="273"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="338"/>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="373"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="408"/>
         <source>Choose...</source>
         <translation>Izbor ...</translation>
@@ -2101,6 +2514,7 @@ SOME SPACE</translation>
         <translation>Vnosna vrstica:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="283"/>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="303"/>
         <source>General:</source>
         <translation>Splošno:</translation>
@@ -2129,14 +2543,12 @@ SOME SPACE</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -2233,20 +2645,30 @@ SOME SPACE</translation>
         <source>Completion suffix:</source>
         <translation>Pripona dokončevanja:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
         <source>Highlight</source>
         <translation>Poudarek</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
+    <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="159"/>
         <source>this shouldn&apos;t be empty</source>
         <translation>to ne sme biti prazno</translation>
@@ -2320,112 +2742,110 @@ SOME SPACE</translation>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="108"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="35"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Identitete</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="170"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
         <translation>&lt;b&gt;Preden se uveljavijo spremembe, je potrebno odpraviti sledeče težave:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="207"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="171"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <translation>&lt;li&gt;Vse identitete morajo imeti nastavljeno ime&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="208"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="172"/>
         <source>&lt;li&gt;Every identity needs at least one nickname defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;Vsaka identiteta mora imeti določen vsaj en vzdevek&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="209"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="173"/>
         <source>&lt;li&gt;You need to specify a real name for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Za vsako identiteto morate nastaviti pravo ime&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="210"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="174"/>
         <source>&lt;li&gt;You need to specify an ident for every identity&lt;/li&gt;</source>
         <translation>&lt;li&gt;Za vsako identiteto morate nastaviti ident&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="211"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="175"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="212"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>One or more identities are invalid</source>
         <translation>Vsaj ena identiteta ni veljavna</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="397"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="306"/>
         <source>Delete Identity?</source>
         <translation>Zbrišem identiteto?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="398"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="307"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Ali res želite zbrisati identiteto »%1«?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="214"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="318"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Preimenuj identiteto</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="410"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="319"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Vnesite novo ime identitete »%1«!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="534"/>
         <source>Load a Key</source>
-        <translation>Naloži ključ</translation>
+        <translation type="obsolete">Naloži ključ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="726"/>
         <source>No Key loaded</source>
-        <translation>Naložen ni noben ključ</translation>
+        <translation type="obsolete">Naložen ni noben ključ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="844"/>
         <source>Load</source>
-        <translation>Naloži</translation>
+        <translation type="obsolete">Naloži</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="566"/>
         <source>RSA</source>
-        <translation>RSA</translation>
+        <translation type="obsolete">RSA</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="569"/>
         <source>DSA</source>
-        <translation>DSA</translation>
+        <translation type="obsolete">DSA</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="613"/>
         <source>Clear</source>
-        <translation>Počisti</translation>
+        <translation type="obsolete">Počisti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="584"/>
         <source>Load a Certificate</source>
-        <translation>Naloži potrdilo</translation>
+        <translation type="obsolete">Naloži potrdilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="818"/>
         <source>No Certificate loaded</source>
-        <translation>Naloženo ni nobeno potrdilo</translation>
+        <translation type="obsolete">Naloženo ni nobeno potrdilo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="34"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2445,245 +2865,492 @@ SOME SPACE</translation>
         <translation>Odstrani identiteto</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="116"/>
+        <source>Real Name:</source>
+        <translation type="obsolete">Pravo ime:</translation>
+    </message>
+    <message>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation type="obsolete">Pravo ime je prikazano v izpisu /whois.</translation>
+    </message>
+    <message>
+        <source>Nicknames</source>
+        <translation type="obsolete">Vzdevki</translation>
+    </message>
+    <message>
+        <source>Add Nickname</source>
+        <translation type="obsolete">Dodaj vzdevek</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="obsolete">&amp;Dodaj ...</translation>
+    </message>
+    <message>
+        <source>Remove Nickname</source>
+        <translation type="obsolete">Odstrani vzdevek</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Odstrani</translation>
+    </message>
+    <message>
+        <source>Re&amp;name...</source>
+        <translation type="obsolete">Pre&amp;imenuj ...</translation>
+    </message>
+    <message>
+        <source>Move upwards in list</source>
+        <translation type="obsolete">Premakni gor v seznamu</translation>
+    </message>
+    <message>
+        <source>Move downwards in list</source>
+        <translation type="obsolete">Premakni dol v seznamu</translation>
+    </message>
+    <message>
+        <source>A&amp;way</source>
+        <translation type="obsolete">&amp;Odsoten</translation>
+    </message>
+    <message>
+        <source>Default Away Settings</source>
+        <translation type="obsolete">Privzete nastavitve za odsotnost</translation>
+    </message>
+    <message>
+        <source>Nick to be used when being away</source>
+        <translation type="obsolete">Vzdevek, ki bo prikazan, ko ste odsotni</translation>
+    </message>
+    <message>
+        <source>Default away reason</source>
+        <translation type="obsolete">Privzeti razlog za odsotnost</translation>
+    </message>
+    <message>
+        <source>Away Reason:</source>
+        <translation type="obsolete">Razlog odsotnosti:</translation>
+    </message>
+    <message>
+        <source>Away Nick:</source>
+        <translation type="obsolete">Vzdevek odsotnosti:</translation>
+    </message>
+    <message>
+        <source>Set away when all clients have detached from the core</source>
+        <translation type="obsolete">Nastavi odsotnost, ko vsi odjemalci prekinejo povezavo z jedrom</translation>
+    </message>
+    <message>
+        <source>Away On Detach</source>
+        <translation type="obsolete">Odsotnost ob prekinitvi</translation>
+    </message>
+    <message>
+        <source>Override default away reason for auto-away on detach</source>
+        <translation type="obsolete">Za samo-odsotnost ob prekinitvi povozi privzeti razlog odsotnosti</translation>
+    </message>
+    <message>
+        <source>Not implemented yet</source>
+        <translation type="obsolete">Še ni izvedeno</translation>
+    </message>
+    <message>
+        <source>Away On Idle</source>
+        <translation type="obsolete">Odsotnost ob neaktivnosti</translation>
+    </message>
+    <message>
+        <source>Set away after</source>
+        <translation type="obsolete">Odsoten po</translation>
+    </message>
+    <message>
+        <source>minutes of being idle</source>
+        <translation type="obsolete">minutah neaktivnosti</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="obsolete">Napredno</translation>
+    </message>
+    <message>
+        <source>Ident:</source>
+        <translation type="obsolete">Ident:</translation>
+    </message>
+    <message>
+        <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
+        <translation type="obsolete">»ident« je del maske gostitelja in vas, skupaj z gostiteljem, edinstveno identificira na omrežju IRC.</translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="obsolete">Sporočila</translation>
+    </message>
+    <message>
+        <source>Part Reason:</source>
+        <translation type="obsolete">Razlog zapustitve:</translation>
+    </message>
+    <message>
+        <source>Quit Reason:</source>
+        <translation type="obsolete">Razlog končanja:</translation>
+    </message>
+    <message>
+        <source>Kick Reason:</source>
+        <translation type="obsolete">Razlog za brco:</translation>
+    </message>
+    <message>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation type="obsolete">Za urejanje ključa in potrdila SSL za jedro potrebujete odjemalca s podporo za SSL</translation>
+    </message>
+    <message>
+        <source>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
+        <translation type="obsolete">Opozorilo: Povezava z jedrom Quassel ni varna. Če nadaljujete, se bosta
+ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="obsolete">Nadaljuj</translation>
+    </message>
+    <message>
+        <source>Use SSL Key</source>
+        <translation type="obsolete">Uporabi ključ SSL</translation>
+    </message>
+    <message>
+        <source>Key Type:</source>
+        <translation type="obsolete">Vrsta ključa:</translation>
+    </message>
+    <message>
+        <source>Use SSL Certificate</source>
+        <translation type="obsolete">Uporabi potrdilo SSL</translation>
+    </message>
+    <message>
+        <source>Organisation:</source>
+        <translation type="obsolete">Organizacija:</translation>
+    </message>
+    <message>
+        <source>CommonName:</source>
+        <translation type="obsolete">Skupno ime:</translation>
+    </message>
+</context>
+<context>
+    <name>Identity</name>
+    <message>
+        <location filename="../src/common/identity.cpp" line="148"/>
+        <source>&lt;empty&gt;</source>
+        <translation>&lt;prazno&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="120"/>
+        <source>Quassel IRC User</source>
+        <translation>Uporabnik Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="154"/>
+        <source>Gone fishing.</source>
+        <translation>Odšel sem ribarit.</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="158"/>
+        <source>Not here. No, really. not here!</source>
+        <translation>Ni me tu. Ne, res, ni me tu!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="161"/>
+        <source>All Quassel clients vanished from the face of the earth...</source>
+        <translation>Vsi odjemalci Quassel so izginili z obličja Zemlje ...</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="164"/>
+        <source>Kindergarten is elsewhere!</source>
+        <translation>Otroški vrtec je drugje!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="165"/>
+        <location filename="../src/common/identity.cpp" line="166"/>
+        <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
+        <translation>http://quassel-irc.org - Klepetajte udobno. Kjerkoli.</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityEditWidget</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="219"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Napredno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Naloži ključ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="317"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="328"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Naložen ni noben ključ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="318"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="365"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="624"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Naloži</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="322"/>
+        <source>RSA</source>
+        <translation>RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="325"/>
+        <source>DSA</source>
+        <translation>DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="330"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="369"/>
+        <source>Clear</source>
+        <translation>Počisti</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Naloži potrdilo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="363"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="364"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="662"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Naloženo ni nobeno potrdilo</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Splošno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
         <source>Real Name:</source>
         <translation>Pravo ime:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
-        <translation>Pravo ime je prikazano v izpisu /whois.</translation>
+        <translation>Pravo ime je prikazano v izpisu /whois (kdoje).</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="132"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="53"/>
         <source>Nicknames</source>
         <translation>Vzdevki</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="168"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
         <source>Add Nickname</source>
         <translation>Dodaj vzdevek</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="171"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
         <source>&amp;Add...</source>
         <translation>&amp;Dodaj ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="194"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
         <source>Remove Nickname</source>
         <translation>Odstrani vzdevek</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="217"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Preimenuj identiteto</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
         <source>Re&amp;name...</source>
         <translation>Pre&amp;imenuj ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="243"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
         <source>Move upwards in list</source>
         <translation>Premakni gor v seznamu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="257"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="167"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="181"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="178"/>
         <source>Move downwards in list</source>
         <translation>Premakni dol v seznamu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="313"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
         <source>A&amp;way</source>
-        <translation>&amp;Odsoten</translation>
+        <translation>&amp;Odsotnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
         <source>Default Away Settings</source>
         <translation>Privzete nastavitve za odsotnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="360"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
         <source>Nick to be used when being away</source>
         <translation>Vzdevek, ki bo prikazan, ko ste odsotni</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="350"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
         <source>Default away reason</source>
-        <translation>Privzeti razlog za odsotnost</translation>
+        <translation>Privzet razlog za odsotnost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
-        <source>Away Reason:</source>
-        <translation>Razlog odsotnosti:</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Vzdevek ob odsotnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
-        <source>Away Nick:</source>
-        <translation>Vzdevek odsotnosti:</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="267"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="296"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Razlog za odsotnost:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="375"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
         <source>Set away when all clients have detached from the core</source>
         <translation>Nastavi odsotnost, ko vsi odjemalci prekinejo povezavo z jedrom</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="378"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
         <source>Away On Detach</source>
         <translation>Odsotnost ob prekinitvi</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
-        <source>Override default away reason for auto-away on detach</source>
-        <translation>Za samo-odsotnost ob prekinitvi povozi privzeti razlog odsotnosti</translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
         <source>Not implemented yet</source>
-        <translation>Še ni izvedeno</translation>
+        <translation>Še ni izdelano</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="423"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
         <source>Away On Idle</source>
         <translation>Odsotnost ob neaktivnosti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="437"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
         <source>Set away after</source>
         <translation>Odsoten po</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="447"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
         <source>minutes of being idle</source>
         <translation>minutah neaktivnosti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="512"/>
-        <source>Advanced</source>
-        <translation>Napredno</translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="520"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
         <source>Ident:</source>
         <translation>Ident:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="527"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
         <translation>»ident« je del maske gostitelja in vas, skupaj z gostiteljem, edinstveno identificira na omrežju IRC.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="536"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
         <source>Messages</source>
         <translation>Sporočila</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="544"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
         <source>Part Reason:</source>
         <translation>Razlog zapustitve:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
         <source>Quit Reason:</source>
         <translation>Razlog končanja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="567"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
         <source>Kick Reason:</source>
         <translation>Razlog za brco:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="487"/>
         <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
         <translation>Za urejanje ključa in potrdila SSL za jedro potrebujete odjemalca s podporo za SSL</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="516"/>
         <source>Warning: you are not connected with a secured connection to the Quassel Core!
 Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</source>
         <translation>Opozorilo: Povezava z jedrom Quassel ni varna. Če nadaljujete, se bosta
 ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="705"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
         <source>Use SSL Key</source>
         <translation>Uporabi ključ SSL</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="719"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
         <source>Key Type:</source>
         <translation>Vrsta ključa:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
         <source>Use SSL Certificate</source>
         <translation>Uporabi potrdilo SSL</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="777"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
         <source>Organisation:</source>
         <translation>Organizacija:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
         <source>CommonName:</source>
         <translation>Skupno ime:</translation>
     </message>
 </context>
 <context>
-    <name>Identity</name>
-    <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
-        <source>&lt;empty&gt;</source>
-        <translation>&lt;prazno&gt;</translation>
-    </message>
-    <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
-        <source>Quassel IRC User</source>
-        <translation>Uporabnik Quassel IRC</translation>
-    </message>
+    <name>IdentityPage</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
-        <source>Gone fishing.</source>
-        <translation>Odšel sem ribarit.</translation>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Nastavitev identitete</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
-        <source>Not here. No, really. not here!</source>
-        <translation>Ni me tu. Ne, res, ni me tu!</translation>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Privzeta identiteta</translation>
     </message>
+</context>
+<context>
+    <name>InputLine</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
-        <source>All Quassel clients vanished from the face of the earth...</source>
-        <translation>Vsi odjemalci Quassel so izginili z obličja Zemlje ...</translation>
+        <location filename="../src/uisupport/inputline.cpp" line="148"/>
+        <source>Do you really want to paste %1 lines?</source>
+        <translation>Ali res želite prilepiti %1 vrstic?</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
-        <source>Kindergarten is elsewhere!</source>
-        <translation>Otroški vrtec je drugje!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/identity.cpp" line="84"/>
-        <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
-        <translation>http://quassel-irc.org - Klepetajte udobno. Kjerkoli.</translation>
+        <location filename="../src/uisupport/inputline.cpp" line="157"/>
+        <source>Paste Protection</source>
+        <translation>Varovanje pri lepljenju</translation>
     </message>
 </context>
 <context>
     <name>InputWidget</name>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="57"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="55"/>
         <source>Focus Input Line</source>
         <translation>Fokusiraj vnosno vrstico</translation>
     </message>
     <message>
-        <location filename="../src/qtui/inputwidget.cpp" line="58"/>
+        <location filename="../src/qtui/inputwidget.cpp" line="56"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
@@ -2694,14 +3361,22 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
     </message>
 </context>
 <context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Shrani in se poveži</translation>
+    </message>
+</context>
+<context>
     <name>IrcListModel</name>
     <message>
-        <location filename="../src/client/irclistmodel.cpp" line="60"/>
+        <location filename="../src/client/irclistmodel.cpp" line="59"/>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
-        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <location filename="../src/client/irclistmodel.cpp" line="60"/>
         <source>Users</source>
         <translation>Uporabniki</translation>
     </message>
@@ -2714,152 +3389,160 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="459"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="464"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 je spremenil temo za %2 na: »%3«</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="484"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="489"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>Prejet je bil RPL_ISUPPORT (005) brez parametrov!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="492"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="497"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>Prejet je bil RPL_ISUPPORT, ki ni skladen z RFC: to lahko vodi do nepredvidenega obnašanja!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="530"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="514"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="521"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="528"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="535"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="565"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="570"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
-        <translation>[Whois] %1 je odsoten: »%2«</translation>
+        <translation>[Kdoje] %1 je odsoten: »%2«</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="576"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="581"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 je odsoten: »%2«</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="625"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="639"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="673"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="689"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="750"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="782"/>
         <source>[Whois] %1</source>
-        <translation>[Whois] %1</translation>
+        <translation>[Kdoje] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="651"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="654"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Whois] %1 is %2 (%3)</source>
-        <translation>[Whois] %1 je %2 (%3)</translation>
+        <translation>[Kdoje] %1 je %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="666"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="671"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 je povezan prek %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="928"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="675"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="933"/>
         <source>[Whowas] %1</source>
-        <translation>[Whowas] %1</translation>
+        <translation>[Kdojebil] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="696"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
         <source>[Whowas] %1 was %2 (%3)</source>
-        <translation>[Whowas] %1 je bil %2 (%3)</translation>
+        <translation>[Kdojebil] %1 je bil %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="710"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Konec seznama /WHO za %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="730"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
         <source>[Whois] %1 is logged in since %2</source>
-        <translation>[Whois] %1 je prijavljen od %2</translation>
+        <translation>[Kdoje] %1 je prijavljen od %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="732"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="737"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
-        <translation>[Whois] %1 je nedejaven %2 (%3)</translation>
+        <translation>[Kdoje] %1 je nedejaven %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
         <source>[Whois] idle message: %1</source>
-        <translation>[Whois] sporočilo nedejavnosti: %1</translation>
+        <translation>[Kdoje] sporočilo nedejavnosti: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="767"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
         <source>[Whois] %1 is a user on channels: %2</source>
-        <translation>[Whois] %1 je uporabnik na kanalih: %2</translation>
+        <translation>[Kdoje] %1 je uporabnik na kanalih: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="769"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
         <source>[Whois] %1 has voice on channels: %2</source>
-        <translation>[Whois] %1 ima glas na kanalih: %2</translation>
+        <translation>[Kdoje] %1 ima glas na kanalih: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="771"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="776"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
-        <translation>[Whois] %1 je operater na kanalih: %2</translation>
+        <translation>[Kdoje] %1 je operater na kanalih: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="799"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>Kanal %1 ima %2 uporabnikov. Tema je: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="808"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="813"/>
         <source>End of channel list</source>
         <translation>Konec seznama kanalov</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="838"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
         <source>No topic is set for %1.</source>
         <translation>Za %1 ni nastavljene nobene teme.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="853"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="858"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Tema za %1 je »%2«</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="869"/>
         <source>Topic set by %1 on %2</source>
         <translation>Temo je %2 nastavil %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="887"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="892"/>
         <source>[Who] %1</source>
         <translation>[Who] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="941"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
-        <translation>Na seznamu vzdevkov za vašo identiteto je vzdevek, ki vsebuje neveljavne znake</translation>
+        <translation type="obsolete">Na seznamu vzdevkov za vašo identiteto je vzdevek, ki vsebuje neveljavne znake</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="942"/>
         <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>Zaradi napake v Unreal IRCd (in mogoče drugih strežnikih za IRC) ne moremo določiti nepravilnega vzdevka</translation>
+        <translation type="obsolete">Zaradi napake v Unreal IRCd (in mogoče drugih strežnikih za IRC) ne moremo določiti nepravilnega vzdevka</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="943"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Za nadaljevanje uporabite »/nick &lt;drug_vzdevek&gt;«, ali pa počistite seznam vzdevkov</translation>
+        <translation type="obsolete">Za nadaljevanje uporabite »/nick &lt;drug_vzdevek&gt;«, ali pa počistite seznam vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="946"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="951"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Vzdevek %1 vsebuje neveljavne znake</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="958"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="962"/>
         <source>Nick already in use: %1</source>
         <translation>Vzdevek je že v uporabi: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="981"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="987"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation>Na seznamu vzdevkov ni moč najti nobenega prostega ali veljavnega vzdevka. Za nadaljevanje uporabite »/nick &lt;drug_vzdevek&gt;«</translation>
     </message>
@@ -2867,17 +3550,17 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="777"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>nedejaven od %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="780"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>čas prijave: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="783"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>strežnik: %1</translation>
     </message>
@@ -2885,190 +3568,212 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="206"/>
+        <location filename="../src/qtui/mainwin.cpp" line="221"/>
         <source>&amp;Connect to Core...</source>
         <translation>&amp;Poveži se z jedrom ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="208"/>
+        <location filename="../src/qtui/mainwin.cpp" line="223"/>
         <source>&amp;Disconnect from Core</source>
         <translation>P&amp;rekini povezavo z jedrom</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="210"/>
+        <location filename="../src/qtui/mainwin.cpp" line="225"/>
         <source>Core &amp;Info...</source>
         <translation>P&amp;odatki o jedru ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="212"/>
+        <location filename="../src/qtui/mainwin.cpp" line="227"/>
         <source>Configure &amp;Networks...</source>
         <translation>&amp;Nastavi omrežja ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="214"/>
+        <location filename="../src/qtui/mainwin.cpp" line="229"/>
         <source>&amp;Quit</source>
         <translation>Konča&amp;j</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="215"/>
+        <location filename="../src/qtui/mainwin.cpp" line="230"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="218"/>
+        <location filename="../src/qtui/mainwin.cpp" line="233"/>
         <source>&amp;Configure Buffer Views...</source>
         <translation>N&amp;astavi prikaze ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="220"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>&amp;Zakleni položaj podoken</translation>
+        <translation type="obsolete">&amp;Zakleni položaj podoken</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="224"/>
+        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <source>&amp;Lock Layout</source>
+        <translation>&amp;Zakleni razpored</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="240"/>
         <source>Show &amp;Search Bar</source>
         <translation>Pr&amp;ikaži iskalno vrstico</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="225"/>
+        <location filename="../src/qtui/mainwin.cpp" line="241"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="226"/>
+        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <source>Show Away Log</source>
+        <translation>Prkaži dnevnik ob odsotnosti</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="244"/>
         <source>Show Status &amp;Bar</source>
         <translation>Pri&amp;kaži vrstico stanja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="230"/>
+        <location filename="../src/qtui/mainwin.cpp" line="248"/>
         <source>&amp;Configure Quassel...</source>
         <translation>&amp;Nastavi Quassel ...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="231"/>
+        <location filename="../src/qtui/mainwin.cpp" line="249"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="234"/>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
         <source>&amp;About Quassel</source>
         <translation>&amp;O Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="238"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Raz&amp;hroščevanje modela omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="240"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
         <source>Debug &amp;MessageModel</source>
         <translation>Ra&amp;zhroščevanje modela sporočil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>Debug &amp;Log</source>
         <translation>Razhroščevalni &amp;dnevnik</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="249"/>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
         <source>&amp;File</source>
         <translation>&amp;Datoteka</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="262"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>&amp;Networks</source>
         <translation>&amp;Omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="268"/>
+        <location filename="../src/qtui/mainwin.cpp" line="286"/>
         <source>&amp;View</source>
         <translation>&amp;Videz</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="269"/>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>&amp;Buffer Views</source>
         <translation>P&amp;rikazi</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="277"/>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Orodjarne</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="301"/>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavitve</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="284"/>
+        <location filename="../src/qtui/mainwin.cpp" line="308"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="292"/>
+        <location filename="../src/qtui/mainwin.cpp" line="316"/>
         <source>Debug</source>
         <translation>Razhroščevanje</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="380"/>
+        <location filename="../src/qtui/mainwin.cpp" line="410"/>
         <source>Nicks</source>
         <translation>Vzdevki</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="389"/>
+        <location filename="../src/qtui/mainwin.cpp" line="419"/>
         <source>Show Nick List</source>
         <translation>Prikaži seznam vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="400"/>
+        <location filename="../src/qtui/mainwin.cpp" line="430"/>
         <source>Chat Monitor</source>
         <translation>Nadzorovalnik klepeta</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="411"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Show Chat Monitor</source>
         <translation>Prikaži nadzorovalnik klepeta</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="415"/>
+        <location filename="../src/qtui/mainwin.cpp" line="445"/>
         <source>Inputline</source>
         <translation>Vnosna vrstica</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="424"/>
+        <location filename="../src/qtui/mainwin.cpp" line="454"/>
         <source>Show Input Line</source>
         <translation>Prikaži vnosno vrstico</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="435"/>
+        <location filename="../src/qtui/mainwin.cpp" line="465"/>
         <source>Topic</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="447"/>
+        <location filename="../src/qtui/mainwin.cpp" line="477"/>
         <source>Show Topic Line</source>
         <translation>Prikaži vrstico s temo</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="551"/>
+        <location filename="../src/qtui/mainwin.cpp" line="595"/>
         <source>Connected to core.</source>
         <translation>Povezan z jedrom.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="577"/>
+        <location filename="../src/qtui/mainwin.cpp" line="629"/>
         <source>Core Lag: %1</source>
         <translation>Zakasnitev jedra: %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="613"/>
+        <location filename="../src/qtui/mainwin.cpp" line="665"/>
         <source>Not connected to core.</source>
         <translation>Brez povezave z jedrom.</translation>
     </message>
 </context>
 <context>
+    <name>Message</name>
+    <message>
+        <location filename="../src/common/message.h" line="68"/>
+        <source>Day changed to %1</source>
+        <translation>Dan se je spremenil na %1</translation>
+    </message>
+</context>
+<context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="362"/>
+        <location filename="../src/client/messagemodel.cpp" line="361"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Zahtevam %1 starih sporočil za prikaz %2:%3</translation>
     </message>
@@ -3082,8 +3787,12 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Sprejemanje starih sporočil</translation>
+    </message>
+    <message>
         <source>Processing Messages</source>
-        <translation>Obdelovanje sporočil</translation>
+        <translation type="obsolete">Obdelovanje sporočil</translation>
     </message>
 </context>
 <context>
@@ -3147,7 +3856,7 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Vnesite ime omrežja:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="698"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="699"/>
         <source>Add Network</source>
         <translation>Dodaj omrežje</translation>
     </message>
@@ -3155,17 +3864,17 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="177"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Strežnik: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="178"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Uporabniki: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="181"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Zakasnitev: %1 ms</translation>
     </message>
@@ -3173,17 +3882,17 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="802"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Prikaz</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="802"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="802"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Št. vzdevkov</translation>
     </message>
@@ -3191,189 +3900,152 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
 <context>
     <name>NetworkModelActionProvider</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
         <source>Connect</source>
-        <translation>Poveži se</translation>
+        <translation type="obsolete">Poveži se</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="41"/>
         <source>Disconnect</source>
-        <translation>Prekini povezavo</translation>
+        <translation type="obsolete">Prekini povezavo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
         <source>Join</source>
-        <translation>Pridruži se</translation>
+        <translation type="obsolete">Pridruži se</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
         <source>Part</source>
-        <translation>Zapusti</translation>
+        <translation type="obsolete">Zapusti</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
         <source>Delete Buffer(s)...</source>
-        <translation>Zbriši prikaz(e) ...</translation>
+        <translation type="obsolete">Zbriši prikaz(e) ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="46"/>
         <source>Show Buffer</source>
-        <translation>Prikaži prikaz</translation>
+        <translation type="obsolete">Prikaži prikaz</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
         <source>Joins</source>
-        <translation>Pridružitve</translation>
+        <translation type="obsolete">Pridružitve</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
         <source>Parts</source>
-        <translation>Zapustitve</translation>
+        <translation type="obsolete">Zapustitve</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
         <source>Quits</source>
-        <translation>Končanja</translation>
+        <translation type="obsolete">Končanja</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
         <source>Nick Changes</source>
-        <translation>Spremembe vzdevkov</translation>
+        <translation type="obsolete">Spremembe vzdevkov</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
         <source>Mode Changes</source>
-        <translation>Spremembe načina</translation>
+        <translation type="obsolete">Spremembe načina</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
         <source>Day Changes</source>
-        <translation>Spremembe dneva</translation>
+        <translation type="obsolete">Spremembe dneva</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
         <source>Set as Default...</source>
-        <translation>Nastavi kot privzeto ...</translation>
+        <translation type="obsolete">Nastavi kot privzeto ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="55"/>
         <source>Use Defaults...</source>
-        <translation>Uporabi privzeto ...</translation>
+        <translation type="obsolete">Uporabi privzeto ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="57"/>
         <source>Join Channel...</source>
-        <translation>Pridruži se kanalu ...</translation>
+        <translation type="obsolete">Pridruži se kanalu ...</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
         <source>Start Query</source>
-        <translation>Zaženi poizvedbo</translation>
+        <translation type="obsolete">Zaženi poizvedbo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
         <source>Show Query</source>
-        <translation>Prikaži poizvedbo</translation>
+        <translation type="obsolete">Prikaži poizvedbo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="61"/>
         <source>Whois</source>
-        <translation>Whois</translation>
+        <translation type="obsolete">Whois</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
         <source>Version</source>
-        <translation>Različica</translation>
+        <translation type="obsolete">Različica</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
         <source>Time</source>
-        <translation>Čas</translation>
+        <translation type="obsolete">Čas</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
         <source>Ping</source>
-        <translation>Ping</translation>
+        <translation type="obsolete">Ping</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
         <source>Finger</source>
-        <translation>Finger</translation>
+        <translation type="obsolete">Finger</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
         <source>Give Operator Status</source>
-        <translation>Daj status operaterja</translation>
+        <translation type="obsolete">Daj status operaterja</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
         <source>Take Operator Status</source>
-        <translation>Odvzemi status operaterja</translation>
+        <translation type="obsolete">Odvzemi status operaterja</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
         <source>Give Voice</source>
-        <translation>Daj besedo</translation>
+        <translation type="obsolete">Daj besedo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
         <source>Take Voice</source>
-        <translation>Odvzemi besedo</translation>
+        <translation type="obsolete">Odvzemi besedo</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
         <source>Kick From Channel</source>
-        <translation>Brcni s kanala</translation>
+        <translation type="obsolete">Brcni s kanala</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
         <source>Ban From Channel</source>
-        <translation>Izloči s kanala</translation>
+        <translation type="obsolete">Izloči s kanala</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
         <source>Kick &amp;&amp; Ban</source>
-        <translation>Brcni in izloči</translation>
+        <translation type="obsolete">Brcni in izloči</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
         <source>Hide Buffer(s) Temporarily</source>
-        <translation>Začasno skrij prikaz(e)</translation>
+        <translation type="obsolete">Začasno skrij prikaz(e)</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
         <source>Hide Buffer(s) Permanently</source>
-        <translation>Trajno skrij prikaz(e)</translation>
+        <translation type="obsolete">Trajno skrij prikaz(e)</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
         <source>Show Channel List</source>
-        <translation>Prikaži seznam kanalov</translation>
+        <translation type="obsolete">Prikaži seznam kanalov</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="79"/>
         <source>Show Ignore List</source>
-        <translation>Prikaži seznam spregledanih</translation>
+        <translation type="obsolete">Prikaži seznam spregledanih</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
         <source>Hide Events</source>
-        <translation>Skrij dogodke</translation>
+        <translation type="obsolete">Skrij dogodke</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
         <source>CTCP</source>
-        <translation>CTCP</translation>
+        <translation type="obsolete">CTCP</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
         <source>Actions</source>
-        <translation>Dejanja</translation>
+        <translation type="obsolete">Dejanja</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="519"/>
         <source>Do you want to delete the following buffer(s) permanently?</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform>Ali želite trajno zbrisati sledeči prikaz?</numerusform>
             <numerusform>Ali želite trajno zbrisati sledeča prikaza?</numerusform>
             <numerusform>Ali želite trajno zbrisati sledeče prikaze?</numerusform>
@@ -3381,70 +4053,123 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="524"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation type="obsolete">&lt;b&gt;Pomnite:&lt;/b&gt; S tem iz podatkovne zbirke jedra zbrišete vse povezane podatke, vključno z zgodovino sporočil. Tega kasneje ni moč razveljaviti.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation type="obsolete">&lt;br&gt;Aktivnih prikazov kanalov ni moč zbrisati. Najprej zapustite kanale.</translation>
+    </message>
+    <message>
+        <source>Remove buffers permanently?</source>
+        <translation type="obsolete">Ali trajno zbrišem prikaze?</translation>
+    </message>
+    <message>
+        <source>Join Channel</source>
+        <translation type="obsolete">Pridruži se kanalu</translation>
+    </message>
+    <message>
+        <source>Input channel name:</source>
+        <translation type="obsolete">Vnesite ime kanala:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="152"/>
+        <source>Do you want to delete the following buffer(s) permanently?</source>
+        <translation>
+            <numerusform>Ali želite trajno zbrisati sledeči %n prikaz?</numerusform>
+            <numerusform>Ali želite trajno zbrisati sledeča %n prikaza?</numerusform>
+            <numerusform>Ali želite trajno zbrisati sledeče %n prikaze?</numerusform>
+            <numerusform>Ali želite trajno zbrisati sledečih %n prikaze?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
         <translation>&lt;b&gt;Pomnite:&lt;/b&gt; S tem iz podatkovne zbirke jedra zbrišete vse povezane podatke, vključno z zgodovino sporočil. Tega kasneje ni moč razveljaviti.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="526"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
         <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
         <translation>&lt;br&gt;Aktivnih prikazov kanalov ni moč zbrisati. Najprej zapustite kanale.</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="528"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
         <source>Remove buffers permanently?</source>
         <translation>Ali trajno zbrišem prikaze?</translation>
     </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="417"/>
         <source>Join Channel</source>
         <translation>Pridruži se kanalu</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
-        <source>Input channel name:</source>
-        <translation>Vnesite ime kanala:</translation>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Network:</source>
+        <translation>Omrežje:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="422"/>
+        <source>Channel:</source>
+        <translation>Kanal:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Nastavitev omrežne povezave</translation>
     </message>
 </context>
 <context>
     <name>NetworksSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
         <source>General</source>
-        <translation>Splošno</translation>
+        <translation type="obsolete">Splošno</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="159"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Razno</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
         <source>&lt;b&gt;The following problems need to be corrected before your changes can be applied:&lt;/b&gt;&lt;ul&gt;</source>
         <translation>&lt;b&gt;Preden se uveljavijo spremembe, je potrebno odpraviti sledeče težave:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="160"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;Vsako omrežje mora imeti določen vsaj en strežnik&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Neveljavne nastavitve omrežja</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
         <source>Delete Network?</source>
         <translation>Zbrišem omrežje?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="547"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation>Ali res želite zbrisati omrežje »%1« in vse z njim povezane nastavitve, vključno z zgodovino sporočil?</translation>
     </message>
@@ -3459,11 +4184,13 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Pre&amp;imenuj ...</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="64"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
         <source>&amp;Add...</source>
         <translation>&amp;Dodaj ...</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="87"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
         <source>De&amp;lete</source>
         <translation>&amp;Zbriši</translation>
@@ -3479,6 +4206,8 @@ ključ SSL in potrdilo SSL prenesla brez šifriranja!</translation>
         <translation>Identiteta:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="148"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="280"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="294"/>
         <source>...</source>
         <translation>...</translation>
@@ -3571,6 +4300,7 @@ Pomnite, da se Quassel samodejno znova pridruži kanalom, zato /join tu verjetno
         <translation>Po vnovični povezavi se pridruži vsem kanalom</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="500"/>
         <source>Auto Identify</source>
         <translation>Samodejno se identificiraj</translation>
@@ -3611,6 +4341,7 @@ Pomnite, da se Quassel samodejno znova pridruži kanalom, zato /join tu verjetno
         <translation>Uporabi nabor znakov po meri</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="592"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="612"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
@@ -3623,6 +4354,7 @@ Za večino omrežij bi morala biti UTF-8 razumna izbira.</translation>
         <translation>Pošlji sporočila z:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="623"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="643"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</source>
@@ -3635,6 +4367,7 @@ Ta nastavitev določa nabor znakov za sporočila, ki niso UTF-8.</translation>
         <translation>Zasilen za prejeta:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="654"/>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="668"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
@@ -3650,7 +4383,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="708"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="416"/>
         <source>Add Nickname</source>
         <translation>Dodaj vzdevek</translation>
     </message>
@@ -3673,15 +4406,19 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>NotificationsSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Obnašanje</translation>
+        <translation type="obsolete">Obnašanje</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Notifications</source>
         <translation>Obvestila</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Videz</translation>
+    </message>
 </context>
 <context>
     <name>PhononNotificationBackend::ConfigWidget</name>
@@ -3712,20 +4449,30 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
         <translation>Zahtevam največ %1 starih sporočil za %2 prikazov</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="78"/>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
         <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
         <translation>Zahtevam največ %1 neprebranih starih sporočil (in dodatnih %2)</translation>
     </message>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="96"/>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
         <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
         <translation>Zahtevam največ %1 neprebranih starih sporočil za %2 prikazov</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Dobrodošli v Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="58"/>
+        <source>This wizard will help you to set up your default identity and your IRC network connection.&lt;br&gt;This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes.</source>
+        <translation>Ta čarovnik vam bo pomagal pri nastavitvi privzete identitete in povezave v omrežje IRC.&lt;br&gt;Zaobjete so le osnovne nastavitve. Tega čarovnika lahko prekličete kadarkoli in za podrobnejše spremembe uporabite nastavitveno okno.</translation>
+    </message>
 </context>
 <context>
     <name>Quassel::secondsToString()</name>
@@ -3758,22 +4505,22 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="377"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Poizvedba z %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="395"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>nedejaven od %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="398"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>čas prijave: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="401"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>strežnik: %1</translation>
     </message>
@@ -3814,6 +4561,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         <translation>Naslov strežnika:</translation>
     </message>
     <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="52"/>
         <location filename="../src/qtui/settingspages/servereditdlg.ui" line="242"/>
         <source>Port:</source>
         <translation>Vrata:</translation>
@@ -3902,42 +4650,44 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SettingsDlg</name>
     <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="77"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="34"/>
         <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="79"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Shrani spremembe</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="80"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation>Na trenutni strani z nastavitvami so neshranjene spremembe. Ali želite sedaj uveljaviti spremembe?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="91"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="99"/>
         <source>Configure %1</source>
         <translation>Nastavi %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Reload Settings</source>
         <translation>Znova naloži nastavitve</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Ali želite znova naložiti nastavitve, pri čemer se spremembe izgubijo?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="165"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Restore Defaults</source>
         <translation>Obnovi privzete vrednosti</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="165"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Ali želite obnoviti privzete vrednosti za to stran?</translation>
     </message>
@@ -3988,35 +4738,114 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SignalProxy</name>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="948"/>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
         <source>Peer tried to send package larger than max package size!</source>
         <translation>Vrstnik je poskusil poslati paket, ki je večji kot je dovoljeno!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="953"/>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
         <source>Peer tried to send 0 byte package!</source>
         <translation>Vrstnik je poskusil poslati paket velik 0 bajtov!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="970"/>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
         <source>Peer sent corrupted compressed data!</source>
         <translation>Vrstnik je poslal poškodovane stisnjene podatke!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="985"/>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
         <source>Peer sent corrupt data: unable to load QVariant!</source>
         <translation>Vrstnik je poslal poškodovane podatke: ni moč naložiti QVariant!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1085"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Prekinjam povezavo</translation>
     </message>
 </context>
 <context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Ime omrežja:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Ime omrežja IRC, ki ga nastavljate</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Strežniki</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Seznam strežnikov, ki spadajo v to omrežje</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Urejanje izbranega strežnika</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Urejanje ...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>Doda nov strežnik za IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>&amp;Dodaj ...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Odstrani izbrani strežnik s seznama</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>&amp;Zbriši</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>Premakni gor v seznamu</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="168"/>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="182"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="179"/>
+        <source>Move downwards in list</source>
+        <translation>Premakni dol v seznamu</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Samodejno se pridruži kanalom</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="250"/>
+        <source>A list of IRC channels you will join automatically after connecting to the network</source>
+        <translation>Seznam kanalov IRC, katerim se boste po vzpostavljeni povezavi v omrežje pridružili samodejno</translation>
+    </message>
+</context>
+<context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="51"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="49"/>
         <source>SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
         <translation>SQLite je pogon za zbirko podatkov, ki temelji na datotekah in ne potrebuje nobenega nastavljanja. Primeren je za male in srednje-velike podatkovne zbirke, ki ne potrebujejo dostopa prek omrežja. Uporabite SQLite, če naj jedro Quassel shranjuje svoje podatke na računalniku, kjer teče, in če bo jedro uporabljalo malo uporabnikov.</translation>
     </message>
@@ -4024,72 +4853,77 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SslCertDisplayDialog</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="570"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
         <source>SSL Certificate used by %1</source>
         <translation>Potrdilo SSL, ki ga uporablja %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="574"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
         <source>Issuer Info</source>
         <translation>Podatki o izdajatelju</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="574"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
         <source>Organization:</source>
         <translation>Organizacija:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="575"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
         <source>Locality Name:</source>
         <translation>Ime krajevnosti:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="576"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
         <source>Organizational Unit Name:</source>
         <translation>Ime organizacijske enote:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="588"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="577"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
         <source>Country Name:</source>
         <translation>Ime države:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="589"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="578"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
         <source>State or Province Name:</source>
         <translation>Ime zv. države ali province:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
         <source>Subject Info</source>
         <translation>Podatki o subjektu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
         <source>Additional Info</source>
         <translation>Dodatni podatki</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="594"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
         <source>Valid From:</source>
         <translation>Veljavno od:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="595"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
         <source>Valid To:</source>
         <translation>Veljavno do:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="598"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
         <source>Hostname %1:</source>
         <translation>Ime gostitelja %1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
         <source>E-Mail Address %1:</source>
         <translation>E-poštni naslov %1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="604"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
         <source>Digest:</source>
         <translation>Povzetek:</translation>
     </message>
@@ -4097,7 +4931,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>StatusBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.h" line="138"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Prikaz stanja</translation>
     </message>
@@ -4105,17 +4939,17 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="106"/>
         <source>System Tray Icon</source>
         <translation>Ikona v sistemski vrstici</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="125"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="107"/>
         <source>Animate</source>
         <translation>Animiraj</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="127"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="109"/>
         <source>Show bubble</source>
         <translation>Prikaži oblaček</translation>
     </message>
@@ -4144,6 +4978,149 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
     </message>
 </context>
 <context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Poveži se</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Poveži se na IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Prekini povezavo</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Prekini povezavo z IRC-em</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Zapusti</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Zapusti trnutno izbrani kanal</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Pridruži se</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Pridruži se kanalu</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Poizvedba</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Zaćni zaseben pogovor</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Kdoje</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Zahtevaj podatke o uporabniku</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation>Op</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Uporabniku podeli pravice operaterja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation>Razop</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Uporabniku odvzemi pravice operaterja</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation>Glas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Uporabniku daj glas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation>Razglas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Uporabniku odvzemi glas</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Brcni</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Uporabnika odstrani iz kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Izloči</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Uporabnika izloči iz kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Brcni/izloči</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Uporabnika odstrani in izloči iz kanala</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Poveži se na vse</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Prekini povezavo z vsemi</translation>
+    </message>
+</context>
+<context>
     <name>TopicLabel</name>
     <message>
         <location filename="../src/qtui/topiclabel.cpp" line="44"/>
@@ -4162,122 +5139,124 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="311"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="313"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="315"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="317"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="319"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation>%Dj%DN%1%DN %DH(%2@%3)%DH se je pridružil %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="321"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH je zapustil %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="325"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%1%DN %DH(%2@%3)%DH je končal</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="331"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation>%Dk%DN%1%DN je brcnil %DN%2%DN iz %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrSedaj ste znani kot %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="337"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation>%Dr%DN%1%DN je sedaj znan kot %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="340"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmUporabniški način: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmNačin %DM%1%DM od %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="344"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="369"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="390"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="377"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="381"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="396"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="383"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="385"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="387"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="389"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="391"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -4285,7 +5264,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="653"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n lastnik</numerusform>
@@ -4295,7 +5274,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="654"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n skrbnik</numerusform>
@@ -4305,7 +5284,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="655"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n operater</numerusform>
@@ -4315,7 +5294,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="656"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n pol-operater</numerusform>
@@ -4325,7 +5304,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="657"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n z besedo</numerusform>
@@ -4335,7 +5314,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="658"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n uporabnik</numerusform>
@@ -4348,7 +5327,12 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete!</translation>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="134"/>
+        <location filename="../src/core/userinputhandler.cpp" line="69"/>
+        <source>away</source>
+        <translation>odsoten</translation>
+    </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="138"/>
         <source>sending CTCP-%1 request</source>
         <translation>pošiljanje zahtevka CTCP-%1</translation>
     </message>
-- 
1.6.1.3

