X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=i18n%2Fquassel_ru.ts;h=b0a8f9973bd4adccf50f4f8b91c0ef411897e44d;hp=5a1007c1a2c13174872850aa1cec9f9cdb22c2b1;hb=0bc4b2b4a25adea85d5f6c6947cfd31f9098149e;hpb=e2e100412cf986f40ea1aabd40200189ca68f79c

diff --git a/i18n/quassel_ru.ts b/i18n/quassel_ru.ts
index 5a1007c1..b0a8f997 100644
--- a/i18n/quassel_ru.ts
+++ b/i18n/quassel_ru.ts
@@ -19,7 +19,7 @@
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
-        <translation>&lt;b&gt;Современный, распределённый клиент IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 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; в сети &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC распространяется по двойной лицензии &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; и &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Большинство значков &amp;copy;  &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команда Oxygen&lt;/a&gt; и используются по лицензии &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Об ошибках пожалуйста сообщайте на  &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt;.</translation>
+        <translation type="obsolete">&lt;b&gt;Современный, распределённый клиент IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 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; в сети &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC распространяется по двойной лицензии &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; и &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Большинство значков &amp;copy;  &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команда Oxygen&lt;/a&gt; и используются по лицензии &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Об ошибках пожалуйста сообщайте на  &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt;.</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="63"/>
@@ -27,7 +27,7 @@
         <translation>Quassel IRC разрабатывается в основном:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="77"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="78"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
         <translation>Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:</translation>
     </message>
@@ -37,12 +37,12 @@
         <translation type="obsolete">Особая благодарность:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за прекрасную графическую работу и логотип/значок Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команде Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создания большинства шикарных значков, которые вы видите в Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития Quasseltopia с помощью Greenphones и прочего&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>О 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;
@@ -50,7 +50,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="75"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -58,29 +58,52 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="114"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="115"/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="134"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="135"/>
         <source>A&amp;uthors</source>
         <translation>&amp;Авторы</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;Помощники</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;Благодарности</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="115"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="118"/>
         <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>Особая благодарность:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за прекрасную графическую работу и логотип/значок Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команде Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создания большинства шикарных значков, которые вы видите в Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, ранее известная как Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего&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;за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810&lt;/dd&gt;</translation>
+        <translation type="obsolete">Особая благодарность:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за прекрасную графическую работу и логотип/значок Quassel&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команде Oxygen&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создания большинства шикарных значков, которые вы видите в Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Qt Software, ранее известная как Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего&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;за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810&lt;/dd&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-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;Современный, распределённый клиент IRC&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2009 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; в сети &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC распространяется по двойной лицензии &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; и &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Большинство значков &amp;copy;  &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Команда Oxygen&lt;/a&gt; и используются по лицензии &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Об ошибках пожалуйста сообщайте на  &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="125"/>
+        <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>Особая благодарность:&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;за оригинальный значок Quassel - Всевидящее Око&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;за всю графическую работу для 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, ранее известная как Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего&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;за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810&lt;/dd&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AbstractSqlStorage</name>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="104"/>
+        <source>Installed Schema (version %1) is not up to date. Upgrading to version %2...</source>
+        <translation>Используемая схема (версии %1) устарела. Обновляю до версии %2...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/abstractsqlstorage.cpp" line="106"/>
+        <source>Upgrade failed...</source>
+        <translation>Обновление не удалось...</translation>
     </message>
 </context>
 <context>
@@ -101,7 +124,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
@@ -123,69 +146,349 @@ p, li { white-space: pre-wrap; }
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/aliasessettingspage.cpp" line="29"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
 </context>
 <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>Вид</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="33"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="38"/>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="46"/>
         <source>&lt;System Default&gt;</source>
         <translation>&lt;По умолчанию&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>Форма</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
         <source>Client style:</source>
-        <translation>Стиль клиента:</translation>
+        <translation type="obsolete">Стиль клиента:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="31"/>
         <source>Language:</source>
-        <translation>Язык:</translation>
+        <translation type="obsolete">Язык:</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;Без изменений&gt;</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="51"/>
         <source>Note: needs client restart for full effect!</source>
-        <translation>Замечание: для полного эффекта нужно перезапустить клиент!</translation>
+        <translation type="obsolete">Замечание: для полного эффекта нужно перезапустить клиент!</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="61"/>
         <source>Misc:</source>
-        <translation>Прочее:</translation>
+        <translation type="obsolete">Прочее:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="67"/>
         <source>Show Web Previews</source>
-        <translation>Показывать предварительный просмотр веб-ссылок</translation>
+        <translation type="obsolete">Показывать предварительный просмотр веб-ссылок</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="77"/>
         <source>Use Icons to represent away state of Users</source>
-        <translation>Отображать состояние пользователей значками</translation>
+        <translation type="obsolete">Отображать состояние пользователей значками</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="20"/>
+        <source>Client Style</source>
+        <translation>Стиль клиента</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="26"/>
+        <source>Set application style</source>
+        <translation>Задаёт стиль приложения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="36"/>
+        <source>Language</source>
+        <translation>Язык</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="42"/>
+        <source>Set the application language. Requires restart!</source>
+        <translation>Задаёт язык приложения. Требует перезапуска!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="62"/>
+        <source>Fonts</source>
+        <translation>Шрифты</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="84"/>
+        <source>Set font for the main chat window and the chat monitor</source>
+        <translation>Задаёт шрифт главного окна чата и монитора чата</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="71"/>
+        <source>Chat window:</source>
+        <translation>Окно чата:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="189"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="205"/>
+        <source>Choose...</source>
+        <translation>Выбрать...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="132"/>
+        <source>Set font for channel and nick lists</source>
+        <translation>Задаёт шрифт списков каналов и ников</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="119"/>
+        <source>Channel list:</source>
+        <translation>Список каналов:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="180"/>
+        <source>Set font for the input line</source>
+        <translation>Задаёт шрифт для строки ввода</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="167"/>
+        <source>Input line:</source>
+        <translation>Строка ввода:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="215"/>
+        <source>Misc</source>
+        <translation>Прочее</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>Показывать предварительный просмотр вебсайта при наведении мышью на адрес</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="224"/>
+        <source>Show previews of webpages on URL hover</source>
+        <translation>Показывать эскиз вебсайта при наведении на URL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="234"/>
+        <source>Show status icons in channel and nick lists</source>
+        <translation>Показывать значки статус в списках каналов и ников</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="237"/>
+        <source>Use icons in channel and nick lists</source>
+        <translation>Использовать значки в списках</translation>
+    </message>
+</context>
+<context>
+    <name>AwayLogView</name>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="33"/>
+        <source>Away Log</source>
+        <translation>Журнал отсутствия</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="44"/>
+        <source>Show Network Name</source>
+        <translation>Показывать название сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/awaylogview.cpp" line="49"/>
+        <source>Show Buffer Name</source>
+        <translation>Показывать название буфера</translation>
+    </message>
+</context>
+<context>
+    <name>BacklogSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Behaviour</source>
+        <translation type="obsolete">Поведение</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Backlog</source>
+        <translation>Журнал</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="74"/>
+        <source>Backlog Request Method:</source>
+        <translation>Метод запроса журнала:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="82"/>
+        <source>Fixed Amount per Buffer</source>
+        <translation>Фиксированная длина для каждого буфера</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="87"/>
+        <source>Unread Messages per Buffer</source>
+        <translation>Непрочитанные сообщения для каждого буфера</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="92"/>
+        <source>Global Unread Messages</source>
+        <translation>Глобальное количество непрочитанных сообщений</translation>
+    </message>
+    <message>
+        <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>Простейший вариант. Запрашивает фиксированное количество строк для каждого буфера из журнала.</translation>
+    </message>
+    <message>
+        <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>количество сообщений из каждого буфера, которые запрашиваются у ядра после установления соединения.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="140"/>
+        <source>Initial backlog amount:</source>
+        <translation>Начальный размер журнала:</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">Этот метод запрашивает непрочитанные сообщения для каждого буфера индивидуально. Количество строк может быть ограничено для каждого буфера.
+
+Также можно запрашивать дополнительное количество старых строк для лучшего контекста.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="341"/>
+        <source>Maximum amount of messages to be fetched per buffer.</source>
+        <translation>Максимальное количество запрашиваемых сообщений для буфера.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="334"/>
+        <source>Limit:</source>
+        <translation>Предел:</translation>
+    </message>
+    <message>
+        <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>Количество сообщений, запрашиваемых в дополнение к непрочитанным. Предел здесь не применяется.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="366"/>
+        <source>Additional Messages:</source>
+        <translation>Дополнительных сообщений:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="264"/>
+        <source>This requester fetches all messages newer than the oldest unread message for all buffers. 
+This requester determines which is the oldest read message of all buffers and then requests one large chunk of messages across all buffers.
+
+Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
+It is useful to limit the total amount of the backlog and is probably the fastest.
+
+You can also chose to fetch additional older chatlines to provide a better context similar.</source>
+        <translation type="obsolete">Этот метод запрашивает все сообщения новее, чем самое старое сообщение из каждого буфера. Этот метод определяет самое старое прочитанное сообщение из всех буферов и затем запрашивает один большой кусок сообщений со всех буферовПримечание: не рекомендуется использовать этот метод, если используются скрытые буфера или есть неактивные буфера (например оконченные диалоги или каналы).Полезно его использовать для ограничения общего объёма журнала и достижение максимальной скорости.Также можно запросить дополнительно старые строки для лучшего контекста.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="331"/>
+        <source>Maximum amount of messages to be fetched over all buffers.</source>
+        <translation>Максимальное количество сообщений, запрашиваемых из всех буферов.</translation>
+    </message>
+    <message>
+        <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>Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="24"/>
+        <source>Dynamic backlog amount:</source>
+        <translation>Динамический размер журнала:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.ui" line="311"/>
+        <source>This requester fetches all messages newer than the oldest unread message for all buffers.
+
+Note: this requester is not recommended if you use hidden buffer or have inactive buffers (i.e.: no stale queries or channels).
+It is useful to limit the total amount of the backlog and is probably the fastest.
+
+You can also chose to fetch additional older chatlines to provide a better context similar.</source>
+        <translation>Этот метод запрашивает для каждого буфера все сообщения новее чем самое старое непрочитанное сообщение.
+
+Примечание: этот метод не рекомендуется, при использовании скрытых или неактивных буферов (например, пустующих диалогов или каналов).
+Он полезен для ограничения общего размера журнала, и является, вероятно, самым быстрым.
+
+Также можно запрашивать дополнительные старые строки для лучшего контекста.</translation>
+    </message>
+    <message>
+        <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="237"/>
+        <source>PerBufferUnreadBacklogLimit</source>
+        <translation>PerBufferUnreadBacklogLimit</translation>
+    </message>
+    <message>
+        <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="353"/>
+        <source>GlobalUnreadBacklogLimit</source>
+        <translation>GlobalUnreadBacklogLimit</translation>
+    </message>
+    <message>
+        <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="40"/>
+        <source>DynamicBacklogAmount</source>
+        <translation>DynamicBacklogAmount</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/backlogsettingspage.cpp" line="27"/>
+        <source>Misc</source>
+        <translation>Прочее</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>Этот метод запрашивает непрочитанные сообщения для каждого буфера индивидуально. Количество строк может быть ограничено для каждого буфера.
+
+Также можно запрашивать дополнительное количество старых строк для лучшего контекста.</translation>
     </message>
 </context>
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="277"/>
+        <location filename="../src/client/networkmodel.cpp" line="297"/>
         <source>&lt;p&gt; %1 - %2 &lt;/p&gt;</source>
         <translation>&lt;p&gt; %1 - %2 &lt;/p&gt;</translation>
     </message>
@@ -195,52 +498,52 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="51"/>
         <source>Show Channel List</source>
-        <translation>Показать список каналов</translation>
+        <translation type="obsolete">Показать список каналов</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="52"/>
         <source>Connect</source>
-        <translation>Соединиться</translation>
+        <translation type="obsolete">Соединиться</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="53"/>
         <source>Disconnect</source>
-        <translation>Отсоединиться</translation>
+        <translation type="obsolete">Отсоединиться</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="493"/>
         <source>Join Channel</source>
-        <translation>Зайти на канал</translation>
+        <translation type="obsolete">Зайти на канал</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="56"/>
         <source>Join</source>
-        <translation>Зайти</translation>
+        <translation type="obsolete">Зайти</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="57"/>
         <source>Part</source>
-        <translation>Выйти</translation>
+        <translation type="obsolete">Выйти</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="58"/>
         <source>Hide buffers</source>
-        <translation>Спрятать буферы</translation>
+        <translation type="obsolete">Спрятать буферы</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="59"/>
         <source>Hide buffers permanently</source>
-        <translation>Спрятать буферы навсегда</translation>
+        <translation type="obsolete">Спрятать буферы навсегда</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="60"/>
         <source>Delete buffer</source>
-        <translation>Удалить буфер</translation>
+        <translation type="obsolete">Удалить буфер</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="61"/>
         <source>Ignore list</source>
-        <translation>Список игнорируемых</translation>
+        <translation type="obsolete">Список игнорируемых</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="63"/>
@@ -265,60 +568,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="399"/>
         <source>Hide Events</source>
-        <translation>Спрятать события</translation>
+        <translation type="obsolete">Спрятать события</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="493"/>
         <source>Input channel name:</source>
-        <translation>Введите название канала:</translation>
+        <translation type="obsolete">Введите название канала:</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="525"/>
         <source>Remove buffer permanently?</source>
-        <translation>Удалить буфер навсегда?</translation>
+        <translation type="obsolete">Удалить буфер навсегда?</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="527"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
-        <translation>Удалить буфер &quot;%1&quot; навсегда? Это удалить все относящиеся к нему данные, включая историю, из базы данных ядра!</translation>
+        <translation type="obsolete">Удалить буфер &quot;%1&quot; навсегда? Это удалить все относящиеся к нему данные, включая историю, из базы данных ядра!</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Joins</source>
-        <translation>Входы</translation>
+        <translation type="obsolete">Входы</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Parts</source>
-        <translation>Выходы из канала</translation>
+        <translation type="obsolete">Выходы из канала</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Quits</source>
-        <translation>Выходы из сети</translation>
+        <translation type="obsolete">Выходы из сети</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Nick Changes</source>
-        <translation>Смены ника</translation>
+        <translation type="obsolete">Смены ника</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="67"/>
         <source>Mode</source>
-        <translation>Режимы</translation>
+        <translation type="obsolete">Режимы</translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="68"/>
         <source>Day Change</source>
-        <translation>Смены дня</translation>
+        <translation type="obsolete">Смены дня</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="256"/>
+        <source>Merge buffers permanently?</source>
+        <translation>Произвести необратимое слияние буферов?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="257"/>
+        <source>Do you want to merge the buffer &quot;%1&quot; permanently into buffer &quot;%2&quot;?
+ This cannot be reversed!</source>
+        <translation>Хотите ли вы слить буфер &quot;%1&quot; с буфером &quot;%2&quot;?
+ Это нельзя обратить!</translation>
     </message>
 </context>
 <context>
     <name>BufferViewDock</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="625"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="502"/>
         <source>All Buffers</source>
-        <translation>Все буфера</translation>
+        <translation type="obsolete">Все буфера</translation>
     </message>
 </context>
 <context>
@@ -334,22 +649,35 @@ p, li { white-space: pre-wrap; }
         <translation>Пожалуйста введите названия нового списка буферов:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="491"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="520"/>
         <source>Add Buffer View</source>
         <translation>Добавить список буферов</translation>
     </message>
 </context>
+<context>
+    <name>BufferViewFilter</name>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="53"/>
+        <source>Edit Mode</source>
+        <translation type="obsolete">Режим правки</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferviewfilter.cpp" line="54"/>
+        <source>Show / Hide buffers</source>
+        <translation>Показать / спрятать буферы</translation>
+    </message>
+</context>
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="35"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</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>Представления буферов</translation>
+        <translation>Списки буферов</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="99"/>
@@ -357,12 +685,12 @@ p, li { white-space: pre-wrap; }
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="326"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="342"/>
         <source>Delete Buffer View?</source>
         <translation>Удалить список буферов?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="327"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="343"/>
         <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation>Вы действительно хотите удалить список буферов &quot;%1&quot;?</translation>
     </message>
@@ -402,72 +730,84 @@ p, li { white-space: pre-wrap; }
         <translation>Ограничить буфера:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="115"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
         <source>Status Buffers</source>
         <translation>Буфера состояния</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="122"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
         <source>Channel Buffers</source>
         <translation>Буфера каналов</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="129"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="133"/>
         <source>Query Buffers</source>
         <translation>Буфера диалогов</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="139"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
         <source>Hide inactive Buffers</source>
         <translation>Спрятать неактивные буфера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="146"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
         <source>Add new Buffers automatically</source>
         <translation>Автоматически добавлять новые буфера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="153"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
         <source>Sort alphabetically</source>
         <translation>Сортировать по алфавиту</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="164"/>
         <source>Minimum Activity:</source>
         <translation>Минимальная активность:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="168"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="172"/>
         <source>No Activity</source>
         <translation>Нет активности</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="177"/>
         <source>Other Activity</source>
         <translation>Другая активность</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="178"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="182"/>
         <source>New Message</source>
         <translation>Новое сообщение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="183"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="187"/>
         <source>Highlight</source>
         <translation>Подсветка</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="209"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="213"/>
         <source>Preview:</source>
         <translation>Предварительный просмотр:</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="115"/>
+        <source>This option is not available when all Networks are visible.
+In this mode no separate status buffer is displayed.</source>
+        <translation>Эта опция недоступна когда видны все сети.
+В этом режиме отдельные буфера состояния не отображаются.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="36"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
     <message>
         <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
         <source>BufferView</source>
-        <translation>ПредставлениеБуферов</translation>
+        <translation>СписокБуферов</translation>
     </message>
 </context>
 <context>
@@ -475,32 +815,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="72"/>
         <source>Enlarge Chat View</source>
-        <translation>Увеличить окно чата</translation>
+        <translation type="obsolete">Увеличить окно чата</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="73"/>
         <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
+        <translation type="obsolete">Ctrl++</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="77"/>
         <source>Demagnify Chat View</source>
-        <translation>Уменьшить окно чата</translation>
+        <translation type="obsolete">Уменьшить окно чата</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="78"/>
         <source>Ctrl+-</source>
-        <translation>Ctrl+-</translation>
+        <translation type="obsolete">Ctrl+-</translation>
     </message>
     <message>
         <location filename="../src/qtui/bufferwidget.cpp" line="82"/>
         <source>Normalize zoom of Chat View</source>
-        <translation>Нормализовать окно чата</translation>
+        <translation type="obsolete">Нормализовать окно чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/bufferwidget.cpp" line="83"/>
+        <location filename="../src/qtui/bufferwidget.cpp" line="85"/>
         <source>Ctrl+0</source>
-        <translation>Ctrl+0</translation>
+        <translation type="obsolete">Ctrl+0</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/bufferwidget.ui" line="64"/>
@@ -510,38 +850,58 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Разговаривать удобно. Везде.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pics/quassel-large.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Разговаривать удобно. Везде.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/bufferwidget.cpp" line="73"/>
+        <source>Zoom In</source>
+        <translation>Увеличить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/bufferwidget.cpp" line="79"/>
+        <source>Zoom Out</source>
+        <translation>Уменьшить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
+        <source>Zoom Original</source>
+        <translation type="obsolete">Восстановить размер</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/bufferwidget.cpp" line="84"/>
+        <source>Actual Size</source>
+        <translation>Исходный размер</translation>
     </message>
 </context>
 <context>
     <name>ChannelBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="394"/>
+        <location filename="../src/client/networkmodel.cpp" line="461"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Канал %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="397"/>
+        <location filename="../src/client/networkmodel.cpp" line="464"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Пользователи:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="401"/>
+        <location filename="../src/client/networkmodel.cpp" line="468"/>
         <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Режим:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="413"/>
+        <location filename="../src/client/networkmodel.cpp" line="480"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Тема:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="417"/>
+        <location filename="../src/client/networkmodel.cpp" line="484"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation>Неактивно &lt;br /&gt; Дважды щёлкните чтобы войти</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="420"/>
+        <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>
@@ -601,23 +961,140 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;СУПЕР ЗЛАЯ НЕПОПРАВИМАЯ ОШИБКА!!11адин&lt;/p&gt;&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {400;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {13p?} {11&lt;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {13p?}</translation>
     </message>
 </context>
+<context>
+    <name>ChatMonitorSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>General</source>
+        <translation type="obsolete">Общие</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Chat Monitor</source>
+        <translation>Монитор чата</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="58"/>
+        <source>Opt In</source>
+        <translation>Белый список</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="59"/>
+        <source>Opt Out</source>
+        <translation>Чёрный список</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="132"/>
+        <source>Show:</source>
+        <translation>Показывать:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="239"/>
+        <source>Ignore:</source>
+        <translation>Игнорировать:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="21"/>
+        <source>Operation Mode:</source>
+        <translation>Режим:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="28"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Operation modes:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Opt-In:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;Only buffers on the right side are shown in chatmonitor&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Opt-Out:&lt;/span&gt; Buffers on the right side will be ignored in chatmonitor&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Режимы:&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;span style=&quot; font-weight:400; text-decoration: underline;&quot;&gt;Белый список:&lt;/span&gt; &lt;span style=&quot; font-weight:400;&quot;&gt;В мониторе чата отображаются только буферы из списка справа.&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Opt-Out:&lt;/span&gt;Буферы из списка справа монитором чата игнорируются.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="60"/>
+        <source>Available Buffers:</source>
+        <translation>Доступные буферы:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="87"/>
+        <source>Move selected buffers to the left</source>
+        <translation>Переместить выбранные буферы влево</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="101"/>
+        <source>Move selected buffers to the right</source>
+        <translation>Переместить выбранные буферы вправо</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="146"/>
+        <source>Show highlights in chatmonitor even if the originating buffer is ignored</source>
+        <translation>Показывать подсвеченные сообщения даже если их буфер игнорируется</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="149"/>
+        <source>Always show highlighted messages</source>
+        <translation>Всегда показывать подсвеченные сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.ui" line="156"/>
+        <source>Show own messages</source>
+        <translation>Показывать свои сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/chatmonitorsettingspage.cpp" line="35"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
+</context>
 <context>
     <name>ChatMonitorView</name>
     <message>
         <location filename="../src/qtui/chatmonitorview.cpp" line="47"/>
         <source>Show own messages</source>
-        <translation>Показывать свои сообщения</translation>
+        <translation type="obsolete">Показывать свои сообщения</translation>
     </message>
     <message>
         <location filename="../src/qtui/chatmonitorview.cpp" line="54"/>
         <source>Show network name</source>
-        <translation>Показывать название сети</translation>
+        <translation type="obsolete">Показывать название сети</translation>
     </message>
     <message>
         <location filename="../src/qtui/chatmonitorview.cpp" line="59"/>
         <source>Show buffer name</source>
+        <translation type="obsolete">Показывать название буфера</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="50"/>
+        <source>Show Own Messages</source>
+        <translation>Показывать свои сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="57"/>
+        <source>Show Network Name</source>
+        <translation>Показывать название сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="62"/>
+        <source>Show Buffer Name</source>
         <translation>Показывать название буфера</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/chatmonitorview.cpp" line="69"/>
+        <source>Configure...</source>
+        <translation>Настроить...</translation>
+    </message>
+</context>
+<context>
+    <name>ChatScene</name>
+    <message>
+        <location filename="../src/qtui/chatscene.cpp" line="580"/>
+        <source>Copy Selection</source>
+        <translation>Скопировать выделение</translation>
+    </message>
 </context>
 <context>
     <name>ChatViewSearchBar</name>
@@ -655,15 +1132,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="243"/>
+        <location filename="../src/client/client.cpp" line="254"/>
         <source>Identity already exists in client!</source>
         <translation>Личность уже есть в клиенте!</translation>
     </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="317"/>
+        <source>All Buffers</source>
+        <translation>Все буфера</translation>
+    </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="330"/>
+        <source>Default Identity</source>
+        <translation type="obsolete">Личность по умолчанию</translation>
+    </message>
 </context>
 <context>
     <name>ClientBacklogManager</name>
     <message>
-        <location filename="../src/client/clientbacklogmanager.cpp" line="102"/>
+        <location filename="../src/client/clientbacklogmanager.cpp" line="123"/>
         <source>Processed %1 messages in %2 seconds.</source>
         <translation>Обработано сообщений: %1. Затрачено секунд: %2.</translation>
     </message>
@@ -671,50 +1158,60 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ClientSyncer</name>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="55"/>
+        <location filename="../src/client/clientsyncer.cpp" line="52"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <translation>Вы пытаетесь подключиться к слишком старому ядру Quassel! Пожалуйста обновите.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="80"/>
+        <location filename="../src/client/clientsyncer.cpp" line="77"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <translation>&lt;b&gt;От ядра получены некорректные данные!&lt;/b&gt;&lt;br&gt;Отсоединяюсь.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="112"/>
+        <location filename="../src/client/clientsyncer.cpp" line="111"/>
         <source>Internal connections not yet supported.</source>
-        <translation>Внутренние соединения пока не поддерживаются.</translation>
+        <translation type="obsolete">Внутренние соединения пока не поддерживаются.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="130"/>
+        <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;Этот клиент был собран без поддержки SSL!&lt;/b&gt;&lt;br /&gt;Отключите использование SSL в настройках аккаунта.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="194"/>
+        <location filename="../src/client/clientsyncer.cpp" line="196"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
         <translation>&lt;b&gt;Вы пытаетесь подключиться к слишком старому ядру Quassel!&lt;/b&gt;&lt;br&gt;Для соединения необходима поддержка клиент-серверного протокола по крайней мере версии %1.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="210"/>
+        <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;Ядро Quassel, к которому вы пытаетесь подключиться не поддерживает SSL!&lt;/b&gt;&lt;br /&gt;Если вы всё равно хотите подключиться, отключите использование SSL в настройках аккаунта.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="240"/>
+        <location filename="../src/client/clientsyncer.cpp" line="248"/>
         <source>Logging in...</source>
         <translation>Авторизуюсь...</translation>
     </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="407"/>
+        <source>Cert Digest changed! was: %1</source>
+        <translation>Хеш сертификата изменился! старый был: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="102"/>
+        <source>No Host to connect to specified.</source>
+        <translation>Не указан хост для соединения.</translation>
+    </message>
 </context>
 <context>
     <name>ColorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Appearance</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="34"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="32"/>
         <source>Color settings</source>
         <translation>Настройки цвета</translation>
     </message>
@@ -736,303 +1233,504 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1503"/>
         <source>FG</source>
-        <translation>Текст</translation>
+        <translation type="obsolete">Текст</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1734"/>
         <source>BG</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1523"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1747"/>
         <source>Use BG</source>
         <translation>Использовать фон</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="77"/>
         <source>Default:</source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="126"/>
         <source>Inactive:</source>
         <translation>Неактивно:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="172"/>
         <source>Highlight:</source>
         <translation>Подсветка:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="215"/>
         <source>New Message:</source>
         <translation>Новое сообщение:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="258"/>
         <source>Other Activity:</source>
         <translation>Другая активность:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1626"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="317"/>
         <source>Preview:</source>
         <translation>Предварительный просмотр:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1633"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="324"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="349"/>
         <source>Chatview</source>
         <translation>Окно чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="365"/>
         <source>Server Activity</source>
         <translation>Активность сервера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1724"/>
         <source>Foreground</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1013"/>
         <source>Background</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="417"/>
         <source>Error Message:</source>
         <translation>Сообщение об ошибке:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="463"/>
         <source>Notice Message:</source>
         <translation>Уведомление:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="509"/>
         <source>Plain Message:</source>
         <translation>Простое сообщение:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="555"/>
         <source>Server Message:</source>
         <translation>Сообщение сервера:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="601"/>
         <source>Highlight Message:</source>
         <translation>Подсвеченное сообщение:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="619"/>
         <source>User Activity</source>
         <translation>Пользовательская активность</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>Сообщение о действии:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="707"/>
         <source>Join Message:</source>
         <translation>Сообщение о входе:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="753"/>
         <source>Kick Message:</source>
         <translation>Сообщение об изгнании:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="799"/>
         <source>Mode Message:</source>
         <translation>Сообщение о смене режима:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="845"/>
         <source>Part Message:</source>
         <translation>Сообщение об уходе:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="891"/>
         <source>Quit Message:</source>
         <translation>Сообщение о выходе:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="937"/>
         <source>Rename Message:</source>
         <translation>Сообщение о переименовании:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="997"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1039"/>
         <source>Timestamp:</source>
         <translation>Время:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1085"/>
         <source>Sender:</source>
         <translation>Отправитель:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1092"/>
         <source>Nick:</source>
         <translation>Ник:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1144"/>
         <source>Hostmask:</source>
         <translation>Маска:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1196"/>
         <source>Channelname:</source>
         <translation>Канал:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1248"/>
         <source>Mode flags:</source>
         <translation>Режимы:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1300"/>
         <source>Url:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1195"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1352"/>
         <source>New Message Marker:</source>
         <translation>Маркер новых сообщений:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1232"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
         <source>Mirc Color Codes</source>
         <translation>Цвета mIRC</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1244"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1465"/>
         <source>Color Codes</source>
         <translation>Цвета</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1250"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1471"/>
         <source>Color 0:</source>
         <translation>Цвет 0:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1271"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1492"/>
         <source>Color 1:</source>
         <translation>Цвет 1:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1292"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1513"/>
         <source>Color 2:</source>
         <translation>Цвет 2:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1313"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1534"/>
         <source>Color 3:</source>
         <translation>Цвет 3:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1334"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1555"/>
         <source>Color 4:</source>
         <translation>Цвет 4:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1355"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1576"/>
         <source>Color 5:</source>
         <translation>Цвет 5:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1376"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1597"/>
         <source>Color 6:</source>
         <translation>Цвет 6:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1397"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1618"/>
         <source>Color 7:</source>
         <translation>Цвет 7:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1639"/>
         <source>Color 8:</source>
         <translation>Цвет 8:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1646"/>
         <source>Color 14:</source>
         <translation>Цвет 14:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1653"/>
         <source>Color 15:</source>
         <translation>Цвет 15:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1660"/>
         <source>Color 13:</source>
         <translation>Цвет 13:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1667"/>
         <source>Color 12:</source>
         <translation>Цвет 12:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1674"/>
         <source>Color 11:</source>
         <translation>Цвет 11:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1460"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1681"/>
         <source>Color 10:</source>
         <translation>Цвет 10:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1467"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1688"/>
         <source>Color 9:</source>
         <translation>Цвет 9:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1491"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1712"/>
         <source>Nickview</source>
         <translation>Список  ников</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1497"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1718"/>
         <source>Nick status:</source>
         <translation>Состояние ника:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1533"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1760"/>
         <source>Online:</source>
         <translation>Онлайн:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1573"/>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1806"/>
         <source>Away:</source>
-        <translation>Отошёл:</translation>
+        <translation>Отсутствует:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1366"/>
+        <source>Enable</source>
+        <translation>Включено</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1373"/>
+        <source>Sender auto coloring:</source>
+        <translation>Автоматическая раскраска отправителя:</translation>
+    </message>
+</context>
+<context>
+    <name>ContentsChatItem</name>
+    <message>
+        <location filename="../src/qtui/chatitem.cpp" line="611"/>
+        <source>Copy Link Address</source>
+        <translation>Скопировать адрес ссылки</translation>
+    </message>
+</context>
+<context>
+    <name>ContextMenuActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="35"/>
+        <source>Connect</source>
+        <translation>Соединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="36"/>
+        <source>Disconnect</source>
+        <translation>Отсоединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="38"/>
+        <source>Join</source>
+        <translation>Зайти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="39"/>
+        <source>Part</source>
+        <translation>Выйти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="40"/>
+        <source>Delete Buffer(s)...</source>
+        <translation>Удалить буфер(а)...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="41"/>
+        <source>Show Buffer</source>
+        <translation>Показать буфер</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="43"/>
+        <source>Joins</source>
+        <translation>Входы</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="44"/>
+        <source>Parts</source>
+        <translation>Выходы из канала</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="45"/>
+        <source>Quits</source>
+        <translation>Выходы из сети</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="46"/>
+        <source>Nick Changes</source>
+        <translation>Смены ника</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="47"/>
+        <source>Mode Changes</source>
+        <translation>Смены режимов</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="48"/>
+        <source>Day Changes</source>
+        <translation>Смены дня</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="49"/>
+        <source>Set as Default...</source>
+        <translation>Задать буфер по умолчанию...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="50"/>
+        <source>Use Defaults...</source>
+        <translation>Использовать по умолчанию...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="52"/>
+        <source>Join Channel...</source>
+        <translation>Зайти на канал...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="54"/>
+        <source>Start Query</source>
+        <translation>Начать диалог</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="55"/>
+        <source>Show Query</source>
+        <translation>Показать диалог</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="56"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="58"/>
+        <source>Version</source>
+        <translation>Версия</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="59"/>
+        <source>Time</source>
+        <translation>Время</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="60"/>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="61"/>
+        <source>Finger</source>
+        <translation>Finger</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="63"/>
+        <source>Give Operator Status</source>
+        <translation>Дать оператора</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="64"/>
+        <source>Take Operator Status</source>
+        <translation>Снять оператора</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="65"/>
+        <source>Give Voice</source>
+        <translation>Дать голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="66"/>
+        <source>Take Voice</source>
+        <translation>Снять голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="67"/>
+        <source>Kick From Channel</source>
+        <translation>Выгнать с канала</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="68"/>
+        <source>Ban From Channel</source>
+        <translation>Забанить на канале</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="69"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation>Выгнать и забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="71"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation>Временно спрятать буфер(а)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="72"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation>Навсегда спрятать буфер(а)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="73"/>
+        <source>Show Channel List</source>
+        <translation>Показать список каналов</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="74"/>
+        <source>Show Ignore List</source>
+        <translation>Показать список игнорируемых</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/contextmenuactionprovider.cpp" line="86"/>
+        <source>Hide Events</source>
+        <translation>Спрятать события</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>Действия</translation>
     </message>
 </context>
 <context>
     <name>Core</name>
     <message>
-        <location filename="../src/core/core.cpp" line="61"/>
+        <location filename="../src/core/core.cpp" line="146"/>
         <source>Could not initialize any storage backend! Exiting...</source>
         <translation>Не могу инициализировать ни одно хранилище! Выхожу...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="64"/>
+        <location filename="../src/core/core.cpp" line="149"/>
         <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>
@@ -1041,105 +1739,140 @@ to work.</source>
 чтобы quasselcore заработал.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="122"/>
+        <location filename="../src/core/core.cpp" line="186"/>
         <source>Calling restoreState() even though active sessions exist!</source>
-        <translation>Вызываю restoreState() несмотря на существующие активные сессии!</translation>
+        <translation>Вызываю restoreState(), несмотря на существующие активные сессии!</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="163"/>
+        <location filename="../src/core/core.cpp" line="227"/>
         <source>Admin user or password not set.</source>
         <translation>Нет пользователя-администратора или пароля.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="166"/>
+        <location filename="../src/core/core.cpp" line="231"/>
         <source>Could not setup storage!</source>
         <translation>Не могу настроить хранилище!</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="170"/>
+        <location filename="../src/core/core.cpp" line="235"/>
         <source>Creating admin user...</source>
         <translation>Создаю пользователя-администратора...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="415"/>
+        <location filename="../src/core/core.cpp" line="420"/>
         <source>Client connected from</source>
         <translation>Клиент соединился с</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="418"/>
+        <location filename="../src/core/core.cpp" line="423"/>
         <source>Closing server for basic setup.</source>
         <translation>Закрываю сервер для базовой настройки.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="437"/>
+        <location filename="../src/core/core.cpp" line="442"/>
         <source>Antique client trying to connect... refusing.</source>
         <translation>Древний клиент попытался подключиться... отказываю.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="451"/>
+        <location filename="../src/core/core.cpp" line="456"/>
         <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;Ваш клиент Quassel слишком старый!&lt;/b&gt;&lt;br&gt;Этому ядру нужна версия клиент-серверного протокола по крайней мере %1.&lt;br&gt;Пожалуйста обновите клиент.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="559"/>
+        <location filename="../src/core/core.cpp" line="562"/>
         <source>Client</source>
         <translation>Клиент</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="453"/>
+        <location filename="../src/core/core.cpp" line="458"/>
         <source>too old, rejecting.</source>
         <translation>слишком старый, отказываю.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="467"/>
+        <location filename="../src/core/core.cpp" line="472"/>
         <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
         <translation>&lt;b&gt;Ядро Quassel версии %1&lt;/b&gt;&lt;br&gt;Собрано: %2&lt;br&gt;Аптайм %3д%4ч%5м (с %6)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="513"/>
+        <location filename="../src/core/core.cpp" line="518"/>
         <source>Starting TLS for Client:</source>
         <translation>Запускаю TLS для клиента:</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="531"/>
+        <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;Клиент не инициализирован!&lt;/b&gt;&lt;br&gt;Вам нужно отправить инициализационное сообщение перед попыткой входа.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="533"/>
+        <location filename="../src/core/core.cpp" line="538"/>
         <source>did not send an init message before trying to login, rejecting.</source>
         <translation>не отправил инициализационное сообщение перед попыткой входа, отказываю.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="553"/>
+        <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;Неверное имя пользователя или пароль!&lt;/b&gt;&lt;br&gt;Предоставленные вами имя пользователя и пароль не найдены в базе.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="559"/>
+        <location filename="../src/core/core.cpp" line="562"/>
         <source>initialized and authenticated successfully as &quot;%1&quot; (UserId: %2).</source>
         <translation>инициализирован и аутентифицирован успешно как &quot;%1&quot; (UserId: %2).</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="570"/>
+        <location filename="../src/core/core.cpp" line="573"/>
         <source>Non-authed client disconnected.</source>
         <translation>Неавторизованный клиент отсоединён.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="576"/>
+        <location filename="../src/core/core.cpp" line="579"/>
         <source>Non-authed client disconnected. (socket allready destroyed)</source>
         <translation>Неавторизованный клиент отсоединён. (сокет уже уничтожен)</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="618"/>
-        <source>Could not initialize session for client:</source>
-        <translation>Не могу инициализировать сессию для клиента:</translation>
+        <location filename="../src/core/core.cpp" line="623"/>
+        <source>Could not initialize session for client:</source>
+        <translation>Не могу инициализировать сессию для клиента:</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="335"/>
+        <source>Invalid listen address %1</source>
+        <translation>Некорректный адрес для прослушивания %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="343"/>
+        <source>Listening for GUI clients on IPv4 %1 port %2 using protocol version %3</source>
+        <translation>Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол версии %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="351"/>
+        <source>Could not open IPv4 interface %1:%2: %3</source>
+        <translation>Не могу открыть интерфейс IPv4 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="359"/>
+        <source>Listening for GUI clients on IPv6 %1 port %2 using protocol version %3</source>
+        <translation>Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол версии %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="370"/>
+        <source>Could not open IPv6 interface %1:%2: %3</source>
+        <translation>Не могу открыть интерфейс IPv6 %1:%2: %3</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="378"/>
+        <source>Invalid listen address %1, unknown network protocol</source>
+        <translation>Некорректный адрес для прослушивания %1, неизвестный сетевой протокол</translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="386"/>
+        <source>Could not open any network interfaces to listen on!</source>
+        <translation>Не могу открыть ни один сетевой интерфейс для прослушивания!</translation>
     </message>
 </context>
 <context>
     <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="483"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="522"/>
         <source>Add Core Account</source>
         <translation>Добавить аккаунт в ядре</translation>
     </message>
@@ -1229,27 +1962,27 @@ to work.</source>
     <message>
         <location filename="../src/core/coreapplication.cpp" line="33"/>
         <source>The port quasselcore will listen at</source>
-        <translation>Порт, который будет прослушивать ядро</translation>
+        <translation type="obsolete">Порт, который будет прослушивать ядро</translation>
     </message>
     <message>
         <location filename="../src/core/coreapplication.cpp" line="34"/>
         <source>Don&apos;t restore last core&apos;s state</source>
-        <translation>Не восстанавливать предыдущее состояние ядра</translation>
+        <translation type="obsolete">Не восстанавливать предыдущее состояние ядра</translation>
     </message>
     <message>
         <location filename="../src/core/coreapplication.cpp" line="35"/>
         <source>Path to logfile</source>
-        <translation>Путь к журналу</translation>
+        <translation type="obsolete">Путь к журналу</translation>
     </message>
     <message>
         <location filename="../src/core/coreapplication.cpp" line="36"/>
         <source>Loglevel Debug|Info|Warning|Error</source>
-        <translation>Уровень журналирования Debug|Info|Warning|Error</translation>
+        <translation type="obsolete">Уровень журналирования Debug|Info|Warning|Error</translation>
     </message>
     <message>
         <location filename="../src/core/coreapplication.cpp" line="37"/>
         <source>Specify the directory holding datafiles like the Sqlite DB and the SSL Cert</source>
-        <translation>Укажите каталог, в котором лежат базы данных вроде Sqlite DB и сертификат SSL</translation>
+        <translation type="obsolete">Укажите каталог, в котором лежат базы данных вроде Sqlite DB и сертификат SSL</translation>
     </message>
 </context>
 <context>
@@ -1442,77 +2175,77 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConnectDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="185"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="190"/>
         <source>Remove Account Settings</source>
         <translation>Удаление настроек аккаунта</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="187"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="192"/>
         <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>Вы действительно хотите удалить ваши локальные настройки для этого аккаунта ядра Quassel?&lt;br&gt;Замечание: это &lt;em&gt;не&lt;/em&gt; удалит и никак не изменит данные в самом ядре!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="237"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="242"/>
         <source>Connect to %1</source>
         <translation>Соединиться с %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="254"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="259"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <translation>&lt;div style=&quot;color:red;&quot;&gt;Сбой соединения с %1!&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="278"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="309"/>
         <source>Not connected to %1.</source>
         <translation>Нет соединения с %1.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="279"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="310"/>
         <source>Looking up %1...</source>
         <translation>Ищу хост %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="280"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="311"/>
         <source>Connecting to %1...</source>
         <translation>Соединяюсь с %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="281"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
         <source>Connected to %1</source>
         <translation>Соединение с %1 установлено</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="282"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="313"/>
         <source>Unknown connection state to %1</source>
         <translation>Неизвестно состояние соединения с %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="334"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="365"/>
         <source>Logging in...</source>
         <translation>Выполняю вход...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
         <source>Login</source>
         <translation>Вход</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="42"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Connect to Quassel Core</source>
         <translation>Соединение с ядром Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
         <source>Edit...</source>
         <translation>Правка...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="68"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="79"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="90"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -1522,17 +2255,17 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">использовать встроенное ядро</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="117"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="128"/>
         <source>Always use this account</source>
         <translation>Всегда использовать этот аккаунт</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="146"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
         <source>Initializing your connection</source>
         <translation>Инициализирую ваше соединение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="170"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="183"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation>Соединён с apollo.mindpool.net.</translation>
     </message>
@@ -1548,67 +2281,67 @@ some
 space</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="286"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="294"/>
         <source>User:</source>
         <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="308"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="314"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="322"/>
         <source>Remember</source>
         <translation>Запомнить</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="336"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="456"/>
         <source>Configure your Quassel Core</source>
         <translation>Настройте ваше ядро Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="342"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="462"/>
         <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
         <translation>Ядро Quassel, к которому вы подключились, ещё не настроено. Сейчас вы можете запустить мастер настройки, который поможет сконфигурировать ваше ядро.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="370"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="490"/>
         <source>Launch Wizard</source>
         <translation>Запустить мастер</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="427"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="553"/>
         <source>Initializing your session...</source>
         <translation>Инициализирую ваш сеанс...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="435"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="561"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <translation>&lt;b&gt;Пожалуйста, наберитесь терпения, пока ваш клиент синхронизируется с ядром Quassel!&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="450"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="576"/>
         <source>Session state:</source>
         <translation>Состояние сессии:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="467"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="593"/>
         <source>Network states:</source>
         <translation>Состояния сетей:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="480"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="606"/>
         <source>0/0</source>
         <translation>0/0</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="114"/>
         <source>Use internal core</source>
         <translation>Использовать встроенное ядро</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="202"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="215"/>
         <source>THIS IS A PLACEHOLDER
 TO
 RESERVE
@@ -1618,6 +2351,26 @@ TO
 RESERVE
 SOME SPACE</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="272"/>
+        <source>&lt;div&gt;Errors occurred while connecting to &quot;%1&quot;:&lt;/div&gt;</source>
+        <translation>&lt;div&gt;При соединении с &quot;%1&quot; возникли ошибки:&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="356"/>
+        <source>view SSL Certificate</source>
+        <translation>просмотреть сертификат SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="393"/>
+        <source>add to known hosts</source>
+        <translation>добавить в известные адреса</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="413"/>
+        <source>Continue connection</source>
+        <translation>Продолжить соединение</translation>
+    </message>
 </context>
 <context>
     <name>CoreInfoDlg</name>
@@ -1686,30 +2439,68 @@ SOME SPACE</translation>
         <translation>Закрыть</translation>
     </message>
 </context>
+<context>
+    <name>CoreNetwork</name>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="151"/>
+        <source>Connection failed. Cycling to next Server</source>
+        <translation>Сбой соединения. Пробую следующий сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="160"/>
+        <source>Connecting to %1:%2...</source>
+        <translation>Соединяюсь с %1:%2...</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="184"/>
+        <source>Disconnecting.</source>
+        <translation type="obsolete">Отсоединяюсь.</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="304"/>
+        <source>Could not connect to %1 (%2)</source>
+        <translation>Не могу подсоединиться к %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="306"/>
+        <source>Connection failure: %1</source>
+        <translation>Сбой соединения: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Disconnecting. (%1)</source>
+        <translation>Отсоединяюсь. (%1)</translation>
+    </message>
+    <message>
+        <location filename="../src/core/corenetwork.cpp" line="208"/>
+        <source>Core Shutdown</source>
+        <translation>Ядро завершает работу</translation>
+    </message>
+</context>
 <context>
     <name>CoreSession</name>
     <message>
-        <location filename="../src/core/coresession.cpp" line="160"/>
+        <location filename="../src/core/coresession.cpp" line="139"/>
         <source>Default Identity</source>
-        <translation>Личность по умолчанию</translation>
+        <translation type="obsolete">Личность по умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="254"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>Client</source>
         <translation>Клиент</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="254"/>
+        <location filename="../src/core/coresession.cpp" line="180"/>
         <source>disconnected (UserId: %1).</source>
         <translation>отсоединён (UserId: %1).</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="419"/>
+        <location filename="../src/core/coresession.cpp" line="317"/>
         <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
         <translation>CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь создать сеть %1!</translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="434"/>
+        <location filename="../src/core/coresession.cpp" line="339"/>
         <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
         <translation>CoreSession::createNetwork(): Попытался создать уже существующую сеть, вместо этого обновляю!</translation>
     </message>
@@ -1889,7 +2680,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="133"/>
         <source>Buffer Views:</source>
-        <translation>Представления буферов:</translation>
+        <translation>Списки буферов:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="187"/>
@@ -1930,14 +2721,14 @@ SOME SPACE</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="29"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="29"/>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="13"/>
@@ -2022,27 +2813,27 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="274"/>
         <source>Backlog</source>
-        <translation>Журнал</translation>
+        <translation type="obsolete">Журнал</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="280"/>
         <source>amount of messages per buffer that are requested after the core connection has been established.</source>
-        <translation>количество сообщений из каждого буфера, которые запрашиваются у ядра после установления соединения.</translation>
+        <translation type="obsolete">количество сообщений из каждого буфера, которые запрашиваются у ядра после установления соединения.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="283"/>
         <source>Initial backlog amount:</source>
-        <translation>Начальный размер журнала:</translation>
+        <translation type="obsolete">Начальный размер журнала:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="303"/>
         <source>Number of messages to be requested from the core when using scrolling up in the buffer view.</source>
-        <translation>Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх.</translation>
+        <translation type="obsolete">Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх.</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="306"/>
         <source>Dynamic backlog amount:</source>
-        <translation>Динамический размер журнала:</translation>
+        <translation type="obsolete">Динамический размер журнала:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="64"/>
@@ -2077,7 +2868,17 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
         <source>Errors</source>
-        <translation>Ошибки</translation>
+        <translation type="obsolete">Ошибки</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="148"/>
+        <source>Errors:</source>
+        <translation>Ошибки:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.cpp" line="28"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
     </message>
 </context>
 <context>
@@ -2085,7 +2886,7 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
@@ -2162,292 +2963,679 @@ SOME SPACE</translation>
         <source>Case sensitive</source>
         <translation>Учитывать регистр</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
 </context>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="108"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="30"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
         <source>Identities</source>
         <translation>Личности</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="180"/>
+        <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;Прежде чем сохранить настройки, необходимо устранить следующие проблемы:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="181"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="171"/>
         <source>&lt;li&gt;All identities need an identity name set&lt;/li&gt;</source>
         <translation>&lt;li&gt;У всех личностей должно быть название&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="182"/>
+        <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;В каждой личности должен быть хотя бы один ник&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="183"/>
+        <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;Вам нужно указать настоящее имя для каждой личности&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="184"/>
+        <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;Вам нужно указать идент для каждой личности&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="185"/>
+        <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="186"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="176"/>
         <source>One or more identities are invalid</source>
         <translation>Одна или несколько личностей некорректны</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="347"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="306"/>
         <source>Delete Identity?</source>
         <translation>Удалить личность?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="348"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="307"/>
         <source>Do you really want to delete identity &quot;%1&quot;?</source>
         <translation>Вы действительно хотите удалить личность &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="31"/>
         <source>Rename Identity</source>
         <translation>Переименовать личность</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="360"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="319"/>
         <source>Please enter a new name for the identity &quot;%1&quot;!</source>
         <translation>Пожалуйста введите новое название личности &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="262"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="77"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="51"/>
         <source>Add Identity</source>
         <translation>Добавить личность</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="54"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="74"/>
         <source>Remove Identity</source>
         <translation>Удалить личность</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="116"/>
+        <source>Real Name:</source>
+        <translation type="obsolete">Настоящее имя:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
+        <source>The &quot;Real Name&quot; is shown in /whois.</source>
+        <translation type="obsolete">&quot;Настоящее имя&quot; отображается в /whois.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="132"/>
+        <source>Nicknames</source>
+        <translation type="obsolete">Ники</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="168"/>
+        <source>Add Nickname</source>
+        <translation type="obsolete">Добавить ник</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="171"/>
+        <source>&amp;Add...</source>
+        <translation type="obsolete">Доб&amp;авить...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="194"/>
+        <source>Remove Nickname</source>
+        <translation type="obsolete">Удалить ник</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="197"/>
+        <source>Remove</source>
+        <translation type="obsolete">Удалить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="217"/>
+        <source>Re&amp;name...</source>
+        <translation type="obsolete">Пере&amp;именовать...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="243"/>
+        <source>Move upwards in list</source>
+        <translation type="obsolete">Передвинуть вверх в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="257"/>
+        <source>Move downwards in list</source>
+        <translation type="obsolete">Передвинуть вниз в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="313"/>
+        <source>A&amp;way</source>
+        <translation type="obsolete">&amp;Отсутствую</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="319"/>
+        <source>Default Away Settings</source>
+        <translation type="obsolete">Настройки состояния &quot;Отсутствую&quot; по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="360"/>
+        <source>Nick to be used when being away</source>
+        <translation type="obsolete">Ник для состояния &quot;Отсутствую&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="350"/>
+        <source>Default away reason</source>
+        <translation type="obsolete">Причина по-умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
+        <source>Away Reason</source>
+        <translation type="obsolete">Причина</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
+        <source>Away Nick</source>
+        <translation type="obsolete">Ник</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="375"/>
+        <source>Set away when all clients have detached from the core</source>
+        <translation type="obsolete">Устанавливать состояние &quot;отсутствую&quot; когда все клиенты отсоединены от ядра</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="378"/>
+        <source>Away On Detach</source>
+        <translation type="obsolete">&quot;Отсутствую&quot; при отсоединении</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
+        <source>Override default away reason for auto-away on detach</source>
+        <translation type="obsolete">Игнорировать причину по умолчанию при автоматическом состоянии &quot;отсутствую&quot; при отсоединении</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
+        <source>Not implemented yet</source>
+        <translation type="obsolete">Ещё не реализовано</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="423"/>
+        <source>Away On Idle</source>
+        <translation type="obsolete">&quot;Отсутствую&quot; при неактивности</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="437"/>
+        <source>Set away after</source>
+        <translation type="obsolete">Устанавливать &quot;отсутствую&quot; после</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="447"/>
+        <source>minutes of being idle</source>
+        <translation type="obsolete">минут неактивности</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="512"/>
+        <source>Advanced</source>
+        <translation type="obsolete">Дополнительно</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="520"/>
+        <source>Ident:</source>
+        <translation type="obsolete">Идент:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="527"/>
+        <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">&quot;Идент&quot; является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="536"/>
+        <source>Messages</source>
+        <translation type="obsolete">Сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="544"/>
+        <source>Part Reason:</source>
+        <translation type="obsolete">Причина выхода с канала:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
+        <source>Quit Reason:</source>
+        <translation type="obsolete">Причина выхода:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="567"/>
+        <source>Kick Reason:</source>
+        <translation type="obsolete">Причина изгнания:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="534"/>
+        <source>Load a Key</source>
+        <translation type="obsolete">Загрузить ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="726"/>
+        <source>No Key loaded</source>
+        <translation type="obsolete">Ключ не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="844"/>
+        <source>Load</source>
+        <translation type="obsolete">Загрузить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="566"/>
+        <source>RSA</source>
+        <translation type="obsolete">RSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="569"/>
+        <source>DSA</source>
+        <translation type="obsolete">DSA</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="572"/>
+        <source>No Key Loaded</source>
+        <translation type="obsolete">Ключ не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="613"/>
+        <source>Clear</source>
+        <translation type="obsolete">Очистить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="584"/>
+        <source>Load a Certificate</source>
+        <translation type="obsolete">Загрузить сертификат</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="818"/>
+        <source>No Certificate loaded</source>
+        <translation type="obsolete">Сертификат не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="601"/>
+        <source>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</source>
+        <translation type="obsolete">Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="630"/>
+        <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">Предупреждение: вы не используете безопасное соединение с ядром Quassel!
+В случае продолжения передача вашего ключа и сертификата будет небезопасной!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
+        <source>continue</source>
+        <translation type="obsolete">продолжить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="705"/>
+        <source>Use SSL Key</source>
+        <translation type="obsolete">Использовать ключ SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="719"/>
+        <source>Key Type:</source>
+        <translation type="obsolete">Тип ключа:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="758"/>
+        <source>Use SSL Certificate</source>
+        <translation type="obsolete">Использовать сертификат SSL</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="777"/>
+        <source>Organisation:</source>
+        <translation type="obsolete">Организация:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="811"/>
+        <source>CommonName:</source>
+        <translation type="obsolete">ОбщееИмя:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="471"/>
+        <source>Away Reason:</source>
+        <translation type="obsolete">Причина отсутствия:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="363"/>
+        <source>Away Nick:</source>
+        <translation type="obsolete">Ник при отсутствии:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="659"/>
+        <source>Continue</source>
+        <translation type="obsolete">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="31"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
+</context>
+<context>
+    <name>Identity</name>
+    <message>
+        <location filename="../src/common/identity.cpp" line="148"/>
+        <source>&lt;empty&gt;</source>
+        <translation>&lt;пусто&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="120"/>
+        <source>Quassel IRC User</source>
+        <translation>Пользователь Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="154"/>
+        <source>Gone fishing.</source>
+        <translation>Ловлю рыбу.</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="158"/>
+        <source>Not here. No, really. not here!</source>
+        <translation>Нет меня. Не, честно, нет меня!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="161"/>
+        <source>All Quassel clients vanished from the face of the earth...</source>
+        <translation>Все клиенты Quassel стёрты с лица земли...</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="164"/>
+        <source>Kindergarten is elsewhere!</source>
+        <translation>Детский сад в другом месте!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/identity.cpp" line="166"/>
+        <source>http://quassel-irc.org - Chat comfortably. Anywhere.</source>
+        <translation>http://quassel-irc.org - Разговаривать удобно. Везде.</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityEditWidget</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="398"/>
+        <source>Advanced</source>
+        <translation>Дополнительно</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="290"/>
+        <source>Load a Key</source>
+        <translation>Загрузить ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="604"/>
+        <source>No Key loaded</source>
+        <translation>Ключ не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="722"/>
+        <source>Load</source>
+        <translation>Загрузить</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="369"/>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.cpp" line="340"/>
+        <source>Load a Certificate</source>
+        <translation>Загрузить сертификат</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="696"/>
+        <source>No Certificate loaded</source>
+        <translation>Сертификат не загружен</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="29"/>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="37"/>
         <source>Real Name:</source>
         <translation>Настоящее имя:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="44"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
         <translation>&quot;Настоящее имя&quot; отображается в /whois.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="53"/>
         <source>Nicknames</source>
         <translation>Ники</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="89"/>
         <source>Add Nickname</source>
         <translation>Добавить ник</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="92"/>
         <source>&amp;Add...</source>
         <translation>Доб&amp;авить...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="115"/>
         <source>Remove Nickname</source>
         <translation>Удалить ник</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="118"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="135"/>
+        <source>Rename Identity</source>
+        <translation>Переименовать личность</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="138"/>
         <source>Re&amp;name...</source>
         <translation>Пере&amp;именовать...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="245"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="164"/>
         <source>Move upwards in list</source>
         <translation>Передвинуть вверх в списке</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="259"/>
+        <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>Передвинуть вниз в списке</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="315"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="226"/>
         <source>A&amp;way</source>
-        <translation>&amp;Отошёл</translation>
+        <translation>&amp;Отсутствую</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="232"/>
         <source>Default Away Settings</source>
-        <translation>Настройки состояния &quot;Отошёл&quot; по-умолчанию</translation>
+        <translation>Настройки состояния &quot;Отсутствую&quot; по умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="362"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="243"/>
         <source>Nick to be used when being away</source>
-        <translation>Ник для состояния &quot;Отошёл&quot;</translation>
+        <translation>Ник для состояния &quot;Отсутствую&quot;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="352"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="253"/>
         <source>Default away reason</source>
         <translation>Причина по-умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="473"/>
-        <source>Away Reason</source>
-        <translation>Причина</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="260"/>
+        <source>Away Nick:</source>
+        <translation>Ник при отсутствии:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="365"/>
-        <source>Away Nick</source>
-        <translation>Ник</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="365"/>
+        <source>Away Reason:</source>
+        <translation>Причина отсутствия:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="377"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="279"/>
         <source>Set away when all clients have detached from the core</source>
-        <translation>Устанавливать состояние &quot;отошёл&quot; когда все клиенты отсоединены от ядра</translation>
+        <translation>Устанавливать состояние &quot;отсутствую&quot;, когда все клиенты отсоединены от ядра</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="380"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="282"/>
         <source>Away On Detach</source>
-        <translation>&quot;Отошёл&quot; при отсоединении</translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="407"/>
-        <source>Override default away reason for auto-away on detach</source>
-        <translation>Игнорировать причину по-умолчанию при автоматическом состоянии &quot;отошёл&quot; при отсоединении</translation>
+        <translation>&quot;Отсутствую&quot; при отсоединении</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="422"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="314"/>
         <source>Not implemented yet</source>
         <translation>Ещё не реализовано</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="425"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="317"/>
         <source>Away On Idle</source>
-        <translation>&quot;Отошёл&quot; при неактивности</translation>
+        <translation>&quot;Отсутствую&quot; при неактивности</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="439"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="331"/>
         <source>Set away after</source>
-        <translation>Устанавливать &quot;отошёл&quot; после</translation>
+        <translation>Устанавливать &quot;отсутствую&quot; после</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="449"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="341"/>
         <source>minutes of being idle</source>
         <translation>минут неактивности</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="514"/>
-        <source>Advanced</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="522"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="406"/>
         <source>Ident:</source>
         <translation>Идент:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="529"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="413"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
         <translation>&quot;Идент&quot; является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="538"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="422"/>
         <source>Messages</source>
         <translation>Сообщения</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="546"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="430"/>
         <source>Part Reason:</source>
         <translation>Причина выхода с канала:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="559"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="443"/>
         <source>Quit Reason:</source>
         <translation>Причина выхода:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="569"/>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="453"/>
         <source>Kick Reason:</source>
         <translation>Причина изгнания:</translation>
     </message>
-</context>
-<context>
-    <name>Identity</name>
     <message>
-        <location filename="../src/common/identity.cpp" line="65"/>
-        <source>&lt;empty&gt;</source>
-        <translation>&lt;пусто&gt;</translation>
+        <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>Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="66"/>
-        <source>Quassel IRC User</source>
-        <translation>Пользователь Quassel IRC</translation>
+        <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>Предупреждение: вы не используете безопасное соединение с ядром Quassel!
+В случае продолжения передача вашего ключа и сертификата будет небезопасной!</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="72"/>
-        <source>Gone fishing.</source>
-        <translation>Ловлю рыбу.</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="545"/>
+        <source>Continue</source>
+        <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="76"/>
-        <source>Not here. No, really. not here!</source>
-        <translation>Нет меня. Не, честно, нет меня!</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="583"/>
+        <source>Use SSL Key</source>
+        <translation>Использовать ключ SSL</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="79"/>
-        <source>All Quassel clients vanished from the face of the earth...</source>
-        <translation>Все клиенты Quassel стёрты с лица земли...</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="597"/>
+        <source>Key Type:</source>
+        <translation>Тип ключа:</translation>
     </message>
     <message>
-        <location filename="../src/common/identity.cpp" line="82"/>
-        <source>Kindergarten is elsewhere!</source>
-        <translation>Детский сад в другом месте!</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="636"/>
+        <source>Use SSL Certificate</source>
+        <translation>Использовать сертификат SSL</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 - Разговаривать удобно. Везде.</translation>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="655"/>
+        <source>Organisation:</source>
+        <translation>Организация:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identityeditwidget.ui" line="689"/>
+        <source>CommonName:</source>
+        <translation>ОбщееИмя:</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="107"/>
+        <source>Setup Identity</source>
+        <translation>Настроить личность</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="112"/>
+        <source>Default Identity</source>
+        <translation>Личность по умолчанию</translation>
+    </message>
+</context>
+<context>
+    <name>InputLine</name>
+    <message numerus="yes">
+        <location filename="../src/uisupport/inputline.cpp" line="148"/>
+        <source>Do you really want to paste %1 lines?</source>
+        <translation>
+            <numerusform>Действительно вставить %1 строку?</numerusform>
+            <numerusform>Действительно вставить %1 строки?</numerusform>
+            <numerusform>Действительно вставить %1 строк?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/inputline.cpp" line="157"/>
+        <source>Paste Protection</source>
+        <translation>Защита при вставке</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>Активировать строку ввода</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>
@@ -2457,6 +3645,14 @@ SOME SPACE</translation>
         <translation>Форма</translation>
     </message>
 </context>
+<context>
+    <name>IrcConnectionWizard</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="51"/>
+        <source>Save &amp;&amp; Connect</source>
+        <translation>Сохранить и соединиться</translation>
+    </message>
+</context>
 <context>
     <name>IrcListModel</name>
     <message>
@@ -2478,152 +3674,152 @@ SOME SPACE</translation>
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="462"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="464"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
-        <translation>%1 сменил тему канала %2 на &quot;%3&quot;</translation>
+        <translation>%1 меняет тему канала %2 на &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="487"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="489"/>
         <source>Received RPL_ISUPPORT (005) without parameters!</source>
         <translation>Получено RPL_ISUPPORT (005) без параметров!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="495"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="497"/>
         <source>Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!</source>
         <translation>Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="533"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="535"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="568"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="570"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
-        <translation>[Whois] %1 отошёл: &quot;%2&quot;</translation>
+        <translation>[Whois] %1 отсутствует: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="579"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="581"/>
         <source>%1 is away: &quot;%2&quot;</source>
-        <translation>%1 отошёл: &quot;%2&quot;</translation>
+        <translation>%1 отсутствует: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="780"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="782"/>
         <source>[Whois] %1</source>
         <translation>[Whois] %1</translation>
     </message>
     <message>
-        <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 это %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="669"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="671"/>
         <source>%1 is online via %2 (%3)</source>
         <translation>%1 подключен через %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="931"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="933"/>
         <source>[Whowas] %1</source>
         <translation>[Whowas] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="699"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="701"/>
         <source>[Whowas] %1 was %2 (%3)</source>
         <translation>[Whowas] %1 был %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation>[Who] Конец списка /WHO для %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="733"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
         <source>[Whois] %1 is logged in since %2</source>
         <translation>[Whois] %1 в онлайне с %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="735"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="737"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
         <translation>[Whois] %1 неактивен %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="738"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="740"/>
         <source>[Whois] idle message: %1</source>
         <translation>[Whois] сообщение неактивности: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="770"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
         <source>[Whois] %1 is a user on channels: %2</source>
         <translation>[Whois] %1 является участником каналов: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="772"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
         <source>[Whois] %1 has voice on channels: %2</source>
         <translation>[Whois] %1 является участником с голосом на каналах: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="774"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="776"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
         <translation>[Whois] %1 является оператором каналов: %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="802"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="804"/>
         <source>Channel %1 has %2 users. Topic is: %3</source>
         <translation>На канале %1 %2 пользователей. Тема: %3</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="811"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="813"/>
         <source>End of channel list</source>
         <translation>Конец списка каналов</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="841"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="843"/>
         <source>No topic is set for %1.</source>
         <translation>Тема для канала %1 не установлена.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="856"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="858"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Тема канала %1 &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="867"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="869"/>
         <source>Topic set by %1 on %2</source>
         <translation>Тема установлена %1 %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="890"/>
+        <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="944"/>
+        <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>В списке ников вашей личности есть ник с недопустимыми символами</translation>
+        <translation type="obsolete">В списке ников вашей личности есть ник с недопустимыми символами</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="945"/>
+        <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>Из-за бага в сервере Unreal IRCd (и, возможно, в других) мы не можем определить ошибочный ник</translation>
+        <translation type="obsolete">Из-за бага в сервере Unreal IRCd (и, возможно, в других) мы не можем определить ошибочный ник</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="946"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="943"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
-        <translation>Для продолжения используйте: /nick &lt;другой ник&gt; или почистите ваш список ников</translation>
+        <translation type="obsolete">Для продолжения используйте: /nick &lt;другой ник&gt; или почистите ваш список ников</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="949"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="951"/>
         <source>Nick %1 contains illegal characters</source>
         <translation>Ник %1 содержит недопустимые символы</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="961"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="962"/>
         <source>Nick already in use: %1</source>
         <translation>Ник уже используется: %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="984"/>
+        <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>Среди ников в списке не найдено свободного и корректного. Используйте /nick &lt;другой ник&gt; для продолжения</translation>
     </message>
@@ -2631,17 +3827,17 @@ SOME SPACE</translation>
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="706"/>
+        <location filename="../src/client/networkmodel.cpp" line="780"/>
         <source>idling since %1</source>
         <translation>неактивен с %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="709"/>
+        <location filename="../src/client/networkmodel.cpp" line="783"/>
         <source>login time: %1</source>
         <translation>время входа: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="712"/>
+        <location filename="../src/client/networkmodel.cpp" line="786"/>
         <source>server: %1</source>
         <translation>сервер: %1</translation>
     </message>
@@ -2649,190 +3845,230 @@ SOME SPACE</translation>
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="169"/>
+        <location filename="../src/qtui/mainwin.cpp" line="221"/>
         <source>&amp;Connect to Core...</source>
         <translation>&amp;Подключиться к ядру...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="171"/>
+        <location filename="../src/qtui/mainwin.cpp" line="223"/>
         <source>&amp;Disconnect from Core</source>
         <translation>&amp;Отключиться от ядра</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="173"/>
+        <location filename="../src/qtui/mainwin.cpp" line="225"/>
         <source>Core &amp;Info...</source>
         <translation>&amp;Инфромация ядра...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="175"/>
+        <location filename="../src/qtui/mainwin.cpp" line="208"/>
         <source>Edit &amp;Networks...</source>
-        <translation>&amp;Редактировать сети...</translation>
+        <translation type="obsolete">&amp;Редактировать сети...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="177"/>
+        <location filename="../src/qtui/mainwin.cpp" line="229"/>
         <source>&amp;Quit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="178"/>
+        <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="181"/>
+        <location filename="../src/qtui/mainwin.cpp" line="214"/>
         <source>&amp;Manage Buffer Views...</source>
-        <translation>&amp;Управление списками буферов...</translation>
+        <translation type="obsolete">&amp;Управление списками буферов...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="183"/>
+        <location filename="../src/qtui/mainwin.cpp" line="220"/>
         <source>&amp;Lock Dock Positions</source>
-        <translation>За&amp;фиксировать позиции</translation>
+        <translation type="obsolete">За&amp;фиксировать позиции</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="187"/>
+        <location filename="../src/qtui/mainwin.cpp" line="240"/>
         <source>Show &amp;Search Bar</source>
         <translation>Показать строку &amp;поиска</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="188"/>
+        <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="189"/>
+        <location filename="../src/qtui/mainwin.cpp" line="244"/>
         <source>Show Status &amp;Bar</source>
         <translation>Показать строку &amp;статуса</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="193"/>
+        <location filename="../src/qtui/mainwin.cpp" line="248"/>
         <source>&amp;Configure Quassel...</source>
         <translation>&amp;Настройки Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="194"/>
+        <location filename="../src/qtui/mainwin.cpp" line="249"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="197"/>
+        <location filename="../src/qtui/mainwin.cpp" line="206"/>
         <source>&amp;About Quassel...</source>
-        <translation>&amp;О Quassel...</translation>
+        <translation type="obsolete">&amp;О Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="199"/>
+        <location filename="../src/qtui/mainwin.cpp" line="208"/>
         <source>About &amp;Qt...</source>
-        <translation>О &amp;Qt...</translation>
+        <translation type="obsolete">О &amp;Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="201"/>
+        <location filename="../src/qtui/mainwin.cpp" line="256"/>
         <source>Debug &amp;NetworkModel</source>
         <translation>Отладить &amp;NetworkModel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="212"/>
+        <location filename="../src/qtui/mainwin.cpp" line="267"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="217"/>
+        <location filename="../src/qtui/mainwin.cpp" line="280"/>
         <source>&amp;Networks</source>
         <translation>&amp;Сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="223"/>
+        <location filename="../src/qtui/mainwin.cpp" line="286"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="224"/>
+        <location filename="../src/qtui/mainwin.cpp" line="287"/>
         <source>&amp;Buffer Views</source>
         <translation>&amp;Буфера</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="232"/>
+        <location filename="../src/qtui/mainwin.cpp" line="301"/>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="235"/>
+        <location filename="../src/qtui/mainwin.cpp" line="308"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="239"/>
+        <location filename="../src/qtui/mainwin.cpp" line="316"/>
         <source>Debug</source>
         <translation>Отладка</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="321"/>
+        <location filename="../src/qtui/mainwin.cpp" line="410"/>
         <source>Nicks</source>
         <translation>Ники</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="330"/>
+        <location filename="../src/qtui/mainwin.cpp" line="419"/>
         <source>Show Nick List</source>
         <translation>Показать список ников</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="341"/>
+        <location filename="../src/qtui/mainwin.cpp" line="430"/>
         <source>Chat Monitor</source>
         <translation>Монитор чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="352"/>
+        <location filename="../src/qtui/mainwin.cpp" line="441"/>
         <source>Show Chat Monitor</source>
         <translation>Показать монитор чата</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="356"/>
+        <location filename="../src/qtui/mainwin.cpp" line="445"/>
         <source>Inputline</source>
         <translation>Строкаввода</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="365"/>
+        <location filename="../src/qtui/mainwin.cpp" line="454"/>
         <source>Show Input Line</source>
         <translation>Показать строку ввода</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="376"/>
+        <location filename="../src/qtui/mainwin.cpp" line="465"/>
         <source>Topic</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="388"/>
+        <location filename="../src/qtui/mainwin.cpp" line="477"/>
         <source>Show Topic Line</source>
         <translation>Показать строку темы</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="488"/>
+        <location filename="../src/qtui/mainwin.cpp" line="595"/>
         <source>Connected to core.</source>
         <translation>Соединение с ядром установлено.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="507"/>
+        <location filename="../src/qtui/mainwin.cpp" line="576"/>
         <source>Core Lag: %1 msec</source>
-        <translation>Лаг ядра: %1 мс</translation>
+        <translation type="obsolete">Лаг ядра: %1 мс</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="544"/>
+        <location filename="../src/qtui/mainwin.cpp" line="665"/>
         <source>Not connected to core.</source>
         <translation>Нет соединения с ядром.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="203"/>
+        <location filename="../src/qtui/mainwin.cpp" line="258"/>
         <source>Debug &amp;MessageModel</source>
         <translation>Отладить &amp;MessageModel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="205"/>
+        <location filename="../src/qtui/mainwin.cpp" line="260"/>
         <source>Debug &amp;Log</source>
         <translation>&amp;Журнал отладки</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="252"/>
+        <source>&amp;About Quassel</source>
+        <translation>&amp;О Quassel</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="254"/>
+        <source>About &amp;Qt</source>
+        <translation>О &amp;Qt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="227"/>
+        <source>Configure &amp;Networks...</source>
+        <translation>Настроить &amp;сети...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="233"/>
+        <source>&amp;Configure Buffer Views...</source>
+        <translation>Настроить списки &amp;буферов...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="629"/>
+        <source>Core Lag: %1</source>
+        <translation>Лаг ядра: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="236"/>
+        <source>&amp;Lock Layout</source>
+        <translation>&amp;Блокировать расположение</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="242"/>
+        <source>Show Away Log</source>
+        <translation>Показать журнал отсутствия</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="289"/>
+        <source>&amp;Toolbars</source>
+        <translation>Па&amp;нели</translation>
+    </message>
 </context>
 <context>
     <name>MessageModel</name>
     <message>
-        <location filename="../src/client/messagemodel.cpp" line="370"/>
+        <location filename="../src/client/messagemodel.cpp" line="362"/>
         <source>Requesting %1 messages from backlog for buffer %2:%3</source>
         <translation>Запрашиваю %1 сообщений из журнала для буфера %2:%3</translation>
     </message>
@@ -2847,7 +4083,60 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
         <source>Processing Messages</source>
-        <translation>Обработка сообщений</translation>
+        <translation type="obsolete">Обработка сообщений</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/msgprocessorstatuswidget.ui" line="34"/>
+        <source>Receiving Backlog</source>
+        <translation>Получаю журнал</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkAddDlg</name>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="13"/>
+        <source>Add Network</source>
+        <translation>Добавить сеть</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="21"/>
+        <source>Use preset:</source>
+        <translation>Выбрать известную сеть:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="56"/>
+        <source>Manually specify network settings</source>
+        <translation>Вручную указать параметры сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="66"/>
+        <source>Manual Settings</source>
+        <translation>Ручные настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="74"/>
+        <source>Network name:</source>
+        <translation>Название сети:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="84"/>
+        <source>Server address:</source>
+        <translation>Адрес сервера:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="94"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="114"/>
+        <source>Server password:</source>
+        <translation>Пароль сервера:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkadddlg.ui" line="130"/>
+        <source>Use secure connection</source>
+        <translation>Использовать безопасное соединение</translation>
     </message>
 </context>
 <context>
@@ -2855,27 +4144,27 @@ SOME SPACE</translation>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="194"/>
         <source>Connection failed. Cycling to next Server</source>
-        <translation>Сбой соединения. Пробую следующий сервер</translation>
+        <translation type="obsolete">Сбой соединения. Пробую следующий сервер</translation>
     </message>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="204"/>
         <source>Connecting to %1:%2...</source>
-        <translation>Соединяюсь с %1:%2...</translation>
+        <translation type="obsolete">Соединяюсь с %1:%2...</translation>
     </message>
     <message>
         <location filename="../src/core/networkconnection.cpp" line="260"/>
         <source>Disconnecting.</source>
-        <translation>Отсоединяюсь.</translation>
+        <translation type="obsolete">Отсоединяюсь.</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="281"/>
+        <location filename="../src/core/networkconnection.cpp" line="286"/>
         <source>Could not connect to %1 (%2)</source>
-        <translation>Не могу подсоединиться к %1 (%2)</translation>
+        <translation type="obsolete">Не могу подсоединиться к %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="283"/>
+        <location filename="../src/core/networkconnection.cpp" line="288"/>
         <source>Connection failure: %1</source>
-        <translation>Сбой соединения: %1</translation>
+        <translation type="obsolete">Сбой соединения: %1</translation>
     </message>
 </context>
 <context>
@@ -2891,7 +4180,7 @@ SOME SPACE</translation>
         <translation>Пожалуйста введите название сети:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="647"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="699"/>
         <source>Add Network</source>
         <translation>Добавить сеть</translation>
     </message>
@@ -2899,17 +4188,17 @@ SOME SPACE</translation>
 <context>
     <name>NetworkItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="167"/>
+        <location filename="../src/client/networkmodel.cpp" line="178"/>
         <source>Server: %1</source>
         <translation>Сервер: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="168"/>
+        <location filename="../src/client/networkmodel.cpp" line="179"/>
         <source>Users: %1</source>
         <translation>Пользователи: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="171"/>
+        <location filename="../src/client/networkmodel.cpp" line="182"/>
         <source>Lag: %1 msecs</source>
         <translation>Лаг: %1 мс</translation>
     </message>
@@ -2917,75 +4206,365 @@ SOME SPACE</translation>
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="737"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Buffer</source>
         <translation>Буфер</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="737"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Topic</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="737"/>
+        <location filename="../src/client/networkmodel.cpp" line="811"/>
         <source>Nick Count</source>
         <translation>Ников</translation>
     </message>
 </context>
+<context>
+    <name>NetworkModelActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="40"/>
+        <source>Connect</source>
+        <translation type="obsolete">Соединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="41"/>
+        <source>Disconnect</source>
+        <translation type="obsolete">Отсоединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="43"/>
+        <source>Join</source>
+        <translation type="obsolete">Зайти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="44"/>
+        <source>Part</source>
+        <translation type="obsolete">Выйти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
+        <source>Delete Buffer...</source>
+        <translation type="obsolete">Удалить буфер...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="46"/>
+        <source>Show Buffer</source>
+        <translation type="obsolete">Показать буфер</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="48"/>
+        <source>Joins</source>
+        <translation type="obsolete">Входы</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="49"/>
+        <source>Parts</source>
+        <translation type="obsolete">Выходы из канала</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="50"/>
+        <source>Quits</source>
+        <translation type="obsolete">Выходы из сети</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="51"/>
+        <source>Nick Changes</source>
+        <translation type="obsolete">Смены ника</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="52"/>
+        <source>Mode Changes</source>
+        <translation type="obsolete">Смены режимов</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="53"/>
+        <source>Day Changes</source>
+        <translation type="obsolete">Смены дня</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
+        <source>Apply to All Chat Views...</source>
+        <translation type="obsolete">Применить ко всем окнам чата...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="57"/>
+        <source>Join Channel...</source>
+        <translation type="obsolete">Зайти на канал...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="59"/>
+        <source>Start Query</source>
+        <translation type="obsolete">Начать диалог</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="60"/>
+        <source>Show Query</source>
+        <translation type="obsolete">Показать диалог</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="61"/>
+        <source>Whois</source>
+        <translation type="obsolete">Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="63"/>
+        <source>Version</source>
+        <translation type="obsolete">Версия</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="64"/>
+        <source>Time</source>
+        <translation type="obsolete">Время</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="65"/>
+        <source>Ping</source>
+        <translation type="obsolete">Ping</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="66"/>
+        <source>Finger</source>
+        <translation type="obsolete">Finger</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="68"/>
+        <source>Give Operator Status</source>
+        <translation type="obsolete">Дать оператора</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="69"/>
+        <source>Take Operator Status</source>
+        <translation type="obsolete">Снять оператора</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="70"/>
+        <source>Give Voice</source>
+        <translation type="obsolete">Дать голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="71"/>
+        <source>Take Voice</source>
+        <translation type="obsolete">Снять голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="72"/>
+        <source>Kick From Channel</source>
+        <translation type="obsolete">Выгнать с канала</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="73"/>
+        <source>Ban From Channel</source>
+        <translation type="obsolete">Забанить на канале</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="74"/>
+        <source>Kick &amp;&amp; Ban</source>
+        <translation type="obsolete">Выгнать и забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="76"/>
+        <source>Hide Buffer(s) Temporarily</source>
+        <translation type="obsolete">Временно спрятать буфер(а)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="77"/>
+        <source>Hide Buffer(s) Permanently</source>
+        <translation type="obsolete">Навсегда спрятать буфер(а)</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="78"/>
+        <source>Show Channel List</source>
+        <translation type="obsolete">Показать список каналов</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="79"/>
+        <source>Show Ignore List</source>
+        <translation type="obsolete">Показать список игнорируемых</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="93"/>
+        <source>Hide Events</source>
+        <translation type="obsolete">Спрятать события</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="101"/>
+        <source>CTCP</source>
+        <translation type="obsolete">CTCP</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="113"/>
+        <source>Actions</source>
+        <translation type="obsolete">Действия</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="482"/>
+        <source>Remove buffer permanently?</source>
+        <translation type="obsolete">Удалить буфер навсегда?</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="484"/>
+        <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
+        <translation type="obsolete">Удалить буфер &quot;%1&quot; навсегда? Это удалить все относящиеся к нему данные, включая историю, из базы данных ядра!</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
+        <source>Join Channel</source>
+        <translation type="obsolete">Зайти на канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="603"/>
+        <source>Input channel name:</source>
+        <translation type="obsolete">Введите название канала:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="45"/>
+        <source>Delete Buffer(s)...</source>
+        <translation type="obsolete">Удалить буфер(а)...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="54"/>
+        <source>Set as Default...</source>
+        <translation type="obsolete">Задать буфер по умолчанию...</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="55"/>
+        <source>Use Defaults...</source>
+        <translation type="obsolete">Использовать по умолчанию...</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 type="obsolete">
+            <numerusform>Удалить следующий буфер навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+        </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;Замечание:&lt;/b&gt; Это удалит все соответствующие данные, включае весь журнал, из базы данных ядра без возможности отмены.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="526"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation type="obsolete">&lt;br&gt;Нельзя удалить буфера активных каналов, сначала, пожалуйста, покиньте канал.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelactionprovider.cpp" line="528"/>
+        <source>Remove buffers permanently?</source>
+        <translation type="obsolete">Удалить буфера навсегда?</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>Удалить следующий буфер навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+            <numerusform>Удалить следующие буфера навсегда?</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="157"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; This will delete all related data, including all backlog data, from the core&apos;s database and cannot be undone.</source>
+        <translation>&lt;b&gt;Замечание:&lt;/b&gt; Это удалит все соответствующие данные, включая весь журнал, из базы данных ядра без возможности отмены.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="159"/>
+        <source>&lt;br&gt;Active channel buffers cannot be deleted, please part the channel first.</source>
+        <translation>&lt;br&gt;Нельзя удалить буфера активных каналов, сначала, пожалуйста, покиньте канал.</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="161"/>
+        <source>Remove buffers permanently?</source>
+        <translation>Удалить буфера навсегда?</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkModelController::JoinDlg</name>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="417"/>
+        <source>Join Channel</source>
+        <translation>Зайти на канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="420"/>
+        <source>Network:</source>
+        <translation>Сеть:</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/networkmodelcontroller.cpp" line="422"/>
+        <source>Channel:</source>
+        <translation>Канал:</translation>
+    </message>
+</context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="148"/>
+        <source>Setup Network Connection</source>
+        <translation>Настройка сетевого соединения</translation>
+    </message>
+</context>
 <context>
     <name>NetworksSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="36"/>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="33"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
         <source>Networks</source>
         <translation>Сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="155"/>
+        <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;Прежде чем сохранить настройки, необходимо устранить следующие проблемы:&lt;/b&gt;&lt;ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="156"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="161"/>
         <source>&lt;li&gt;All networks need at least one server defined&lt;/li&gt;</source>
         <translation>&lt;li&gt;У каждой сети должен быть хотя бы один сервер&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="157"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="162"/>
         <source>&lt;/ul&gt;</source>
         <translation>&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="158"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="163"/>
         <source>Invalid Network Settings</source>
         <translation>Некорректные настройки сети</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="195"/>
         <source>Connect</source>
-        <translation>Соединиться</translation>
+        <translation type="obsolete">Соединиться</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="198"/>
         <source>Disconnect</source>
-        <translation>Отсоединиться</translation>
+        <translation type="obsolete">Отсоединиться</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="202"/>
         <source>Apply first!</source>
-        <translation>Сначала примени!</translation>
+        <translation type="obsolete">Сначала примени!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="544"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="546"/>
         <source>Delete Network?</source>
         <translation>Удалить сеть?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="545"/>
+        <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>Действительно удалить сеть &quot;%1&quot; и все сопутствующие данные, включая журнал?</translation>
     </message>
@@ -2995,218 +4574,238 @@ SOME SPACE</translation>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="47"/>
         <source>Re&amp;name...</source>
         <translation>Пере&amp;именовать...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="217"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
         <source>&amp;Add...</source>
         <translation>Доб&amp;авить...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
         <source>De&amp;lete</source>
         <translation>У&amp;далить</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
-        <translation>Соединиться сейчас</translation>
+        <translation type="obsolete">Соединиться сейчас</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="123"/>
         <source>Network Details</source>
         <translation>Подробности сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="131"/>
         <source>Identity:</source>
         <translation>Личность:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="170"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="189"/>
         <source>Servers</source>
         <translation>Серверы</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="173"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="192"/>
         <source>Manage servers for this network</source>
         <translation>Управление серверами данной сети</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="199"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="216"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Править...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="260"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
         <source>Move upwards in list</source>
         <translation>Передвинуть вверх в списке</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="277"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="294"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="274"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="291"/>
         <source>Move downwards in list</source>
         <translation>Передвинуть вниз в списке</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="323"/>
         <source>Choose random server for connecting</source>
-        <translation>Выбирать случайный сервер для соединения</translation>
+        <translation type="obsolete">Выбирать случайный сервер для соединения</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Perform</source>
-        <translation>Автовыполнение</translation>
+        <translation type="obsolete">Автовыполнение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="334"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="339"/>
         <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
         <translation>Настройка автоматического выполнения идентификационных или любых других команд при подключении к серверу</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="340"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="345"/>
         <source>Commands to execute on connect:</source>
         <translation>При подключении выполнить команды:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="361"/>
         <source>Specify a list of IRC commands to be executed upon connect.
 Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
         <translation>Укажите список команд IRC, которые будут выполнены при подключении.
 Учтите, что Quassel автоматически входит на каналы, так что /join здесь нужен редко!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="364"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="500"/>
         <source>Auto Identify</source>
         <translation>Автоматическая идентификация</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="379"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
         <source>NickServ</source>
         <translation>NickServ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Service:</source>
         <translation>Служба:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="406"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="542"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="417"/>
         <source>Advanced</source>
-        <translation>Дополнительно</translation>
+        <translation type="obsolete">Дополнительно</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
         <source>Configure advanced settings such as message encodings and automatic reconnect</source>
         <translation>Настроить дополнительные параметры, такие как кодировки сообщений и автоматическое соединение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="429"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="578"/>
         <source>Control encodings for in- and outgoing messages</source>
         <translation>Управление кодировками для входящих и исходящих сообщений</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="432"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="566"/>
         <source>Encodings</source>
         <translation>Кодировки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="460"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="612"/>
         <source>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</source>
         <translation>Укажите кодировки, в которых будут отправляться ваши сообщения.
 UTF-8 должен быть разумным выбором для большинства сетей.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="596"/>
         <source>Send messages in:</source>
         <translation>Отправлять сообщения в:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="491"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="643"/>
         <source>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</source>
         <translation>Входящие сообщения, закодированные в Utf8, всегда будут обработаны как надо.
 Эти настройки затрагивают только сообщения не в кодировке Utf8.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="475"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="627"/>
         <source>Receive fallback:</source>
         <translation>Альтернативная входящая кодировка:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="516"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="668"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Это определяет кодировку контрольных сообщений, ников и названий серверов.
 Если только вы *действительно* не знаете что делаете, оставьте тут ISO-8859-1!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="506"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="658"/>
         <source>Server encoding:</source>
         <translation>Кодировка сервера:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="529"/>
         <source>Use default settings for encodings (recommended)</source>
-        <translation>Использовать настройки кодировок по-умолчанию (рекомендуется)</translation>
+        <translation type="obsolete">Использовать настройки кодировок по-умолчанию (рекомендуется)</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="532"/>
         <source>Use defaults</source>
-        <translation>По-умолчанию</translation>
+        <translation type="obsolete">По умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="548"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="382"/>
         <source>Control automatic reconnect to the network</source>
         <translation>Настройки автоматического соединения с сетью</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="551"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="385"/>
         <source>Automatic Reconnect</source>
         <translation>Автоматическое соединение</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="396"/>
         <source>Interval:</source>
         <translation>Интервал:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="569"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="403"/>
         <source> s</source>
         <translation>с</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="585"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="419"/>
         <source>Retries:</source>
         <translation>Попыток:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="605"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="439"/>
         <source>Unlimited</source>
         <translation>Неограничено</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="617"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="464"/>
         <source>Rejoin all channels on reconnect</source>
         <translation>Вернуться на все каналы при повторном соединении</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="336"/>
+        <source>Commands</source>
+        <translation>Команды</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="373"/>
+        <source>Connection</source>
+        <translation>Соединения</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="581"/>
+        <source>Use Custom Encodings</source>
+        <translation>Использовать свои кодировки</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="37"/>
+        <source>Misc</source>
+        <translation>Прочее</translation>
+    </message>
 </context>
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="507"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="416"/>
         <source>Add Nickname</source>
         <translation>Добавить ник</translation>
     </message>
@@ -3218,12 +4817,12 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="19"/>
         <source>Please enter a valid nickname:</source>
-        <translation>Пожалуйста введите корректный ник:</translation>
+        <translation>Пожалуйста, введите корректный ник:</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/nickeditdlg.ui" line="32"/>
         <source>A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \, |, `, ^, _ and -.</source>
-        <translation>Корректный ник может содержать только буквы латинского алфавита, цифры, и спецсимволы {, }, [, ], \, |, `, ^, _ и -.</translation>
+        <translation>Корректный ник может содержать только буквы латинского алфавита, цифры и спецсимволы {, }, [, ], \, |, `, ^, _ и -.</translation>
     </message>
 </context>
 <context>
@@ -3231,82 +4830,82 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="100"/>
         <source>WHOIS</source>
-        <translation>WHOIS</translation>
+        <translation type="obsolete">WHOIS</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="101"/>
         <source>VERSION</source>
-        <translation>VERSION</translation>
+        <translation type="obsolete">VERSION</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="102"/>
         <source>PING</source>
-        <translation>PING</translation>
+        <translation type="obsolete">PING</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="106"/>
         <source>Modes</source>
-        <translation>Режимы</translation>
+        <translation type="obsolete">Режимы</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="107"/>
         <source>Op %1</source>
-        <translation>Дать оператора %1</translation>
+        <translation type="obsolete">Дать оператора %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="108"/>
         <source>Deop %1</source>
-        <translation>Снять оператора %1</translation>
+        <translation type="obsolete">Снять оператора %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="109"/>
         <source>Voice %1</source>
-        <translation>Дать голос %1</translation>
+        <translation type="obsolete">Дать голос %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="110"/>
         <source>Devoice %1</source>
-        <translation>Снять голос %1</translation>
+        <translation type="obsolete">Снять голос %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="112"/>
         <source>Kick/Ban</source>
-        <translation>Выгнать</translation>
+        <translation type="obsolete">Выгнать</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="113"/>
         <source>Kick %1</source>
-        <translation>Выгнать %1</translation>
+        <translation type="obsolete">Выгнать %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="114"/>
         <source>Ban %1</source>
-        <translation>Забанить %1</translation>
+        <translation type="obsolete">Забанить %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="115"/>
         <source>Kickban %1</source>
-        <translation>Выгнать и забанить %1</translation>
+        <translation type="obsolete">Выгнать и забанить %1</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="116"/>
         <source>Ignore</source>
-        <translation>Игнорировать</translation>
+        <translation type="obsolete">Игнорировать</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="121"/>
         <source>Query</source>
-        <translation>Приват</translation>
+        <translation type="obsolete">Приват</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="122"/>
         <source>DCC-Chat</source>
-        <translation>DCC-чат</translation>
+        <translation type="obsolete">DCC-чат</translation>
     </message>
     <message>
         <location filename="../src/uisupport/nickview.cpp" line="124"/>
         <source>Send file</source>
-        <translation>Отправить файл</translation>
+        <translation type="obsolete">Отправить файл</translation>
     </message>
 </context>
 <context>
@@ -3314,25 +4913,76 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Behaviour</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
         <source>Notifications</source>
         <translation>Уведомления</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/notificationssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
+</context>
+<context>
+    <name>PhononNotificationBackend::ConfigWidget</name>
+    <message>
+        <location filename="../src/qtui/phononnotificationbackend.cpp" line="142"/>
+        <source>Select Audio File</source>
+        <translation>Выбрать звуковой файл</translation>
+    </message>
+</context>
+<context>
+    <name>PhononNotificationConfigWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/phononnotificationconfigwidget.ui" line="13"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/phononnotificationconfigwidget.ui" line="19"/>
+        <source>Audio Notification (via Phonon)</source>
+        <translation>Звуковое уведомление (через Phonon)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/phononnotificationconfigwidget.ui" line="28"/>
+        <source>Play File:</source>
+        <translation>Играть файл:</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/client/backlogrequester.cpp" line="54"/>
+        <location filename="../src/client/backlogrequester.cpp" line="65"/>
         <source>Requesting a total of up to %1 backlog messages for %2 buffers</source>
         <translation>Всего запрашиваю сообщений: %1 для буферов: %2</translation>
     </message>
     <message>
         <location filename="../src/qtui/chatitem.cpp" line="520"/>
         <source>Copy to Clipboard</source>
-        <translation>Скопировать в буфер обмена</translation>
+        <translation type="obsolete">Скопировать в буфер обмена</translation>
+    </message>
+    <message>
+        <location filename="../src/client/backlogrequester.cpp" line="89"/>
+        <source>Requesting up to %1 of all unread backlog messages (plus additional %2)</source>
+        <translation>Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные %2)</translation>
+    </message>
+    <message>
+        <location filename="../src/client/backlogrequester.cpp" line="107"/>
+        <source>Requesting a total of up to %1 unread backlog messages for %2 buffers</source>
+        <translation>Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="56"/>
+        <source>Welcome to Quassel IRC</source>
+        <translation>Добро пожаловать в Quassel IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ircconnectionwizard.cpp" line="59"/>
+        <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>Этот мастер поможет настроить личность по умолчанию и сетевое соединение с IRC.&lt;br&gt;Он устанавливает только базовые настройки. В любой момент можно отказаться от мастера и использовать окно настройки для более подробной конфигурации.</translation>
     </message>
 </context>
 <context>
@@ -3340,38 +4990,38 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/common/quassel.cpp" line="64"/>
         <source>Enable debug output</source>
-        <translation>Включить отладочную печать</translation>
+        <translation type="obsolete">Включить отладочную печать</translation>
     </message>
     <message>
         <location filename="../src/common/quassel.cpp" line="65"/>
         <source>Display this help and exit</source>
-        <translation>Показать эту справку и выйти</translation>
+        <translation type="obsolete">Показать эту справку и выйти</translation>
     </message>
 </context>
 <context>
     <name>Quassel::secondsToString()</name>
     <message>
-        <location filename="../src/common/util.cpp" line="211"/>
+        <location filename="../src/common/util.cpp" line="129"/>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="212"/>
+        <location filename="../src/common/util.cpp" line="130"/>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="213"/>
+        <location filename="../src/common/util.cpp" line="131"/>
         <source>h</source>
         <translation>ч</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="214"/>
+        <location filename="../src/common/util.cpp" line="132"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../src/common/util.cpp" line="215"/>
+        <location filename="../src/common/util.cpp" line="133"/>
         <source>sec</source>
         <translation>сек</translation>
     </message>
@@ -3379,22 +5029,22 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>QueryBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="332"/>
+        <location filename="../src/client/networkmodel.cpp" line="380"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation>&lt;b&gt;Приват с %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="350"/>
+        <location filename="../src/client/networkmodel.cpp" line="398"/>
         <source>idling since %1</source>
         <translation>неактивен с %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="353"/>
+        <location filename="../src/client/networkmodel.cpp" line="401"/>
         <source>login time: %1</source>
         <translation>время входа: %1</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="356"/>
+        <location filename="../src/client/networkmodel.cpp" line="404"/>
         <source>server: %1</source>
         <translation>сервер: %1</translation>
     </message>
@@ -3425,25 +5075,100 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="21"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="45"/>
         <source>Server address:</source>
         <translation>Адрес сервера:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="28"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="242"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="55"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="79"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="77"/>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="101"/>
         <source>Use SSL</source>
         <translation>Использовать SSL</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="37"/>
+        <source>Server Info</source>
+        <translation>Информация о сервере</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="134"/>
+        <source>Advanced</source>
+        <translation>Дополнительно</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="155"/>
+        <source>SSL Version:</source>
+        <translation>Версия SSL:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="162"/>
+        <source>Do not change unless you&apos;re going to connect to a server not supporting SSLv3!</source>
+        <translation>Не меняйте, если не собираетесь подключаться к серверу, не поддерживающему SSLv3!</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="166"/>
+        <source>SSLv3 (default)</source>
+        <translation>SSLv3 (по умолчанию)</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="171"/>
+        <source>SSLv2</source>
+        <translation>SSLv2</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="176"/>
+        <source>TLSv1</source>
+        <translation>TLSv1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="186"/>
+        <source>Use a Proxy</source>
+        <translation>Использовать прокси</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="203"/>
+        <source>Proxy Type:</source>
+        <translation>Тип прокси:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="211"/>
+        <source>Socks 5</source>
+        <translation>Socks 5</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="216"/>
+        <source>HTTP</source>
+        <translation>HTTP</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="228"/>
+        <source>Proxy Host:</source>
+        <translation>Хост прокси:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="235"/>
+        <source>localhost</source>
+        <translation>localhost</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="266"/>
+        <source>Proxy Username:</source>
+        <translation>Имя пользователя прокси:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="276"/>
+        <source>Proxy Password:</source>
+        <translation>Пароль прокси:</translation>
+    </message>
 </context>
 <context>
     <name>SettingsDlg</name>
@@ -3453,32 +5178,32 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="73"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
         <source>Save changes</source>
         <translation>Сохранить изменения</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="74"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="88"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation>В текущей вкладке есть несохранённые изменения. Применить их сейчас?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="149"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Reload Settings</source>
         <translation>Вернуть настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="149"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="164"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Вернуть старый настройки, отменив все изменения на этой вкладке?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="158"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Restore Defaults</source>
         <translation>Вернуть умолчания</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="158"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="173"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Вернуть параметры по-умолчанию для этой вкладки?</translation>
     </message>
@@ -3487,26 +5212,31 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <source>Configure Quassel</source>
         <translation>Настроить Quassel</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingsdlg.cpp" line="99"/>
+        <source>Configure %1</source>
+        <translation>Настроить %1</translation>
+    </message>
 </context>
 <context>
     <name>SettingsPageDlg</name>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="104"/>
         <source>Reload Settings</source>
         <translation>Вернуть настройки</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="104"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Вернуть старый настройки, отменив все изменения на этой вкладке?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="113"/>
         <source>Restore Defaults</source>
         <translation>Вернуть умолчания</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="113"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Вернуть параметры по-умолчанию для этой вкладки?</translation>
     </message>
@@ -3520,16 +5250,21 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="36"/>
+        <source>Configure %1</source>
+        <translation>Настроить %1</translation>
+    </message>
 </context>
 <context>
     <name>SignalProxy</name>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1058"/>
+        <location filename="../src/common/signalproxy.cpp" line="937"/>
         <source>Client tried to send package larger than max package size!</source>
-        <translation>Клиент пытался отправить пакет больше максимального размера!</translation>
+        <translation type="obsolete">Клиент пытался отправить пакет больше максимального размера!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1221"/>
+        <location filename="../src/common/signalproxy.cpp" line="1088"/>
         <source>Disconnecting</source>
         <translation>Отсоединяюсь</translation>
     </message>
@@ -3539,43 +5274,214 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="obsolete">локальный клиент</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1063"/>
+        <location filename="../src/common/signalproxy.cpp" line="942"/>
         <source>Client tried to send 0 byte package!</source>
-        <translation>Клиент пытался отправить пакет из 0 байт!</translation>
+        <translation type="obsolete">Клиент пытался отправить пакет из 0 байт!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1080"/>
+        <location filename="../src/common/signalproxy.cpp" line="959"/>
         <source>Client sent corrupted compressed data!</source>
-        <translation>Клиент отправил повреждённые сжатые данные!</translation>
+        <translation type="obsolete">Клиент отправил повреждённые сжатые данные!</translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="1095"/>
+        <location filename="../src/common/signalproxy.cpp" line="974"/>
         <source>Client sent corrupt data: unable to load QVariant!</source>
-        <translation>Клиент отправил повреждённые данные: не могу загрузить QVariant!</translation>
+        <translation type="obsolete">Клиент отправил повреждённые данные: не могу загрузить QVariant!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="951"/>
+        <source>Peer tried to send package larger than max package size!</source>
+        <translation>Пир попытался отправить пакет больше максимального размера!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="956"/>
+        <source>Peer tried to send 0 byte package!</source>
+        <translation>Пир попытался отправить пакет из 0 байт!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="973"/>
+        <source>Peer sent corrupted compressed data!</source>
+        <translation>Пир отправил испорченные сжатые данные!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/signalproxy.cpp" line="988"/>
+        <source>Peer sent corrupt data: unable to load QVariant!</source>
+        <translation>Пир отправил испорченные данные: не могу загрузить QVariant!</translation>
+    </message>
+</context>
+<context>
+    <name>SimpleNetworkEditor</name>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="28"/>
+        <source>Network name:</source>
+        <translation>Название сети:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="35"/>
+        <source>The name of the IRC network you are configuring</source>
+        <translation>Название настраиваемой IRC-сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="63"/>
+        <source>Servers</source>
+        <translation>Серверы</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="81"/>
+        <source>A list of IRC servers belonging to this network</source>
+        <translation>Список IRC-серверов в этой сети</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="96"/>
+        <source>Edit this server entry</source>
+        <translation>Редактировать этот сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="99"/>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Править...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="116"/>
+        <source>Add another IRC server</source>
+        <translation>Добавить другой IRC-сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="119"/>
+        <source>&amp;Add...</source>
+        <translation>Доб&amp;авить...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="136"/>
+        <source>Remove this server entry from the list</source>
+        <translation>Удалить этот сервер из списка</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="139"/>
+        <source>De&amp;lete</source>
+        <translation>У&amp;далить</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="165"/>
+        <source>Move upwards in list</source>
+        <translation>Передвинуть вверх в списке</translation>
+    </message>
+    <message>
+        <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>Передвинуть вниз в списке</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/simplenetworkeditor.ui" line="226"/>
+        <source>Join Channels Automatically</source>
+        <translation>Автоматически входить на каналы</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>Список каналов IRC, на которые клиент будет автоматически заходить при подключении к сети</translation>
     </message>
 </context>
 <context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="50"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="51"/>
         <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 -- это основанная на файлах система управления базами данных, которая не требует никаких настроек. Она подходит для маленьких и средних баз данных, для которых не нужен доступ через сеть. Используйте SQLite, если ваше ядро Quassel должно хранить данные на той же машине, на которой запущено, и если вашим ядром не будет пользоваться много народу.</translation>
     </message>
 </context>
+<context>
+    <name>SslCertDisplayDialog</name>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="568"/>
+        <source>SSL Certificate used by %1</source>
+        <translation>Сертификат SSL используется %1</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="572"/>
+        <source>Issuer Info</source>
+        <translation>Сертификат выдан</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="583"/>
+        <source>Organization:</source>
+        <translation>Организация:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="584"/>
+        <source>Locality Name:</source>
+        <translation>Название местности:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="585"/>
+        <source>Organizational Unit Name:</source>
+        <translation>Название отделения:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="586"/>
+        <source>Country Name:</source>
+        <translation>Страна:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="587"/>
+        <source>State or Province Name:</source>
+        <translation>Название штата или области:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="581"/>
+        <source>Subject Info</source>
+        <translation>Информация о субъекте</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="590"/>
+        <source>Additional Info</source>
+        <translation>Дополнительная информация</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="592"/>
+        <source>Valid From:</source>
+        <translation>Годен с:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="593"/>
+        <source>Valid To:</source>
+        <translation>Годен по:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="596"/>
+        <source>Hostname %1:</source>
+        <translation>Хост %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="600"/>
+        <source>E-Mail Address %1:</source>
+        <translation>E-Mail %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="602"/>
+        <source>Digest:</source>
+        <translation>Хеш:</translation>
+    </message>
+</context>
 <context>
     <name>StatusBufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="295"/>
+        <location filename="../src/client/networkmodel.cpp" line="300"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Буфер состояния %1&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Буфер состояния %1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="297"/>
+        <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
-        <translation>&lt;p&gt; %1 &lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt; %1 &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.h" line="143"/>
+        <location filename="../src/client/networkmodel.h" line="139"/>
         <source>Status Buffer</source>
         <translation>Буфер состояния</translation>
     </message>
@@ -3583,17 +5489,17 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SystrayNotificationBackend::ConfigWidget</name>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="123"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="106"/>
         <source>System Tray Icon</source>
         <translation>Значок в трее</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="124"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="107"/>
         <source>Animate</source>
         <translation>Анимировать</translation>
     </message>
     <message>
-        <location filename="../src/qtui/systraynotificationbackend.cpp" line="126"/>
+        <location filename="../src/qtui/systraynotificationbackend.cpp" line="109"/>
         <source>Show bubble</source>
         <translation>Показывать всплывающее уведомление</translation>
     </message>
@@ -3621,6 +5527,149 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>с</translation>
     </message>
 </context>
+<context>
+    <name>ToolBarActionProvider</name>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect</source>
+        <translation>Соединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="31"/>
+        <source>Connect to IRC</source>
+        <translation>Соединиться с IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect</source>
+        <translation>Отсоединиться</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="32"/>
+        <source>Disconnect from IRC</source>
+        <translation>Отсоединиться от IRC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Part</source>
+        <translation>Выйти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="34"/>
+        <source>Leave currently selected channel</source>
+        <translation>Покинуть выделенный канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join</source>
+        <translation>Зайти</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="35"/>
+        <source>Join a channel</source>
+        <translation>Зайти на канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Query</source>
+        <translation>Приват</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="37"/>
+        <source>Start a private conversation</source>
+        <translation>Начать личную беседу</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Whois</source>
+        <translation>Whois</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="38"/>
+        <source>Request user information</source>
+        <translation>Запросить информацию о пользователе</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Op</source>
+        <translation>Оп</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="40"/>
+        <source>Give operator privileges to user</source>
+        <translation>Дать пользователю статус оператора</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Deop</source>
+        <translation>Снять оп</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="41"/>
+        <source>Take operator privileges from user</source>
+        <translation>Снять статус оператора с пользователя</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Voice</source>
+        <translation>Голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="42"/>
+        <source>Give voice to user</source>
+        <translation>Дать пользователю статус &quot;с голосом&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Devoice</source>
+        <translation>Снять голос</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="43"/>
+        <source>Take voice from user</source>
+        <translation>Снять статус &quot;с голосом&quot; с пользователя</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Kick</source>
+        <translation>Выгнать</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="44"/>
+        <source>Remove user from channel</source>
+        <translation>Удалить пользователя с канала</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban</source>
+        <translation>Забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="45"/>
+        <source>Ban user from channel</source>
+        <translation>Запретить пользователю вход на канал</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Kick/Ban</source>
+        <translation>Выгнать и забанить</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="46"/>
+        <source>Remove and ban user from channel</source>
+        <translation>Удалить пользователя с канала и запретить ему вход</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="54"/>
+        <source>Connect to all</source>
+        <translation>Подключиться ко всем</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/toolbaractionprovider.cpp" line="61"/>
+        <source>Disconnect from all</source>
+        <translation>Отключиться от всех</translation>
+    </message>
+</context>
 <context>
     <name>TopicLabel</name>
     <message>
@@ -3640,122 +5689,122 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>UiStyle::StyledMessage</name>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="328"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="339"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="330"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="341"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="332"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="343"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="334"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="345"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="336"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
-        <translation>%Dj%DN%1%DN %DH(%2@%3)%DH вошёл на канал %DC%4%DC</translation>
+        <translation>%Dj%DN%1%DN %DH(%2@%3)%DH заходит на канал %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="347"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="338"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
-        <translation>%Dp%DN%1%DN %DH(%2@%3)%DH покинул %DC%4%DC</translation>
+        <translation>%Dp%DN%1%DN %DH(%2@%3)%DH покидает %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="351"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="342"/>
         <source>%Dq%DN%1%DN %DH(%2@%3)%DH has quit</source>
-        <translation>%Dq%DN%1%DN %DH(%2@%3)%DH вышел из сети</translation>
+        <translation>%Dq%DN%1%DN %DH(%2@%3)%DH выходит из сети</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="348"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
-        <translation>%Dk%DN%1%DN выгнал %DN%2%DN с %DC%3%DC</translation>
+        <translation>%Dk%DN%1%DN выгоняет %DN%2%DN с %DC%3%DC</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="363"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="353"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrВы теперь известны как %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="354"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
-        <translation>%Dr%DN%1%DN теперь известен как %DN%2%DN</translation>
+        <translation>%Dr%DN%1%DN меняет имя на %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="367"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="357"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmПользовательский режим: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="368"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="358"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation>%DmРежим %DM%1%DM установлен %DN%2%DN</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="371"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="361"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="375"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="364"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="401"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="386"/>
         <source>&lt;%1&gt;</source>
         <translation>&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="403"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="388"/>
         <source>[%1]</source>
         <translation>[%1]</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="407"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="392"/>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="409"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="394"/>
         <source>--&gt;</source>
         <translation>--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="413"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="398"/>
         <source>&lt;--</source>
         <translation>&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="415"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="400"/>
         <source>&lt;-*</source>
         <translation>&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="417"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="402"/>
         <source>&lt;-&gt;</source>
         <translation>&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="419"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="404"/>
         <source>***</source>
         <translation>***</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="421"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="406"/>
         <source>-*-</source>
         <translation>-*-</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/uistyle.cpp" line="423"/>
+        <location filename="../src/uisupport/uistyle.cpp" line="408"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
@@ -3763,7 +5812,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="588"/>
+        <location filename="../src/client/networkmodel.cpp" line="656"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n владелец</numerusform>
@@ -3772,7 +5821,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="589"/>
+        <location filename="../src/client/networkmodel.cpp" line="657"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n администратор</numerusform>
@@ -3781,7 +5830,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="590"/>
+        <location filename="../src/client/networkmodel.cpp" line="658"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n оператор</numerusform>
@@ -3790,7 +5839,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="591"/>
+        <location filename="../src/client/networkmodel.cpp" line="659"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n полуоператор</numerusform>
@@ -3799,7 +5848,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="592"/>
+        <location filename="../src/client/networkmodel.cpp" line="660"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n с голосом</numerusform>
@@ -3808,7 +5857,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="593"/>
+        <location filename="../src/client/networkmodel.cpp" line="661"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n пользователь</numerusform>
@@ -3820,9 +5869,14 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="131"/>
+        <location filename="../src/core/userinputhandler.cpp" line="138"/>
         <source>sending CTCP-%1 request</source>
         <translation>отправляю запрос CTCP-%1</translation>
     </message>
+    <message>
+        <location filename="../src/core/userinputhandler.cpp" line="69"/>
+        <source>away</source>
+        <translation>отсутствует</translation>
+    </message>
 </context>
 </TS>