X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fru.po;h=5fea4a88dc78e22b7f8db5f1acc6c3970a4d1b74;hp=300ed7f09375ba44d0314b67ee05711ac1d9430d;hb=93fc651b26d985501697df16aeeef00589ea3b90;hpb=d1592fdad29ac39ccdb54cab0472e8ff5de32590

diff --git a/po/ru.po b/po/ru.po
index 300ed7f0..5fea4a88 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,31 +3,264 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"X-Language: ru\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-15 22:38+0000\n"
+"PO-Revision-Date: 2011-06-28 23:09+0000\n"
+"Last-Translator: Maxim Prokopyev <jazzelastic@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:50+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+"Language: ru\n"
+"X-Language: ru\n"
 
 #. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:32
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+#: ../src/qtui/aboutdlg.cpp:46
+msgid ""
+"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2010 by the "
+"Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a "
+"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
+"licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> "
+"and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most "
+"icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen "
+"Team</a> and used under the <a "
+"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
+"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
+"report bugs."
 msgstr ""
-"<b>Версия:</b> %1<br><b>Версия протокола:</b> %2<br><b>Дата сборки:</b> %3"
+"<b>Современный, распределённый клиент IRC</b><br><br>&copy;2005-2009 Quassel "
+"Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> в "
+"сети <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC "
+"распространяется по двойной лицензии <a "
+"href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> и <a "
+"href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Большинство "
+"значков лицензированы у   <a href=\"http://www.oxygen-icons.org\">Oxygen "
+"Team</a> &copy; и используются по лицензии <a "
+"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Об ошибках "
+"пожалуйста сообщайте на  <a href=\"http://bugs.quassel-"
+"irc.org\">http://bugs.quassel-irc.org</a>."
 
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:62
-msgid "Quassel IRC is mainly developed by:"
-msgstr "Quassel IRC разрабатывается в основном:"
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+msgid "<Untranslated>"
+msgstr "<Untranslated>"
 
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:77
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+msgid "Please choose a stylesheet file"
+msgstr "Выберите пожалуйста файл стилей"
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:93
+msgid "Globally unread messages"
+msgstr "Общее количество непрочитанных сообщений"
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Backlog Fetching"
+msgstr "Просмотр Журнала"
+
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
+msgid "Please enter a name for the chat list:"
+msgstr "Пожалуйста, введите имя чатлиста:"
+
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
+msgid "Add Chat List"
+msgstr "Добавить Чатлист"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
+msgid "Show channels"
+msgstr "Показывать каналы"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
+msgid "Show queries"
+msgstr "Показывать приваты"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
+msgid "Add new chats automatically"
+msgstr "Добавлять новые чаты автоматически"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgid "Custom Chat Lists"
+msgstr "Пользовательские Чатлисты"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+msgid "Delete Chat List?"
+msgstr "Удалить Чатлист?"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
+msgid "Timestamp format:"
+msgstr "Формат датировки:"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+msgid "[hh:mm:ss]"
+msgstr "[hh:mm:ss]"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
+msgid "Custom chat window font:"
+msgstr "Пользовательский шрифт окна чата:"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
+msgid "Allow colored text (mIRC color codes)"
+msgstr "Разрешить вывод цветного текста (mIRC color codes)"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
+msgid "Background:"
+msgstr "Фон"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgid "Chat View"
+msgstr "Вид Окна Чата"
+
+#. ts-context ClientBufferViewManager
+#: ../src/client/clientbufferviewmanager.cpp:52
+msgid "All Chats"
+msgstr "Все Чаты"
+
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:37
+msgid "Ping interval:"
+msgstr "Интервал пинга:"
+
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:80
+msgid "Disconnect after"
+msgstr "Отсоединиться после"
+
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:206
+msgid "Minimum delay between requests:"
+msgstr "Минимальное время задержки между запросами:"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
+msgid "Delete Chat(s)..."
+msgstr "Удалить Чат(ы)..."
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
+msgid "Go to Chat"
+msgstr "Войти в Чат"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
+msgid "Hide Chat(s) Temporarily"
+msgstr "Скрыть чат(ы), временно"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
+msgid "Hide Chat(s) Permanently"
+msgstr "Скрыть чат(ы), Постоянно"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:131
+msgid "Add Ignore Rule"
+msgstr "Добавить правило игнорирования"
+
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+msgid "Authentication Required"
+msgstr "Требуется проверка подлинности"
+
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+msgid "Please enter your account data:"
+msgstr "Пожалуйста, введите данные Вашей учётной записи:"
+
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/coreconnectdlg.cpp:75
+msgid "Please enter your credentials for %1:"
+msgstr "Пожалуйста, введите учетные данные для %1:"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:168
+msgid "Network is down"
+msgstr "Сеть недоступна"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
+msgid "Network Status Detection"
+msgstr "Определение состояния сети"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
+msgid "Minimum activity:"
+msgstr "Минимальная активность:"
+
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:64
+msgid "Could not find script \"%1\""
+msgstr "Невозможно найти скрипт \"%1\""
+
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:170
 msgid ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
+"<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
-"Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в "
-"алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:"
+"<br>Нельзя удалить буферы активных каналов. Пожалуйста, сначала покиньте "
+"канал."
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:697
+msgid "%n Owner(s)"
+msgid_plural "%n Owner(s)"
+msgstr[0] "%n Владелец(ы)"
+msgstr[1] "%n Владелец(ы)"
+msgstr[2] "%n Владелец(ы)"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:698
+msgid "%n Admin(s)"
+msgid_plural "%n Admin(s)"
+msgstr[0] "%n Админ(ов)"
+msgstr[1] "%n Админ(ов)"
+msgstr[2] "%n Админ(ов)"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:699
+msgid "%n Operator(s)"
+msgid_plural "%n Operator(s)"
+msgstr[0] "%n Оператор(ов)"
+msgstr[1] "%n Оператор(ов)"
+msgstr[2] "%n Оператор(ов)"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:700
+msgid "%n Half-Op(s)"
+msgid_plural "%n Half-Op(s)"
+msgstr[0] "%n Half-Оп(ов)"
+msgstr[1] "%n Half-Оп(ов)"
+msgstr[2] "%n Half-Оп(ов)"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:701
+msgid "%n Voiced"
+msgid_plural "%n Voiced"
+msgstr[0] "%n Голос(ов)"
+msgstr[1] "%n Голос(ов)"
+msgstr[2] "%n Голос(ов)"
 
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:17
@@ -37,27 +270,27 @@ msgstr "О Quassel"
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:59
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; "
 "font-weight:600; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></"
-"html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel "
+"IRC</p></body></html>"
 msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-"
-"family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;"
-"\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></"
-"html>"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body "
+"style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-"
+"style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-"
+"left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel "
+"IRC</p></body></html>"
 
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:75
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:600; font-style:normal;\">\n"
@@ -65,12 +298,12 @@ msgid ""
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Build "
 "&gt;= 474 (2008-02-08)</p></body></html>"
 msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-"
-"family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;"
-"\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Build "
-"&gt;= 474 (2008-02-08)</p></body></html>"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body "
+"style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-"
+"style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-"
+"left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Version "
+"0.2.0-pre, Build &gt;= 474 (2008-02-08)</p></body></html>"
 
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:115
@@ -93,64 +326,61 @@ msgid "&Thanks To"
 msgstr "&Благодарности"
 
 #. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:46
+#: ../src/qtui/aboutdlg.cpp:32
+msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgstr ""
+"<b>Версия:</b> %1<br><b>Версия протокола:</b> %2<br><b>Дата сборки:</b> %3"
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:62
+msgid "Quassel IRC is mainly developed by:"
+msgstr "Quassel IRC разрабатывается в основном:"
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:77
 msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2009 by the "
-"Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-irc."
-"org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a "
-"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
-"licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> "
-"and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most "
-"icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen Team</"
-"a> and used under the <a href=\"http://www.gnu.org/licenses/lgpl.html"
-"\">LGPL</a>.<br><br>Please use <a href=\"http://bugs.quassel-irc.org"
-"\">http://bugs.quassel-irc.org</a> to report bugs."
+"We would like to thank the following contributors (in alphabetical order) "
+"and everybody we forgot to mention here:"
 msgstr ""
-"<b>Современный, распределённый клиент IRC</b><br><br>&copy;2005-2009 Quassel "
-"Project<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</"
-"a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> в сети <a href="
-"\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC распространяется "
-"по двойной лицензии <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt"
-"\">GPLv2</a> и <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>."
-"<br>Большинство значков &copy;  <a href=\"http://www.oxygen-icons.org"
-"\">Команда Oxygen</a> и используются по лицензии <a href=\"http://www.gnu."
-"org/licenses/lgpl.html\">LGPL</a>.<br><br>Об ошибках пожалуйста сообщайте "
-"на  <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a>."
+"Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в "
+"алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:"
 
 #. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:116
+#: ../src/qtui/aboutdlg.cpp:135
 msgid ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;"
-"<b>John \"nox\" Hand</b></dt><dd>for the original Quassel icon - The All-"
-"Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://"
-"www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for creating all the "
-"artwork you see throughout Quassel</dd><dt><img src=\":/pics/qt-logo-32.png"
-"\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software formerly known "
-"as Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more</dd><dt><a href="
-"\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>for "
-"keeping Qt alive, and for sponsoring development of Quassel Mobile with "
-"N810s</dd>"
-msgstr ""
-"Особая благодарность:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;"
-"<b>John \"nox\" Hand</b></dt><dd>за оригинальный значок Quassel - Всевидящее "
-"Око</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www."
-"oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>за всю графическую работу "
-"для Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href="
-"\"http://www.trolltech.com\">Qt Software, ранее известная как Trolltech</a></"
-"b></dt><dd>за создание Qt и Qtopia, и за поддержку развития QuasselTopia с "
-"помощью Greenphones и прочего</dd><dt><a href=\"http://www.nokia.com\"><img "
+"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
+"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
+"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a "
+"href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
+"creating all the artwork you see throughout Quassel</dd><dt><img "
+"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
+"href=\"http://www.trolltech.com\">Qt Software formerly known as "
+"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
+"development of QuasselTopia with Greenphones and more</dd><dt><a "
+"href=\"http://www.nokia.com\"><img "
+"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
+"sponsoring development of Quassel Mobile with N810s</dd>"
+msgstr ""
+"Особая благодарность:<br><dl><dt><img src=\":/pics/quassel-"
+"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>за оригинальный значок "
+"Quassel - Всевидящее Око</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a "
+"href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>за всю "
+"графическую работу для Quassel</dd><dt><img src=\":/pics/qt-logo-"
+"32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software, ранее "
+"известная как Trolltech</a></b></dt><dd>за создание Qt и Qtopia, и за "
+"поддержку развития QuasselTopia с помощью Greenphones и прочего</dd><dt><a "
+"href=\"http://www.nokia.com\"><img "
 "src=\":/pics/nokia.png\"></a></b></dt><dd>за поддержку жизни Qt, и за "
 "спонсорство разработки Quassel Mobile с помощью N810</dd>"
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid ""
 "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Используемая схема (версии %1) устарела. Обновляю до версии %2..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Обновление не удалось..."
 
@@ -160,22 +390,35 @@ msgid ""
 "<b>The shortcut for the alias</b><br />It can be used as a regular slash "
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr ""
+"<b>Ссылка к псевдониму</b><br />Она может использоваться как обыкновенный "
+"слэш.<br /><br /><b>Пример:</b> \"foo\"  может использоваться для /foo"
 
 #. ts-context AliasesModel
 #: ../src/qtui/settingspages/aliasesmodel.cpp:59
 msgid ""
-"<b>The string the shortcut will be expanded to</b><br /><b>special variables:"
-"</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - <b>$i..j</b> "
-"represents the i'th to j'th parameter separated by spaces.<br /> - <b>$i..</"
-"b> represents all parameters from i on separated by spaces.<br /> - <b>$i:"
-"hostname</b> represents the hostname of the user identified by the i'th "
-"parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br /> - <b>"
-"$nick</b> your current nickname<br /> - <b>$channel</b> the name of the "
-"selected channel<br /><br />Multiple commands can be separated with "
+"<b>The string the shortcut will be expanded to</b><br /><b>special "
+"variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - "
+"<b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br "
+"/> - <b>$i..</b> represents all parameters from i on separated by spaces.<br "
+"/> - <b>$i:hostname</b> represents the hostname of the user identified by "
+"the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br "
+"/> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of "
+"the selected channel<br /><br />Multiple commands can be separated with "
 "semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will "
 "be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All "
 "1 2 3\" when called like /test 1 2 3"
 msgstr ""
+"<b>Строка в будет расширена за счет </b><br /><b>специальных переменных: "
+"</b><br /> - <b>$i</b> представляет i-тый парамер.<br /> - <b>$i..j</b> "
+"представляет с i-того по j-тый параметры, разделенные пробелами.<br /> - "
+"<b>$i..</b> представляет все параметры начиная с i-того, разделенные "
+"пробелами.<br /> - <b>$i:hostname</b>представляет имя системы (hostname) "
+"пользователя, определяемое по i-тому параметру или * если он неизвестен. <br "
+"/> - <b>$0</b> вся строка.<br /> - <b>$nick</b> Ваш текущий ник<br /> - "
+"<b>$channel</b> имя выбранного канала<br /><br />Несколько команд могут быть "
+"разделены точкой с запятой <br /><br /><b>Пример:</b> \"Test $1; Test $2; "
+"Test All $0\"  будет расширена до трех отдельных сообщений \"Test 1\", "
+"\"Test 2\" и \"Test All 1 2 3\" когда вызывается как /test 1 2 3"
 
 #. ts-context AliasesModel
 #: ../src/qtui/settingspages/aliasesmodel.cpp:170
@@ -187,142 +430,366 @@ msgstr "Псевдоним"
 msgid "Expansion"
 msgstr "Расширение"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context AliasesSettingsPage
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-msgid "Aliases"
-msgstr "Псевдонимы"
-
-#. ts-context AliasesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AppearanceSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BacklogSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatViewSearchBar
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardAdminUserPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardIntroPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardStorageSelectionPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardSyncPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionStatusWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IndicatorNotificationConfigWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context InputWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context InputWidgetSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MsgProcessorStatusWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context PhononNotificationConfigWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:13
+#: ../src/qtui/settingspages/appearancesettingspage.ui:14
+#: ../src/qtui/settingspages/backlogsettingspage.ui:14
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
+#: ../src/qtui/ui/chatviewsearchbar.ui:13
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:14
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:14
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+#: ../src/qtui/settingspages/highlightsettingspage.ui:13
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
+#: ../src/qtui/ui/inputwidget.ui:26
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:14
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+#: ../src/qtui/settingspages/networkssettingspage.ui:14
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
+#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
 msgstr "Форма"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context AliasesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:27
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
 msgid "New"
 msgstr "Новый"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context AliasesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:41
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42
 msgid "Delete"
 msgstr "Удалить"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context AliasesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-msgid "Misc"
-msgstr "Прочее"
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:34
-msgid "Interface"
-msgstr ""
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:53
-#: ../src/qtui/settingspages/appearancesettingspage.ui:46
-msgid "<System Default>"
-msgstr "<По умолчанию>"
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:151
-msgid "Please choose a stylesheet file"
-msgstr ""
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgid "IRC"
+msgstr "IRC"
 
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:51
-msgid "<Original>"
-msgstr "<Без изменений>"
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgid "Aliases"
+msgstr "Псевдонимы"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:20
-msgid "Client Style"
-msgstr "Стиль клиента"
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
+msgid "Client style:"
+msgstr "Стиль клиента:"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:26
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
 msgstr "Задаёт стиль приложения"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgid "Language"
-msgstr "Язык"
+msgid "Language:"
+msgstr "Язык:"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:42
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
 msgstr "Задаёт язык приложения. Требует перезапуска!"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:62
-msgid "Use Custom Stylesheet"
-msgstr ""
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+msgid "<System Default>"
+msgstr "<По умолчанию>"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+msgid "Use custom stylesheet"
+msgstr "Использовать свою таблицу стилей"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:82
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
 msgid "Path:"
-msgstr ""
+msgstr "Путь:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AppearanceSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ChatViewSearchBar
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/qtui/settingspages/appearancesettingspage.ui:141
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+#: ../src/qtui/settingspages/identityeditwidget.ui:168
+#: ../src/qtui/settingspages/identityeditwidget.ui:182
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:125
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:149
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:173
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:197
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:221
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:308
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:345
+#: ../src/qtui/settingspages/networkssettingspage.ui:149
+#: ../src/qtui/settingspages/networkssettingspage.ui:281
+#: ../src/qtui/settingspages/networkssettingspage.ui:295
+#: ../src/qtui/ui/simplenetworkeditor.ui:168
+#: ../src/qtui/ui/simplenetworkeditor.ui:182 ../src/qtui/ui/topicwidget.ui:79
 msgid "..."
 msgstr "..."
 
-#. ts-context AwayLogView
-#: ../src/qtui/awaylogview.cpp:33
-msgid "Away Log"
-msgstr "Журнал отсутствия"
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+msgid "Show system tray icon"
+msgstr "Показывать значок в трее"
 
-#. ts-context AwayLogView
-#: ../src/qtui/awaylogview.cpp:44
-msgid "Show Network Name"
-msgstr "Показывать название сети"
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+msgid "Hide to tray on close button"
+msgstr "При закрытии сворачивать в системный лоток"
 
-#. ts-context AwayLogView
-#: ../src/qtui/awaylogview.cpp:49
-msgid "Show Buffer Name"
-msgstr "Показывать название буфера"
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+msgid "Enable animations"
+msgstr "Включить анимацию"
 
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-msgid "Backlog"
-msgstr "Журнал"
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+msgid "Message Redirection"
+msgstr "Перенаправление сообщений"
 
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+msgid "User Notices:"
+msgstr "Пользовательские сообщения:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+msgid "Server Notices:"
+msgstr "Серверные сообщения:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+msgid "Default Target"
+msgstr "Цель по умолчанию"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+msgid "Status Window"
+msgstr "Окно статуса"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+msgid "Current Chat"
+msgstr "Текущий чат"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+msgid "Errors:"
+msgstr "Ошибки:"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AppearanceSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.ui:138
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context InputWidgetSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NotificationsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgid "Interface"
+msgstr "Интерфейс"
+
+#. ts-context AwayLogView
+#: ../src/qtui/awaylogview.cpp:33
+msgid "Away Log"
+msgstr "Журнал отсутствия"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AwayLogView
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorView
+#: ../src/qtui/awaylogview.cpp:44 ../src/qtui/chatmonitorview.cpp:59
+msgid "Show Network Name"
+msgstr "Показывать название сети"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AwayLogView
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorView
+#: ../src/qtui/awaylogview.cpp:49 ../src/qtui/chatmonitorview.cpp:64
+msgid "Show Buffer Name"
+msgstr "Показывать название буфера"
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:22
 msgid ""
-"amount of messages per buffer that are requested after the core connection "
-"has been established."
+"Number of messages to be requested from the core when using scrolling up in "
+"the buffer view."
 msgstr ""
-"количество сообщений из каждого буфера, которые запрашиваются у ядра после "
-"установления соединения."
+"Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх."
 
 #. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.ui:141
-msgid "Initial backlog amount:"
-msgstr "Начальный размер журнала:"
+#: ../src/qtui/settingspages/backlogsettingspage.ui:25
+msgid "Dynamic backlog amount:"
+msgstr "Динамический размер журнала:"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:75
 msgid "Backlog request method:"
-msgstr ""
+msgstr "Способ показа журнала:"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:83
 msgid "Fixed amount per chat"
-msgstr ""
+msgstr "Постоянное количество строк в чате"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:88
 msgid "Unread messages per chat"
-msgstr ""
-
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.ui:93
-msgid "Globally unread messages"
-msgstr ""
+msgstr "Непрочитанные сообщения в чате"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:123
@@ -330,6 +797,22 @@ msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
 msgstr ""
+"Самый простой запросчик. Он получает фиксированное количество строк из "
+"журнала для каждого окна чата."
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:138
+msgid ""
+"amount of messages per buffer that are requested after the core connection "
+"has been established."
+msgstr ""
+"количество сообщений из каждого буфера, которые запрашиваются у ядра после "
+"установления соединения."
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:141
+msgid "Initial backlog amount:"
+msgstr "Начальный размер журнала:"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:205
@@ -340,6 +823,11 @@ msgid ""
 "You can also choose to fetch additional older chatlines to provide a better "
 "context."
 msgstr ""
+"Этот запрос индивидуально извлекает непрочитанные сообщения для каждого окна "
+"чата. Количество полученных из журнала строк может быть ограничено.\n"
+"\n"
+"Также вы можете выбрать дополнительное количество строк, для извлечения, что-"
+"бы лучше понять тему разговора."
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:222
@@ -354,8 +842,16 @@ msgstr "Максимальное количество запрашиваемых
 msgid "Limit:"
 msgstr "Предел:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BacklogSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:439
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/settingspages/backlogsettingspage.ui:235
+#: ../src/qtui/settingspages/backlogsettingspage.ui:357
+#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/taskbarnotificationbackend.cpp:78
 msgid "Unlimited"
 msgstr "Неограничено"
 
@@ -368,8 +864,8 @@ msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
 msgstr ""
-"Количество сообщений, запрашиваемых в дополнение к непрочитанным. Предел "
-"здесь не применяется."
+"Количество сообщений, запрашиваемых в дополнение к непрочитанным. Здесь не "
+"применяется ограничение."
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
@@ -391,26 +887,23 @@ msgid ""
 "You can also chose to fetch additional older chatlines to provide a better "
 "context."
 msgstr ""
+"Эта программа запрашивает все сообщения, моложе самого старого "
+"непрочитанного сообщения для всех чатов.\n"
+"Примечание: Этот запросчик не рекомендуется использовать если вы используете "
+"скрытые окна чата или есть неактивные чаты (т. е.: нет устаревших запросов "
+"или каналов).\n"
+"Лучше всего, и вероятно - быстрее, задать ограничение максимального размера "
+"журнала.\n"
+"В дополнение ко всему, вы также можете запросить более старые разговорные "
+"каналы, чтобы лучше вникнуть в контекст."
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:344
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Максимальное количество сообщений, запрашиваемых из всех буферов."
 
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.ui:22
-msgid ""
-"Number of messages to be requested from the core when using scrolling up in "
-"the buffer view."
-msgstr "Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх."
-
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.ui:25
-msgid "Dynamic backlog amount:"
-msgstr "Динамический размер журнала:"
-
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:324
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -428,96 +921,102 @@ msgstr ""
 "Хотите ли вы слить буфер \"%1\" с буфером \"%2\"?\n"
 " Это нельзя обратить!"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
+#: ../src/qtui/settingspages/networkeditdlg.ui:13
+#: ../src/qtui/settingspages/servereditdlg.ui:14
 msgid "Dialog"
 msgstr "Диалог"
 
-#. ts-context BufferViewEditDlg
-#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
-msgid "Please enter a name for the chat list:"
-msgstr ""
-
-#. ts-context BufferViewEditDlg
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
-msgid "Add Chat List"
-msgstr ""
-
 #. ts-context BufferViewFilter
 #: ../src/uisupport/bufferviewfilter.cpp:52
 msgid "Show / Hide Chats"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
-msgid "Custom Chat Lists"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-msgid "All"
-msgstr "Все"
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
-msgid "Delete Chat List?"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
-msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr ""
+msgstr "Показать / Скрыть Чаты"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:31
+#: ../src/qtui/settingspages/identityeditwidget.ui:139
+#: ../src/qtui/settingspages/networkssettingspage.ui:48
 msgid "Re&name..."
 msgstr "Пере&именовать..."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:48
+#: ../src/qtui/settingspages/identityeditwidget.ui:93
+#: ../src/qtui/settingspages/networkssettingspage.ui:65
+#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/ui/simplenetworkeditor.ui:119
 msgid "&Add..."
 msgstr "Доб&авить..."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:71
+#: ../src/qtui/settingspages/networkssettingspage.ui:88
+#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/ui/simplenetworkeditor.ui:139
 msgid "De&lete"
 msgstr "У&далить"
 
 #. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
+msgid "Chat List Settings"
+msgstr "Настройки Чатлистов"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModelController::JoinDlg
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:92
+#: ../src/uisupport/networkmodelcontroller.cpp:487
 msgid "Network:"
 msgstr "Сеть:"
 
 #. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
-msgid "Chat List Settings"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
-msgid "Show status window"
-msgstr ""
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+msgid "All"
+msgstr "Все"
 
 #. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
-msgid "Show channels"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
+msgid ""
+"This option is not available when all Networks are visible.\n"
+"In this mode no separate status buffer is displayed."
 msgstr ""
+"Эта опция недоступна когда видны все сети.\n"
+"В этом режиме отдельные буфера состояния не отображаются."
 
 #. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
-msgid "Show queries"
-msgstr ""
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
+msgid "Show status window"
+msgstr "Показать окно статуса"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
 msgid "Hide inactive chats"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
-msgid "Add new chats automatically"
-msgstr ""
+msgstr "Скрыть неактивные чаты"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
@@ -544,8 +1043,16 @@ msgstr "Другая активность"
 msgid "New Message"
 msgstr "Новое сообщение"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
+#: ../src/qtui/settingspages/highlightsettingspage.ui:32
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
 msgid "Highlight"
 msgstr "Подсветка"
 
@@ -555,13 +1062,9 @@ msgid "Preview:"
 msgstr "Предварительный просмотр:"
 
 #. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
-msgid ""
-"This option is not available when all Networks are visible.\n"
-"In this mode no separate status buffer is displayed."
-msgstr ""
-"Эта опция недоступна когда видны все сети.\n"
-"В этом режиме отдельные буфера состояния не отображаются."
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+msgid "Do you really want to delete the chat list \"%1\"?"
+msgstr "Вы действительно хотите удалить чат \"%1\"?"
 
 #. ts-context BufferViewWidget
 #: ../src/qtui/ui/bufferviewwidget.ui:26
@@ -569,62 +1072,72 @@ msgid "BufferView"
 msgstr "СписокБуферов"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:74
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Увеличить"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:80
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Уменьшить"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:85
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
-msgstr "Исходный размер"
+msgstr "Действительный размер"
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+msgid "Set Marker Line"
+msgstr ""
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+msgid "Go to Marker Line"
+msgstr ""
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:481
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Канал %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:484
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Пользователи:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:488
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Режим:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:499
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Тема:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "Неактивно <br /> Дважды щёлкните чтобы войти"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:506
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:13
+#: ../src/qtui/ui/channellistdlg.ui:14
 msgid "Channel List"
 msgstr "Список каналов"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:37
+#: ../src/qtui/ui/channellistdlg.ui:38
 msgid "Search Pattern:"
 msgstr "Шаблон поиска:"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:47
+#: ../src/qtui/ui/channellistdlg.ui:48
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows to pass search strings to the IRC Server."
@@ -633,76 +1146,52 @@ msgstr ""
 "Расширенный режим позволяет передавать поисковые строки серверу IRC."
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:61
+#: ../src/qtui/ui/channellistdlg.ui:62
 msgid "Show Channels"
 msgstr "Показать каналы"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:85
+#: ../src/qtui/ui/channellistdlg.ui:86
 msgid "Filter:"
 msgstr "Фильтр:"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:97
+#: ../src/qtui/ui/channellistdlg.ui:98
 msgid "Errors Occured:"
 msgstr "Произошли ошибки:"
 
 #. ts-context ChannelListDlg
-#: ../src/qtui/ui/channellistdlg.ui:131
+#: ../src/qtui/ui/channellistdlg.ui:132
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; "
-"font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC "
+"ERROR!!11</span></p>\n"
 "<p style=\"-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:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /"
-"><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></"
-"head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px; font-family:'Lucida Grande'; font-size:13pt;\">СУПЕР ЗЛАЯ "
-"НЕПОПРАВИМАЯ ОШИБКА!!11адин</p><p style=\"-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:'Lucida Grande'; font-size:13pt;\"></"
-"p></body></html> {3C?} {4.0/?} {3.?} {40/?} {1\"?} {9p?} {400;?} {0p?} {0p?} "
-"{0p?} {0p?} {0;?} {0p?} {13p?} {11<?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} "
-"{13p?}"
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-msgid "Chat Monitor"
-msgstr "Монитор чата"
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
-msgid "Opt In"
-msgstr "Белый список"
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
-msgid "Opt Out"
-msgstr "Чёрный список"
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-msgid "Show:"
-msgstr "Показывать:"
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
-msgid "Ignore:"
-msgstr "Игнорировать:"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'Lucida Grande'; font-size:13pt;\">ПРОИЗОШЛА СЕРЬЕЗНАЯ "
+"ОШИБКА!</span></p>\n"
+"<p style=\"-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:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
@@ -712,10 +1201,10 @@ msgstr "Режим:"
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
 "weight:400; font-style:normal;\">\n"
@@ -732,17 +1221,18 @@ msgid ""
 "decoration: underline;\">Opt-Out:</span> Buffers on the right side will be "
 "ignored in chatmonitor</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /"
-"><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></"
-"head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta "
+"name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-"
+"space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; "
+"font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-"
+"top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-"
+"indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Режимы:</span></p><p style=\" margin-top:0px; margin-"
 "bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Режимы:</span></p><p style="
-"\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-"
-"block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-"
-"weight:400; text-decoration: underline;\">Белый список:</span> <span style="
-"\" font-weight:400;\">В мониторе чата отображаются только буферы из списка "
+"indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-"
+"decoration: underline;\">Белый список:</span> <span style=\" font-"
+"weight:400;\">В мониторе чата отображаются только буферы из списка "
 "справа.</span></p><p style=\" margin-top:0px; margin-bottom:0px; margin-"
 "left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span "
 "style=\" text-decoration: underline;\">Opt-Out:</span>Буферы из списка "
@@ -751,7 +1241,7 @@ msgstr ""
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgid "Available:"
-msgstr ""
+msgstr "Доступно:"
 
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
@@ -763,6 +1253,12 @@ msgstr "Переместить выбранные буферы влево"
 msgid "Move selected buffers to the right"
 msgstr "Переместить выбранные буферы вправо"
 
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+msgid "Show:"
+msgstr "Показывать:"
+
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
 msgid ""
@@ -779,10 +1275,34 @@ msgstr "Всегда показывать подсвеченные сообще
 msgid "Show own messages"
 msgstr "Показывать свои сообщения"
 
-#. ts-context ChatMonitorView
-#: ../src/qtui/chatmonitorview.cpp:52
-msgid "Show Own Messages"
-msgstr "Показывать свои сообщения"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/mainwin.cpp:743
+msgid "Chat Monitor"
+msgstr "Монитор чата"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+msgid "Opt In"
+msgstr "Белый список"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+msgid "Opt Out"
+msgstr "Чёрный список"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+msgid "Ignore:"
+msgstr "Игнорировать:"
+
+#. ts-context ChatMonitorView
+#: ../src/qtui/chatmonitorview.cpp:52
+msgid "Show Own Messages"
+msgstr "Показывать свои сообщения"
 
 #. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:71
@@ -790,7 +1310,7 @@ msgid "Configure..."
 msgstr "Настроить..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:604
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Скопировать выделение"
 
@@ -815,205 +1335,149 @@ msgid "ignore joins, parts, etc."
 msgstr "игнорировать входы, уходы, и т. п."
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
-msgid "Chat View"
-msgstr ""
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr "Показать цветной текст в окне чата"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
-msgid "Timestamp format:"
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+msgid ""
+"Show a website preview window when hovering the mouse over a web address"
 msgstr ""
+"Показывать предварительный просмотр вебсайта при наведении мышью на адрес"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
-msgid "[hh:mm:ss]"
-msgstr ""
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+msgid "Show previews of webpages on URL hover"
+msgstr "Показывать эскиз вебсайта при наведении на URL"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
-msgid "Custom chat window font:"
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid ""
+"Set the marker line to the bottom of the current chat window when selecting "
+"another channel"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
-msgid "Allow colored text (mIRC color codes)"
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
-msgstr ""
+msgstr "Пользовательские цвета"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
-msgstr ""
+msgstr "Действие:"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+msgid "Timestamp:"
+msgstr "Время:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
-msgstr ""
+msgstr "Сообщение канала:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
-msgstr ""
+msgstr "Сообщение команды:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
-msgstr ""
+msgstr "Сообщение сервера:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
-msgstr ""
+msgstr "Отметка:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
-msgstr ""
+msgstr "Сообщение об ошибке:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
-msgid "Background:"
-msgstr ""
-
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
-msgstr ""
+msgstr "Использовать Цветовую Палитру Отправителя"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
+msgstr "Собственные сообщения:"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
 msgstr ""
+"Для использования этой функции вам нужно иметь quasselcore версии 0.6"
 
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
 msgstr "Личность уже есть в клиенте!"
 
-#. ts-context Client
-#: ../src/client/client.cpp:369
-msgid "All Chats"
-msgstr ""
-
 #. ts-context ClientBacklogManager
-#: ../src/client/clientbacklogmanager.cpp:153
+#: ../src/client/clientbacklogmanager.cpp:161
 msgid "Processed %1 messages in %2 seconds."
 msgstr "Обработано сообщений: %1. Затрачено секунд: %2."
 
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:52
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
-msgstr ""
-"Вы пытаетесь подключиться к слишком старому ядру Quassel! Пожалуйста "
-"обновите."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:77
-msgid "<b>Invalid data received from core!</b><br>Disconnecting."
-msgstr "<b>От ядра получены некорректные данные!</b><br>Отсоединяюсь."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:111
-msgid ""
-"<b>This client is built without SSL Support!</b><br />Disable the usage of "
-"SSL in the account settings."
-msgstr ""
-"<b>Этот клиент был собран без поддержки SSL!</b><br />Отключите "
-"использование SSL в настройках аккаунта."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:195
-msgid ""
-"<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
-"least core/client protocol v%1 to connect."
-msgstr ""
-"<b>Вы пытаетесь подключиться к слишком старому ядру Quassel!</b><br>Для "
-"соединения необходима поддержка клиент-серверного протокола по крайней мере "
-"версии %1."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:219
-msgid ""
-"<b>The Quassel Core you are trying to connect to does not support SSL!</"
-"b><br />If you want to connect anyways, disable the usage of SSL in the "
-"account settings."
-msgstr ""
-"<b>Ядро Quassel, к которому вы пытаетесь подключиться не поддерживает SSL!</"
-"b><br />Если вы всё равно хотите подключиться, отключите использование SSL в "
-"настройках аккаунта."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:248
-msgid "Logging in..."
-msgstr "Авторизуюсь..."
-
-#. ts-context Core
-#: ../src/core/core.cpp:535
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
 msgstr ""
-"<b>Ядро Quassel версии %1</b><br>Собрано: %2<br>Аптайм %3д%4ч%5м (с %6)"
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:404 ../src/client/clientsyncer.cpp:429
-msgid "Cert Digest changed! was: %1"
-msgstr "Хеш сертификата изменился! старый был: %1"
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:102
-msgid "No Host to connect to specified."
-msgstr "Не указан хост для соединения."
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:373
-msgid "Connection"
-msgstr "Соединения"
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr "/QUERY предполагает наличие хотя бы ника"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
-msgstr ""
+msgstr "Настройка подключения IRC"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:20
 msgid "Enable Ping Timeout Detection"
-msgstr ""
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.ui:37
-msgid "Ping interval:"
-msgstr ""
+msgstr "Включить определение Ping Timeout"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TaskbarNotificationBackend::ConfigWidget
 #: ../src/qtui/settingspages/connectionsettingspage.ui:44
 #: ../src/qtui/settingspages/connectionsettingspage.ui:155
 #: ../src/qtui/settingspages/connectionsettingspage.ui:213
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
+#: ../src/qtui/taskbarnotificationbackend.cpp:79
 msgid " seconds"
-msgstr ""
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.ui:80
-msgid "Disconnect after"
-msgstr ""
+msgstr " сек."
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:103
 msgid "missed pings"
-msgstr ""
+msgstr "потерянных пингов"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:128
@@ -1021,46 +1485,90 @@ msgid ""
 "This enables periodic polling of user information using /WHO. This is mostly "
 "interesting for tracking users' away status."
 msgstr ""
+"Данный параметр периодически обновляет информацию о  пользователях, "
+"используя IRC команду /WHO. В основном, это нужно для отслеживания статуса "
+"отсутствия пользователя (Away)."
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:131
 msgid "Enable Automatic User Information Lookup (/WHO)"
-msgstr ""
+msgstr "Включить автоматическое получение информации о пользователях (/WHO)"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:148
 msgid "Update interval:"
-msgstr ""
+msgstr "Интервал обновления:"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:177
 msgid "Ignore channels with more than:"
-msgstr ""
+msgstr "Игнорировать каналы с более чем:"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:184
 msgid " users"
-msgstr ""
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.ui:206
-msgid "Minimum delay between requests:"
-msgstr ""
+msgstr " пользователи"
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:592
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Скопировать адрес ссылки"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
-msgid "Delete Chat(s)..."
-msgstr ""
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:31
+msgid "Connect"
+msgstr "Соединиться"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
-msgid "Go to Chat"
-msgstr ""
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:32
+msgid "Disconnect"
+msgstr "Отсоединиться"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:35
+msgid "Join"
+msgstr "Зайти"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgid "Part"
+msgstr "Выйти"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
+msgid "Joins"
+msgstr "Входы"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
+msgid "Parts"
+msgstr "Выходы из канала"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
+msgid "Quits"
+msgstr "Выходы из сети"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
+msgid "Nick Changes"
+msgstr "Смены ника"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:50
@@ -1102,8 +1610,12 @@ msgstr "Начать диалог"
 msgid "Show Query"
 msgstr "Показать диалог"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Whois"
 msgstr "Whois"
 
@@ -1124,8 +1636,8 @@ msgstr "Ping"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr "Finger"
+msgid "Client info"
+msgstr "Информация о IRC клиенте"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1168,24 +1680,9 @@ msgid "Kick && Ban"
 msgstr "Выгнать и забанить"
 
 #. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
-msgid "Hide Chat(s) Temporarily"
-msgstr ""
-
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
-msgid "Hide Chat(s) Permanently"
-msgstr ""
-
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:131
-msgid "Add Ignore Rule"
-msgstr ""
-
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:132
-msgid "Existing Rules"
-msgstr ""
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
+msgid "Show Channel List"
+msgstr "Показать список каналов"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:89
@@ -1193,7 +1690,16 @@ msgid "Show Ignore List"
 msgstr "Показать список игнорируемых"
 
 #. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:102
+msgid "Hide Events"
+msgstr "Спрятать события"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
 #: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
 msgid "CTCP"
 msgstr "CTCP"
 
@@ -1202,11 +1708,33 @@ msgstr "CTCP"
 msgid "Actions"
 msgstr "Действия"
 
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:126
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
+msgid "Existing Rules"
+msgstr "Имеющиеся правила"
+
 #. ts-context Core
 #: ../src/core/core.cpp:182
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr "Не могу инициализировать ни одно хранилище! Выхожу..."
 
+#. ts-context Core
+#: ../src/core/core.cpp:183
+msgid ""
+"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
+"Qt library with the sqlite or postgres plugin enabled in order for "
+"quasselcore\n"
+"to work."
+msgstr ""
+"Сейчас, Quassel поддерживает SQLite3 и PostgreSQL. вам нужно создать свою\n"
+"библиотеку Qt с разрешенными в ядре Quassel плагинами sqlite или postgres\n"
+"для работы."
+
 #. ts-context Core
 #: ../src/core/core.cpp:232
 msgid "Calling restoreState() even though active sessions exist!"
@@ -1227,6 +1755,48 @@ msgstr "Не могу настроить хранилище!"
 msgid "Creating admin user..."
 msgstr "Создаю пользователя-администратора..."
 
+#. ts-context Core
+#: ../src/core/core.cpp:394
+msgid "Invalid listen address %1"
+msgstr "Некорректный адрес для прослушивания %1"
+
+#. ts-context Core
+#: ../src/core/core.cpp:402
+msgid ""
+"Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr ""
+"Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол "
+"версии %3"
+
+#. ts-context Core
+#: ../src/core/core.cpp:410
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
+
+#. ts-context Core
+#: ../src/core/core.cpp:418
+msgid ""
+"Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
+msgstr ""
+"Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол "
+"версии %3"
+
+#. ts-context Core
+#: ../src/core/core.cpp:429
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
+
+#. ts-context Core
+#: ../src/core/core.cpp:437
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr ""
+"Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
+
+#. ts-context Core
+#: ../src/core/core.cpp:446
+msgid "Could not open any network interfaces to listen on!"
+msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"
+
 #. ts-context Core
 #: ../src/core/core.cpp:480
 msgid "Client connected from"
@@ -1245,14 +1815,18 @@ msgstr "Древний клиент попытался подключиться.
 #. ts-context Core
 #: ../src/core/core.cpp:514
 msgid ""
-"<b>Your Quassel Client is too old!</b><br>This core needs at least client/"
-"core protocol version %1.<br>Please consider upgrading your client."
+"<b>Your Quassel Client is too old!</b><br>This core needs at least "
+"client/core protocol version %1.<br>Please consider upgrading your client."
 msgstr ""
 "<b>Ваш клиент Quassel слишком старый!</b><br>Этому ядру нужна версия клиент-"
 "серверного протокола по крайней мере %1.<br>Пожалуйста обновите клиент."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context Core
-#: ../src/core/core.cpp:518 ../src/core/core.cpp:606 ../src/core/core.cpp:630
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreSession
+#: ../src/core/core.cpp:518 ../src/core/core.cpp:608 ../src/core/core.cpp:632
+#: ../src/core/coresession.cpp:195
 msgid "Client"
 msgstr "Клиент"
 
@@ -1262,12 +1836,19 @@ msgid "too old, rejecting."
 msgstr "слишком старый, отказываю."
 
 #. ts-context Core
-#: ../src/core/core.cpp:586
+#: ../src/core/core.cpp:535
+msgid ""
+"<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgstr ""
+"<b>Ядро Quassel версии %1</b><br>Собрано: %2<br>Аптайм %3д%4ч%5м (с %6)"
+
+#. ts-context Core
+#: ../src/core/core.cpp:588
 msgid "Starting TLS for Client:"
 msgstr "Запускаю TLS для клиента:"
 
 #. ts-context Core
-#: ../src/core/core.cpp:604
+#: ../src/core/core.cpp:606
 msgid ""
 "<b>Client not initialized!</b><br>You need to send an init message before "
 "trying to login."
@@ -1276,13 +1857,13 @@ msgstr ""
 "сообщение перед попыткой входа."
 
 #. ts-context Core
-#: ../src/core/core.cpp:606
+#: ../src/core/core.cpp:608
 msgid "did not send an init message before trying to login, rejecting."
 msgstr ""
 "не отправил инициализационное сообщение перед попыткой входа, отказываю."
 
 #. ts-context Core
-#: ../src/core/core.cpp:624
+#: ../src/core/core.cpp:626
 msgid ""
 "<b>Invalid username or password!</b><br>The username/password combination "
 "you supplied could not be found in the database."
@@ -1291,176 +1872,224 @@ msgstr ""
 "пользователя и пароль не найдены в базе."
 
 #. ts-context Core
-#: ../src/core/core.cpp:630
+#: ../src/core/core.cpp:632
 msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
 msgstr "инициализирован и аутентифицирован успешно как \"%1\" (UserId: %2)."
 
 #. ts-context Core
-#: ../src/core/core.cpp:641
+#: ../src/core/core.cpp:643
 msgid "Non-authed client disconnected."
 msgstr "Неавторизованный клиент отсоединён."
 
 #. ts-context Core
-#: ../src/core/core.cpp:647
+#: ../src/core/core.cpp:649
 msgid "Non-authed client disconnected. (socket allready destroyed)"
 msgstr "Неавторизованный клиент отсоединён. (сокет уже уничтожен)"
 
 #. ts-context Core
-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:697
 msgid "Could not initialize session for client:"
 msgstr "Не могу инициализировать сессию для клиента:"
 
 #. ts-context Core
-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:719
 msgid "Could not find a session for client:"
-msgstr ""
-
-#. ts-context Core
-#: ../src/core/core.cpp:394
-msgid "Invalid listen address %1"
-msgstr "Некорректный адрес для прослушивания %1"
+msgstr "Не удалось найти сессии для клиента:"
 
-#. ts-context Core
-#: ../src/core/core.cpp:183
-msgid ""
-"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
-"Qt library with the sqlite or postgres plugin enabled in order for "
-"quasselcore\n"
-"to work."
-msgstr ""
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccount
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountModel
+#: ../src/client/coreaccount.h:39 ../src/client/coreaccountmodel.cpp:64
+msgid "Internal Core"
+msgstr "Встроенное ядро"
 
-#. ts-context Core
-#: ../src/core/core.cpp:402
-msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-msgstr ""
-"Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол "
-"версии %3"
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
+msgid "Edit Core Account"
+msgstr "Редактировать аккаунт в ядре"
 
-#. ts-context Core
-#: ../src/core/core.cpp:410
-msgid "Could not open IPv4 interface %1:%2: %3"
-msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
-
-#. ts-context Core
-#: ../src/core/core.cpp:418
-msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
-msgstr ""
-"Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол "
-"версии %3"
-
-#. ts-context Core
-#: ../src/core/core.cpp:429
-msgid "Could not open IPv6 interface %1:%2: %3"
-msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
-
-#. ts-context Core
-#: ../src/core/core.cpp:437
-msgid "Invalid listen address %1, unknown network protocol"
-msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
-
-#. ts-context Core
-#: ../src/core/core.cpp:446
-msgid "Could not open any network interfaces to listen on!"
-msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/coreconnectdlg.cpp:522
-msgid "Add Core Account"
-msgstr "Добавить аккаунт в ядре"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:13
-msgid "Edit Core Account"
-msgstr "Редактировать аккаунт в ядре"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:21
-msgid "Account Details"
-msgstr "Подробности аккаунта"
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
+msgid "Account Details"
+msgstr "Подробности аккаунта"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:29
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
 msgid "Account Name:"
 msgstr "Название аккаунта:"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:36
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
 msgid "Local Core"
 msgstr "Локальное ядро"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
 msgid "Hostname:"
 msgstr "Хост:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:54
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:180
+#: ../src/qtui/settingspages/servereditdlg.ui:220
+msgid "localhost"
+msgstr "localhost"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
+#: ../src/qtui/settingspages/networkadddlg.ui:95
+#: ../src/qtui/settingspages/servereditdlg.ui:45
+#: ../src/qtui/settingspages/servereditdlg.ui:227
 msgid "Port:"
 msgstr "Порт:"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:61
-#: ../src/qtui/ui/coreaccounteditdlg.ui:144
-msgid "localhost"
-msgstr "localhost"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+msgid "User:"
+msgstr "Пользователь:"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardAdminUserPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModelController::JoinDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:103
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:236
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+#: ../src/uisupport/networkmodelcontroller.cpp:491
+#: ../src/qtui/settingspages/networkssettingspage.ui:567
+#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/servereditdlg.ui:72
+msgid "Password:"
+msgstr "Пароль:"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:81
-msgid "Use secure connection (SSL)"
-msgstr "Использовать защищённое соединение (SSL)"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
+msgid "Remember"
+msgstr "Запомнить"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:97
-msgid "Use a proxy:"
-msgstr "Использовать прокси:"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
+#: ../src/qtui/settingspages/servereditdlg.ui:171
+msgid "Use a Proxy"
+msgstr "Использовать прокси"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:109
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/servereditdlg.ui:188
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:117
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/servereditdlg.ui:196
 msgid "Socks 5"
 msgstr "Socks 5"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:122
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+#: ../src/qtui/settingspages/servereditdlg.ui:201
 msgid "HTTP"
 msgstr "HTTP"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:130
-msgid "Proxy Host:"
-msgstr "Хост прокси:"
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+msgid "Add Core Account"
+msgstr "Добавить аккаунт в ядре"
 
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:137
-msgid "Proxy Port:"
-msgstr "Порт прокси:"
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
+msgid "Connect to Quassel Core"
+msgstr "Соединение с ядром Quassel"
 
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:170
-msgid "Proxy Username:"
-msgstr "Имя пользователя прокси:"
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
+msgid "Core Accounts"
+msgstr "Учетные записи Quassel Core серверов"
 
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:180
-msgid "Proxy Password:"
-msgstr "Пароль прокси:"
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
+msgid "Edit..."
+msgstr "Правка..."
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
+msgid "Add..."
+msgstr "Добавить..."
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
+msgid "Automatically connect on startup"
+msgstr "Подключаться при запуске"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
+msgid "Connect to last account used"
+msgstr "Подключаюсь к учетной записи, использовавшейся в прошлый сеанс"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
+msgid "Always connect to"
+msgstr "Всегда подключаться к"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgid "Remote Cores"
+msgstr "Удаленные Quassel Core сервера"
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:60
+#: ../src/qtui/coreconfigwizard.cpp:69
 msgid "Core Configuration Wizard"
 msgstr "Мастер конфигурации ядра"
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:82
+#: ../src/qtui/coreconfigwizard.cpp:97
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Ваше ядро сконфигурировано успешно. Выполняю вход в..."
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:93
+#: ../src/qtui/coreconfigwizard.cpp:104
 msgid ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
 msgstr ""
@@ -1468,7 +2097,7 @@ msgstr ""
 "начать сначала."
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:108
+#: ../src/qtui/coreconfigwizard.cpp:119
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "
 "remember to configure your identities and networks now."
@@ -1476,64 +2105,42 @@ msgstr ""
 "Вы вошли в свежесконфигурированное ядро Quassel!<br>Теперь, пожалуйста, не "
 "забудьте настроить ваши личности и сети."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:21
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
 msgid "Username:"
 msgstr "Имя пользователя:"
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:31
-msgid "Password:"
-msgstr "Пароль:"
-
-#. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:45
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
 msgid "Repeat password:"
 msgstr "Повторите пароль:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:59
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:68
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; "
-"font-size:13pt;\"><span style=\" font-size:10pt; font-weight:600;\">Note: </"
-"span><span style=\" font-size:10pt;\">Adding more users and changing your "
-"username/password is not possible via Quassel's interface yet.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; "
-"font-size:10pt;\">If you need to do these things have a look at the "
-"manageusers.py script which is located in the /scripts directory.</p></"
-"body></html>"
-msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; "
-"font-size:13pt;\"><span style=\" font-size:10pt; font-weight:600;"
-"\">Замечание: </span><span style=\" font-size:10pt;\">Через интерфейс "
-"Quassel пока невозможно добавлять новых пользователей, а также изменять имя "
-"пользователя и пароль.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; "
-"font-size:10pt;\">Если вам нужно проделать эти вещи, взгляните на скрипт "
-"manageusers.py в директории /scripts.</p></body></html>"
+"<b>Note:</b> Adding more users and changing your username/password is not "
+"possible via Quassel's client interface yet.\n"
+"If you need to do these things, please run \"<tt><nobr>quasselcore --"
+"help</nobr></tt>\"."
+msgstr ""
+"<b>Примечание:</b> В данной версии программы, добавление пользователей и "
+"изменение имени пользователя и пароля не возможно через интерфейс клиента "
+"Quassel.\n"
+"Если Вы хотите это сделать, выполните команду \"<tt><nobr>quasselcore --"
+"help</nobr></tt>\"."
 
 #. ts-context CoreConfigWizardIntroPage
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:19
@@ -1541,12 +2148,12 @@ msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Этот мастер поможет вам настроить ядро Quassel."
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
-#: ../src/qtui/coreconfigwizard.cpp:140
+#: ../src/qtui/coreconfigwizard.cpp:150
 msgid "Create Admin User"
 msgstr "Создание пользователя-администратора"
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
-#: ../src/qtui/coreconfigwizard.cpp:141
+#: ../src/qtui/coreconfigwizard.cpp:151
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
@@ -1555,17 +2162,17 @@ msgstr ""
 "будут привилегии администратора."
 
 #. ts-context CoreConfigWizardPages::IntroPage
-#: ../src/qtui/coreconfigwizard.cpp:125
+#: ../src/qtui/coreconfigwizard.cpp:135
 msgid "Introduction"
 msgstr "Введение"
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:172
+#: ../src/qtui/coreconfigwizard.cpp:182
 msgid "Select Storage Backend"
 msgstr "Выбор средства хранения"
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:173
+#: ../src/qtui/coreconfigwizard.cpp:183
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "
 "backlog and other data in."
@@ -1574,17 +2181,17 @@ msgstr ""
 "будет хранить журнал и прочие данные."
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:267
+#: ../src/qtui/coreconfigwizard.cpp:277
 msgid "Connection Properties"
-msgstr ""
+msgstr "Свойства соединения"
 
 #. ts-context CoreConfigWizardPages::SyncPage
-#: ../src/qtui/coreconfigwizard.cpp:307
+#: ../src/qtui/coreconfigwizard.cpp:317
 msgid "Storing Your Settings"
 msgstr "Сохранение настроек"
 
 #. ts-context CoreConfigWizardPages::SyncPage
-#: ../src/qtui/coreconfigwizard.cpp:308
+#: ../src/qtui/coreconfigwizard.cpp:318
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "
 "automatically."
@@ -1592,8 +2199,12 @@ msgstr ""
 "Ваши настройки сохраняются в ядре, вы будете подсоединены к ядру "
 "автоматически."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreConfigWizardStorageSelectionPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
 msgid "Storage Backend:"
 msgstr "Движок хранения:"
 
@@ -1633,200 +2244,202 @@ msgid "Please wait while your settings are being transmitted to the core..."
 msgstr "Пожалуйста подождите пока ваши настройки передаются ядру..."
 
 #. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:190
-msgid "Remove Account Settings"
-msgstr "Удаление настроек аккаунта"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:191
-msgid ""
-"Do you really want to remove your local settings for this Quassel Core "
-"account?<br>Note: This will <em>not</em> remove or change any data on the "
-"Core itself!"
-msgstr ""
-"Вы действительно хотите удалить ваши локальные настройки для этого аккаунта "
-"ядра Quassel?<br>Замечание: это <em>не</em> удалит и никак не изменит данные "
-"в самом ядре!"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:242
-msgid "Connect to %1"
-msgstr "Соединиться с %1"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:259
-msgid "<div style=color:red;>Connection to %1 failed!</div>"
-msgstr "<div style=\"color:red;\">Сбой соединения с %1!</div>"
+#: ../src/qtui/coreconnectdlg.cpp:40
+msgid "Connect to Core"
+msgstr "Подключение к ядру"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:309
-msgid "Not connected to %1."
-msgstr "Нет соединения с %1."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
+msgid "Disconnected"
+msgstr "Отключено"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:310
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "Ищу хост %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:311
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "Соединяюсь с %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:312
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Соединение с %1 установлено"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:313
-msgid "Unknown connection state to %1"
-msgstr "Неизвестно состояние соединения с %1"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:392 ../src/qtui/coreconnectdlg.cpp:450
-#: ../src/qtui/ui/coreconnectdlg.ui:263
-msgid "Login"
-msgstr "Вход"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:20 ../src/qtui/ui/coreconnectdlg.ui:46
-msgid "Connect to Quassel Core"
-msgstr "Соединение с ядром Quassel"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:61
-msgid "Edit..."
-msgstr "Правка..."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:72
-msgid "Add..."
-msgstr "Добавить..."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:121
-msgid "Always use this account"
-msgstr "Всегда использовать этот аккаунт"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:150
-msgid "Initializing your connection"
-msgstr "Инициализирую ваше соединение"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:168
-msgid "Connected to apollo.mindpool.net."
-msgstr "Соединён с apollo.mindpool.net."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:214
+msgid "Disconnecting from %1..."
+msgstr "Идет отключение от %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:271
-msgid "User:"
-msgstr "Пользователь:"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:272
+msgid ""
+"The Quassel Core you try to connect to is too old! Please consider upgrading."
+msgstr ""
+"Вы пытаетесь подключиться к слишком старому ядру Quassel! Пожалуйста "
+"обновите."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:299
-msgid "Remember"
-msgstr "Запомнить"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:300
+msgid "Invalid data received from core"
+msgstr "От ядра были получены недопустимые данные"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:333
-msgid "View SSL Certificate"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:349
+msgid "Disconnected from core."
 msgstr ""
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:370
-msgid "Add to known hosts"
-msgstr ""
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:427 ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
+msgid "Unencrypted connection canceled"
+msgstr "Незашифрованное подключение отменено"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:425
-msgid "Configure your Quassel Core"
-msgstr "Настройте ваше ядро Quassel"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:457
+msgid "Synchronizing to core..."
+msgstr "Синхронизация с ядром..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:431
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:478
 msgid ""
-"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."
+"<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
+"least core/client protocol v%1 to connect."
 msgstr ""
-"Ядро Quassel, к которому вы подключились, ещё не настроено. Сейчас вы можете "
-"запустить мастер настройки, который поможет сконфигурировать ваше ядро."
+"<b>Вы пытаетесь подключиться к слишком старому ядру Quassel!</b><br>Для "
+"соединения необходима поддержка клиент-серверного протокола по крайней мере "
+"версии %1."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:459
-msgid "Launch Wizard"
-msgstr "Запустить мастер"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:592
+msgid "Logging in..."
+msgstr "Авторизуюсь..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:505
-msgid "Initializing your session..."
-msgstr "Инициализирую ваш сеанс..."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:597
+msgid "Login canceled"
+msgstr "Вход в систему отменен"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:513
-msgid ""
-"<b>Please be patient while your client synchronizes with the Quassel Core!</"
-"b>"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:622
+msgid "Receiving session state"
 msgstr ""
-"<b>Пожалуйста, наберитесь терпения, пока ваш клиент синхронизируется с ядром "
-"Quassel!</b>"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:528
-msgid "Session state:"
-msgstr "Состояние сессии:"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:545
-msgid "Network states:"
-msgstr "Состояния сетей:"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:624
+msgid "Synchronizing to %1..."
+msgstr "Синхронизация с %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:558
-msgid "0/0"
-msgstr "0/0"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:648
+msgid "Receiving network states"
+msgstr "Получение состояния сетей"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:107
-msgid "Use internal core"
-msgstr "Использовать встроенное ядро"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:698
+msgid "Synchronized to %1"
+msgstr "Синхронизировано с %1"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:200
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
 msgid ""
-"THIS IS A PLACEHOLDER\n"
-"TO\n"
-"RESERVE\n"
-"SOME SPACE"
+"Rely on KDE's hardware layer to detect if we're online. Recommended for most "
+"KDE users"
 msgstr ""
-"THIS IS A PLACEHOLDER\n"
-"TO\n"
-"RESERVE\n"
-"SOME SPACE"
+"Полагаться на аппаратный уровень KDE, чтобы определить, онлайн ли мы. "
+"Рекомендуется для большинства пользователей KDE"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:272
-msgid "<div>Errors occurred while connecting to \"%1\":</div>"
-msgstr "<div>При соединении с \"%1\" возникли ошибки:</div>"
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
+msgid "Use KDE's network status detection (via Solid)"
+msgstr "Используйте сетевое обнаружение состояния KDE (via Solid)"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:390
-msgid "Continue connection"
-msgstr "Продолжить соединение"
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgid ""
+"Actively ping the remote core and disconnect if we didn't get a reply after "
+"a certain time"
+msgstr ""
+"Периодически запрашивать удаленное ядро, и отключаться, если от него нет "
+"отклика"
 
-#. ts-context CoreInfoDlg
-#: ../src/qtui/coreinfodlg.cpp:53
-msgid "%n Day(s)"
-msgid_plural "%n Day(s)"
-msgstr[0] "%n День"
-msgstr[1] "%n Дня"
-msgstr[2] "%n Дней"
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
+msgid "Ping timeout after"
+msgstr "Отключаться через"
 
-#. ts-context CoreInfoDlg
-#: ../src/qtui/coreinfodlg.cpp:54
-msgid " %1:%2:%3 (since %4)"
-msgstr " %1:%2:%3 (с %4)"
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
+msgid ""
+"Only disconnect if the network socket gets closed by the operating system. "
+"This may take a long time after actually losing connectivity"
+msgstr ""
+"Отключаться только после закрытия соединения системой. Обнаружение "
+"отключения может пройти занять много времени"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
+msgid "Never time out actively"
+msgstr "Неактивное время"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
+msgid "Automatically reconnect on network failures"
+msgstr "Автоматически переподключаться после разрыва соединения"
+
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
+msgid "Retry every"
+msgstr "Повтор каждые"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgid "Connection"
+msgstr "Соединения"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionStatusWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgid "Message"
+msgstr "Сообщение"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "seconds"
+msgid "s"
+msgstr ""
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "milliseconds"
+msgid "ms"
+msgstr "мс"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+msgid "(Lag: %1 %2)"
+msgstr "(Задержка: %1 %2)"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:75
+msgid "The connection to your core is encrypted with SSL."
+msgstr "Соединение с ядром использует SSL-шифрование."
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:78
+msgid "The connection to your core is not encrypted."
+msgstr "Соединение с ядром не использует шифрование."
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:13
@@ -1873,11 +2486,26 @@ msgstr "Дата сборки:"
 msgid "<build date>"
 msgstr "<build date>"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreInfoDlg
-#: ../src/qtui/ui/coreinfodlg.ui:81
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context DebugLogWidget
+#: ../src/qtui/ui/coreinfodlg.ui:81 ../src/qtui/ui/debuglogwidget.ui:43
 msgid "Close"
 msgstr "Закрыть"
 
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:53
+msgid "%n Day(s)"
+msgid_plural "%n Day(s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:54
+msgid " %1:%2:%3 (since %4)"
+msgstr " %1:%2:%3 (с %4)"
+
 #. ts-context CoreNetwork
 #: ../src/core/corenetwork.cpp:153
 msgid "Connection failed. Cycling to next Server"
@@ -1889,32 +2517,32 @@ msgid "Connecting to %1:%2..."
 msgstr "Соединяюсь с %1:%2..."
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:307
-msgid "Could not connect to %1 (%2)"
-msgstr "Не могу подсоединиться к %1 (%2)"
-
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:309
-msgid "Connection failure: %1"
-msgstr "Сбой соединения: %1"
-
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:211
+#: ../src/core/corenetwork.cpp:210
 msgid "Disconnecting. (%1)"
 msgstr "Отсоединяюсь. (%1)"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:211
+#: ../src/core/corenetwork.cpp:210
 msgid "Core Shutdown"
 msgstr "Ядро завершает работу"
 
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:339
+msgid "Could not connect to %1 (%2)"
+msgstr "Не могу подсоединиться к %1 (%2)"
+
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:341
+msgid "Connection failure: %1"
+msgstr "Сбой соединения: %1"
+
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:192
+#: ../src/core/coresession.cpp:195
 msgid "disconnected (UserId: %1)."
 msgstr "отсоединён (UserId: %1)."
 
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:386
+#: ../src/core/coresession.cpp:413
 msgid ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
 "create network %1!"
@@ -1923,7 +2551,7 @@ msgstr ""
 "создать сеть %1!"
 
 #. ts-context CoreSession
-#: ../src/core/coresession.cpp:417
+#: ../src/core/coresession.cpp:444
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
@@ -1932,74 +2560,166 @@ msgstr ""
 "вместо этого обновляю!"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
-msgid "sending CTCP-%1 request"
-msgstr "отправляю запрос CTCP-%1"
-
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "отсутствует"
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:150
+msgid "sending CTCP-%1 request to %2"
+msgstr "посылка % CTCP-1 запрос к %2"
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid ""
+"[usage] /delkey <nick|channel> deletes the encryption key for nick or "
+"channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+msgid "No key has been set for %1."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid ""
+"Error: Setting an encryption key requires Quassel to have been built with "
+"support for the Qt Cryptographic Architecture (QCA2) library. Contact your "
+"distributor about a Quassel package with QCA2 support, or rebuild Quassel "
+"with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid ""
+"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
+"channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid ""
+"Error: Setting an encryption key requires Quassel to have been built with "
+"support for the Qt Cryptographic Architecture (QCA) library. Contact your "
+"distributor about a Quassel package with QCA support, or rebuild Quassel "
+"with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:16
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
 msgstr "Создать новую личность"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:24
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
 msgid "Identity name:"
 msgstr "Название личности:"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:36
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
 msgid "Create blank identity"
 msgstr "Создать пустую личность"
 
 #. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:48
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
 msgid "Duplicate:"
 msgstr "Дублировать:"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:190
+#: ../src/core/ctcphandler.cpp:197
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "Получен запрос CTCP PING от %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:195
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "Получен ответ на CTCP от %1 с временем полного пути %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:205
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "Получен запрос CTCP VERSION от %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:208
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "Получен ответ на CTCP VERSION от %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:216
+#: ../src/core/ctcphandler.cpp:243
+msgid "Received CTCP TIME request by %1"
+msgstr "Полученное ВРЕМЯ CTCP запрашивает %1"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:246
+msgid "Received CTCP TIME answer from %1: %2"
+msgstr "Полученный ответ ВРЕМЕНИ CTCP от %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Получен неизвестный CTCP %1 от %2"
 
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:257
+msgid " with arguments: %1"
+msgstr " с параметрами: %1"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+msgid "Debug BufferView Overlay"
+msgstr ""
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+msgid "Overlay View"
+msgstr ""
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+msgid "Overlay Properties"
+msgstr ""
+
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:50
 msgid "BufferViews:"
-msgstr ""
+msgstr "Просмотр Буфера:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:51
 msgid "All Networks:"
-msgstr ""
+msgstr "Все сети:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:52
 msgid "Networks:"
-msgstr ""
+msgstr "Сети:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:53
@@ -2009,70 +2729,40 @@ msgstr ""
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:54
 msgid "Removed buffers:"
-msgstr ""
+msgstr "Удаленные буфера:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:55
 msgid "Temp. removed buffers:"
-msgstr ""
+msgstr "Врем. удаленные буфера:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:57
-msgid "Add Buffers Automatically:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:58
-msgid "Hide inactive buffers:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:59
 msgid "Allowed buffer types:"
-msgstr ""
+msgstr "Разрешенные типы буфера:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:60
-msgid "Minimum activity:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:62
 msgid "Is initialized:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
-msgid "Debug BufferView Overlay"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
-msgid "Overlay View"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
-msgid "Overlay Properties"
-msgstr ""
+msgstr "Инициализирован:"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:13
+#: ../src/qtui/ui/debugconsole.ui:14
 msgid "Debug Console"
 msgstr "Консоль отладки"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:52
+#: ../src/qtui/ui/debugconsole.ui:44
 msgid "local"
 msgstr "local"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:62
+#: ../src/qtui/ui/debugconsole.ui:54
 msgid "core"
 msgstr "core"
 
 #. ts-context DebugConsole
-#: ../src/qtui/ui/debugconsole.ui:90
+#: ../src/qtui/ui/debugconsole.ui:82
 msgid "Evaluate!"
 msgstr "Вычислить!"
 
@@ -2081,141 +2771,35 @@ msgstr "Вычислить!"
 msgid "Debug Log"
 msgstr "Журнал отладки"
 
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:19
-msgid "Desktop Notification (via D-Bus)"
-msgstr "Уведомления рабочего стола (через D-Bus)"
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:33
-msgid "Timeout:"
-msgstr "Тайм-аут:"
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:46
-msgid " s"
-msgstr "сек"
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:76
-msgid "Position hint:"
-msgstr "Положение:"
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:86
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:102
-msgid " px"
-msgstr "пикс."
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:89
-msgid "X: "
-msgstr "X:"
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:105
-msgid "Y: "
-msgstr "Y:"
-
-#. ts-context DesktopNotificationConfigWidget
-#: ../src/qtui/ui/desktopnotificationconfigwidget.ui:130
-msgid "Queue unread notifications"
-msgstr "Непрочитанные уведомления ставить в очередь"
-
 #. ts-context ExecWrapper
 #: ../src/client/execwrapper.cpp:45
 msgid "Invalid command string for /exec: %1"
-msgstr ""
+msgstr "Недопустимая командная строка для /exec: %1"
 
 #. ts-context ExecWrapper
 #: ../src/client/execwrapper.cpp:53
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
-msgstr ""
-
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:64
-msgid "Could not find script \"%1\""
-msgstr ""
+msgstr "Имя \"%1\" недопустимо: ../ или ..\\ не допускаются!"
 
 #. ts-context ExecWrapper
 #: ../src/client/execwrapper.cpp:82
 msgid "Script \"%1\" crashed with exit code %2."
-msgstr ""
+msgstr "Скрипт \"%1\" потерпел крах с кодом завершения %2."
 
 #. ts-context ExecWrapper
 #: ../src/client/execwrapper.cpp:98
 msgid "Script \"%1\" could not start."
-msgstr ""
+msgstr "Не удалось запустить сценарий \"%1\""
 
 #. ts-context ExecWrapper
 #: ../src/client/execwrapper.cpp:100
 msgid "Script \"%1\" caused error %2."
-msgstr ""
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:20
-msgid "Show System Tray Icon"
-msgstr "Показывать значок в трее"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:39
-msgid "Tray Icon"
-msgstr "Значок в трее"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:45
-msgid "Show system tray icon"
-msgstr "Показывать значок в трее"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:29
-msgid "Hide to tray on close button"
-msgstr ""
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:58
-msgid "Message Redirection"
-msgstr "Перенаправление сообщений"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:64
-msgid "User Notices:"
-msgstr "Пользовательские сообщения:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:107
-msgid "Server Notices:"
-msgstr "Серверные сообщения:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:121
-msgid "Default Target"
-msgstr "Цель по умолчанию"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:128
-msgid "Status Window"
-msgstr ""
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:135
-msgid "Current Chat"
-msgstr ""
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:142
-msgid "Errors:"
-msgstr "Ошибки:"
-
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
-msgid "this shouldn't be empty"
-msgstr "это не должно быть пусто"
+msgstr "Скрипт \"%1\" вызванная ошибка %2."
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.h:45
-msgid "highlight rule"
-msgstr "правило подсветки"
+#. ts-context FontSelector
+#: ../src/uisupport/fontselector.cpp:31
+msgid "Choose..."
+msgstr "Выбрать..."
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:19
@@ -2232,13 +2816,22 @@ msgstr "Регэксп"
 msgid "CS"
 msgstr "Регистр"
 
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:47
+msgid "Enable"
+msgstr "Включено"
+
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:55
 msgid "Add"
 msgstr "Добавить"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
 msgid "Remove"
 msgstr "Удалить"
 
@@ -2257,8 +2850,14 @@ msgstr "Все ники личности"
 msgid "Current nick"
 msgstr "Текущий ник"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Нет"
 
@@ -2267,19 +2866,53 @@ msgstr "Нет"
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+msgid "this shouldn't be empty"
+msgstr "это не должно быть пусто"
+
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.h:45
+msgid "highlight rule"
+msgstr "правило подсветки"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identitiessettingspage.ui:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
+#: ../src/qtui/settingspages/identityeditwidget.ui:136
+msgid "Rename Identity"
+msgstr "Переименовать личность"
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:51
+msgid "Add Identity"
+msgstr "Добавить личность"
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:74
+msgid "Remove Identity"
+msgstr "Удалить личность"
+
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 msgid "Identities"
 msgstr "Личности"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:178
+#: ../src/qtui/settingspages/networkssettingspage.cpp:167
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr ""
-"<b>Прежде чем сохранить настройки, необходимо устранить следующие проблемы:</"
-"b><ul>"
+"<b>Прежде чем сохранить настройки, необходимо устранить следующие "
+"проблемы:</b><ul>"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:179
@@ -2301,8 +2934,12 @@ msgstr "<li>Вам нужно указать настоящее имя для к
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr "<li>Вам нужно указать идент для каждой личности</li>"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/networkssettingspage.cpp:169
 msgid "</ul>"
 msgstr "</ul>"
 
@@ -2321,71 +2958,331 @@ msgstr "Удалить личность?"
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Вы действительно хотите удалить личность \"%1\"?"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
-#: ../src/qtui/settingspages/identitiessettingspage.ui:31
-msgid "Rename Identity"
-msgstr "Переименовать личность"
-
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:323
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr "Пожалуйста введите новое название личности \"%1\"!"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.ui:51
-msgid "Add Identity"
-msgstr "Добавить личность"
-
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.ui:74
-msgid "Remove Identity"
-msgstr "Удалить личность"
+#. ts-context Identity
+#: ../src/common/identity.cpp:134
+msgid "Quassel IRC User"
+msgstr "Пользователь Quassel IRC"
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:150
+#: ../src/common/identity.cpp:162
 msgid "<empty>"
 msgstr "<пусто>"
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:122
-msgid "Quassel IRC User"
-msgstr "Пользователь Quassel IRC"
-
-#. ts-context Identity
-#: ../src/common/identity.cpp:156
+#: ../src/common/identity.cpp:168
 msgid "Gone fishing."
 msgstr "Ловлю рыбу."
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:160
+#: ../src/common/identity.cpp:172
 msgid "Not here. No, really. not here!"
 msgstr "Нет меня. Не, честно, нет меня!"
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:163
+#: ../src/common/identity.cpp:175
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr "Все клиенты Quassel стёрты с лица земли..."
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:166
+#: ../src/common/identity.cpp:178
 msgid "Kindergarten is elsewhere!"
 msgstr "Детский сад в другом месте!"
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:167 ../src/common/identity.cpp:168
+#: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Разговаривать удобно. Везде."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
+msgid "General"
+msgstr "Общие"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:38
+msgid "Real Name:"
+msgstr "Настоящее имя:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:45
+msgid "The \"Real Name\" is shown in /whois."
+msgstr "\"Настоящее имя\" отображается в /whois."
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:54
+msgid "Nicknames"
+msgstr "Ники"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/identityeditwidget.ui:90
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+msgid "Add Nickname"
+msgstr "Добавить ник"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:116
+msgid "Remove Nickname"
+msgstr "Удалить ник"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/identityeditwidget.ui:165
+#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/ui/simplenetworkeditor.ui:165
+msgid "Move upwards in list"
+msgstr "Передвинуть вверх в списке"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/identityeditwidget.ui:179
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/ui/simplenetworkeditor.ui:179
+msgid "Move downwards in list"
+msgstr "Передвинуть вниз в списке"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:227
+msgid "A&way"
+msgstr "&Отсутствую"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:233
+msgid "Default Away Settings"
+msgstr "Настройки состояния \"Отсутствую\" по умолчанию"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:244
+msgid "Nick to be used when being away"
+msgstr "Ник для состояния \"Отсутствую\""
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:254
+msgid "Default away reason"
+msgstr "Причина по-умолчанию"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:261
+msgid "Away Nick:"
+msgstr "Ник при отсутствии:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:268
+#: ../src/qtui/settingspages/identityeditwidget.ui:297
+#: ../src/qtui/settingspages/identityeditwidget.ui:366
+msgid "Away Reason:"
+msgstr "Причина отсутствия:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:280
+msgid "Set away when all clients have detached from the core"
+msgstr ""
+"Устанавливать состояние \"отсутствую\" когда все клиенты отсоединены от ядра"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:283
+msgid "Away On Detach"
+msgstr "\"Отсутствую\" при отсоединении"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:315
+msgid "Not implemented yet"
+msgstr "Ещё не реализовано"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:318
+msgid "Away On Idle"
+msgstr "\"Отсутствую\" при неактивности"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:332
+msgid "Set away after"
+msgstr "Устанавливать \"отсутствую\" после"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:342
+msgid "minutes of being idle"
+msgstr "минут неактивности"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/identityeditwidget.ui:399
+#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#: ../src/qtui/settingspages/servereditdlg.ui:119
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:407
+msgid "Ident:"
+msgstr "Идент:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:414
+msgid ""
+"The \"ident\" is part of your hostmask and, together with your host, "
+"uniquely identifies you within the IRC network."
+msgstr ""
+"\"Идент\" является частью хостмаски и вместе с хостом является однозначным "
+"идентификатором пользователя сети IRC."
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:423
+msgid "Messages"
+msgstr "Сообщения"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:431
+msgid "Part Reason:"
+msgstr "Причина выхода с канала:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:444
+msgid "Quit Reason:"
+msgstr "Причина выхода:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:454
+msgid "Kick Reason:"
+msgstr "Причина изгнания:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:488
+msgid ""
+"You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
+msgstr ""
+"Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и "
+"сертификата SSL"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:517
+msgid ""
+"Warning: you are not connected with a secured connection to the Quassel "
+"Core!\n"
+"Proceeding will cause an unencrypted transfer of your SSL Key and SSL "
+"Certificate!"
+msgstr ""
+"Предупреждение: вы не используете безопасное соединение с ядром Quassel!\n"
+"В случае продолжения передача вашего ключа и сертификата будет небезопасной!"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:546
+#: ../src/qtui/mainwin.cpp:1044
+msgid "Continue"
+msgstr "Продолжить"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:584
+msgid "Use SSL Key"
+msgstr "Использовать ключ SSL"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:598
+msgid "Key Type:"
+msgstr "Тип ключа:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:605
+#: ../src/qtui/settingspages/identityeditwidget.cpp:317
+#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+msgid "No Key loaded"
+msgstr "Ключ не загружен"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:625
+#: ../src/qtui/settingspages/identityeditwidget.ui:723
+#: ../src/qtui/settingspages/identityeditwidget.cpp:318
+#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+msgid "Load"
+msgstr "Загрузить"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:637
+msgid "Use SSL Certificate"
+msgstr "Использовать сертификат SSL"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:656
+msgid "Organisation:"
+msgstr "Организация:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:663
+#: ../src/qtui/settingspages/identityeditwidget.ui:697
+#: ../src/qtui/settingspages/identityeditwidget.cpp:363
+#: ../src/qtui/settingspages/identityeditwidget.cpp:364
+msgid "No Certificate loaded"
+msgstr "Сертификат не загружен"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:690
+msgid "CommonName:"
+msgstr "ОбщееИмя:"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+msgid "Load a Key"
+msgstr "Загрузить ключ"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+msgid "RSA"
+msgstr "RSA"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+msgid "DSA"
+msgstr "DSA"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:330
+#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+msgid "Clear"
+msgstr "Очистить"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+msgid "Load a Certificate"
+msgstr "Загрузить сертификат"
+
 #. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:107
 msgid "Setup Identity"
 msgstr "Настроить личность"
 
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:112
+msgid "Default Identity"
+msgstr "Личность по умолчанию"
+
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
 msgid "Configure Ignore Rule"
-msgstr ""
+msgstr "Настроить правило игнорирования"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
@@ -2393,8 +3290,8 @@ msgid ""
 "<p><b>Strictness:</b></p>\n"
 "<p><u>Dynamic:</u></p>\n"
 "<p>Messages are filtered \"on the fly\".\n"
-"Whenever you disable/delete the ignore rule, the messages are shown again.</"
-"p>\n"
+"Whenever you disable/delete the ignore rule, the messages are shown "
+"again.</p>\n"
 "<p><u>Permanent:</u></p>\n"
 "<p>Messages are filtered before they get stored in the database.</p>"
 msgstr ""
@@ -2402,7 +3299,7 @@ msgstr ""
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
 msgid "Strictness"
-msgstr ""
+msgstr "Строгость"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
@@ -2428,19 +3325,19 @@ msgstr ""
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
 msgid "Rule Type"
-msgstr ""
+msgstr "Тип правила"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
 msgid "Sender"
-msgstr ""
+msgstr "Отправитель"
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:91
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
 msgid ""
 "<p><b>Ignore rule:</b></p>\n"
-"<p>Depending on the type of the rule, the text is matched against either:</"
-"p>\n"
+"<p>Depending on the type of the rule, the text is matched against "
+"either:</p>\n"
 "<p><u>- the message content:</u></p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
@@ -2454,13 +3351,17 @@ msgid ""
 "from any host</p>"
 msgstr ""
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:105
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
 msgid "Ignore Rule"
 msgstr ""
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:116
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:123
 msgid ""
 "<p><b>Use regular expressions:</b></p>\n"
 "<p>If enabled, rules follow regular expression syntax.</p>\n"
@@ -2472,12 +3373,12 @@ msgid ""
 msgstr ""
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:124
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
 msgid "Regular expression"
-msgstr ""
+msgstr "Регулярное выражение"
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:136
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
@@ -2491,27 +3392,35 @@ msgid ""
 msgstr ""
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:145
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
 msgid "Scope"
 msgstr ""
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:153
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
 msgid "Global"
-msgstr ""
+msgstr "Общие"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
 msgid "Network"
 msgstr ""
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
 #: ../src/client/irclistmodel.cpp:59
 msgid "Channel"
 msgstr "Канал"
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:176
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
 msgid ""
 "<p><b>Scope rule:</b></p>\n"
 "<p>A scope rule is a semicolon separated list of either <i>network</i> or "
@@ -2524,7 +3433,7 @@ msgid ""
 msgstr ""
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:207
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -2533,9 +3442,9 @@ msgid ""
 msgstr ""
 
 #. ts-context IgnoreListEditDlg
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:213
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
 msgid "Rule is enabled"
-msgstr ""
+msgstr "Правило включено"
 
 #. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:69
@@ -2548,12 +3457,13 @@ msgstr ""
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:73
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
-"matched against either:<br /><br />- <u>the message content:</u><br /"
-"><i>Example:<i><br />    \"*foobar*\" matches any text containing the word "
-"\"foobar\"<br /><br />- <u>the sender string <i>nick!ident@host.name<i></"
-"u><br /><i>Example:</i><br />    \"*@foobar.com\" matches any sender from "
-"host foobar.com<br />    \"stupid!.+\" (RegEx) matches any sender with "
-"nickname \"stupid\" from any host<br />"
+"matched against either:<br /><br />- <u>the message content:</u><br "
+"/><i>Example:<i><br />    \"*foobar*\" matches any text containing the word "
+"\"foobar\"<br /><br />- <u>the sender string "
+"<i>nick!ident@host.name<i></u><br /><i>Example:</i><br />    "
+"\"*@foobar.com\" matches any sender from host foobar.com<br />    "
+"\"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any "
+"host<br />"
 msgstr ""
 
 #. ts-context IgnoreListModel
@@ -2574,17 +3484,22 @@ msgstr ""
 #. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:194
 msgid "Type"
+msgstr "Вид"
+
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+msgid "&Edit"
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
 msgid "Ignore List"
-msgstr ""
+msgstr "Список Игнорирования"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
 msgid "Rule already exists"
-msgstr ""
+msgstr "Правило уже существует"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
@@ -2593,34 +3508,122 @@ msgid ""
 "\"%1\"\n"
 "Please choose another rule."
 msgstr ""
+"Уже есть правило\n"
+"\"%1\"\n"
+"Пожалуйста выберите другое правило."
 
-#. ts-context IgnoreListSettingsPage
-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
-msgid "&Edit"
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
+msgid ""
+"This enables support for the Ayatana Project's application indicator "
+"(libindicate)."
 msgstr ""
+"Это включает поддержку индикатора приложения Ayatana Project's (libindicate)."
 
 #. ts-context IndicatorNotificationConfigWidget
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
-msgid "Show messages in indicator"
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
+msgid "Show messages in application indicator"
+msgstr "Показать сообщение в индикаторе приложения"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "White"
+msgstr "Белый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Black"
+msgstr "Черный"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark blue"
+msgstr "Темно-синий"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark green"
+msgstr "Темно-зеленый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Red"
+msgstr "Красный"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark red"
+msgstr "Темно-красный"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark magenta"
+msgstr "Фиолетовый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Orange"
+msgstr "Оранжевый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Yellow"
+msgstr "Жёлтый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Green"
+msgstr "Зелёный"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Dark cyan"
+msgstr "Сине-зеленый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:89
-msgid "Focus Input Line"
-msgstr "Активировать строку ввода"
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Blue"
+msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:90
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Magenta"
+msgstr ""
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
-msgid "Input Widget"
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Dark gray"
 msgstr ""
 
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Light gray"
+msgstr "Светло-серый"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+msgid "Clear Color"
+msgstr "Очистить цвет"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:132
+msgid "Focus Input Line"
+msgstr "Активировать строку ввода"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context InputWidgetSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:22
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
 msgid "Custom font:"
 msgstr ""
 
@@ -2631,37 +3634,67 @@ msgstr ""
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
-msgid "Show nick selector"
-msgstr ""
+msgid "Enable per chat history"
+msgstr "Включить историю чата"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
-msgid "Multi-Line Editing"
-msgstr ""
+msgid "Show nick selector"
+msgstr "Показать выбраные ники"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:96
-msgid "Show at most"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+msgid "Show style buttons"
+msgstr "Показать стиль кнопок"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:122
-msgid "lines"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
 msgstr ""
 
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+msgid "Multi-Line Editing"
+msgstr "Многострочное поле текста"
+
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+msgid "Show at most"
+msgstr "Показывать не более"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+msgid "lines"
+msgstr "строк"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
-msgstr ""
+msgstr "Включить прокрутку"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:163
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:187
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+msgid "Completion suffix:"
+msgstr "Суффикс автодополнения:"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
+msgstr ": "
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+msgid "Input Widget"
 msgstr ""
 
 #. ts-context IrcConnectionWizard
@@ -2674,158 +3707,194 @@ msgstr "Сохранить и соединиться"
 msgid "Users"
 msgstr "Пользователи"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcListModel
-#: ../src/client/irclistmodel.cpp:61
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModel
+#: ../src/client/irclistmodel.cpp:61 ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Тема"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:542
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 меняет тему канала %2 на \"%3\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:567
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Получено RPL_ISUPPORT (005) без параметров!"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:575
+#: ../src/core/ircserverhandler.cpp:642
 msgid ""
 "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr "Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:592 ../src/core/ircserverhandler.cpp:599
-#: ../src/core/ircserverhandler.cpp:606 ../src/core/ircserverhandler.cpp:613
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. Plain Message
+#. ----------
+#. Notice Message
+#. ----------
+#. Server Message
+#. ----------
+#. Info Message
+#. ----------
+#. Error Message
+#. ----------
+#. Topic Message
+#. ----------
+#. Invite Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/core/ircserverhandler.cpp:662 ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676 ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577 ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620 ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626 ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665 ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:648
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 отсутствует: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:654 ../src/core/ircserverhandler.cpp:659
+#: ../src/core/ircserverhandler.cpp:724 ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 отсутствует: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:703 ../src/core/ircserverhandler.cpp:717
-#: ../src/core/ircserverhandler.cpp:751 ../src/core/ircserverhandler.cpp:767
-#: ../src/core/ircserverhandler.cpp:828 ../src/core/ircserverhandler.cpp:860
+#: ../src/core/ircserverhandler.cpp:773 ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822 ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906 ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:732 ../src/core/ircserverhandler.cpp:734
+#: ../src/core/ircserverhandler.cpp:802 ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 это %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:749
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 подключен через %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:753 ../src/core/ircserverhandler.cpp:1031
+#: ../src/core/ircserverhandler.cpp:824 ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:779
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr "[Whowas] %1 был %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:793
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Конец списка /WHO для %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:813
+#: ../src/core/ircserverhandler.cpp:886 ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 в онлайне с %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:815
+#: ../src/core/ircserverhandler.cpp:888 ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr "[Whois] %1 неактивен %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:818
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] сообщение неактивности: %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:850
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 является участником каналов: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:852
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 является участником с голосом на каналах: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:854
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 является оператором каналов: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:882
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "На канале %1 %2 пользователей. Тема: %3"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:891
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Конец списка каналов"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:909
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
-msgstr ""
+msgstr "Домашняя страница для %1 %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:927
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
-msgstr ""
+msgstr "Создан канал %1 на сервере %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:941
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "Тема для канала %1 не установлена."
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:956
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "Тема канала %1 \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:967
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Тема установлена %1 %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:990
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1049
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "Ник %1 содержит недопустимые символы"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1060
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Ник уже используется: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1149
+#: ../src/core/ircserverhandler.cpp:1177
+msgid "Nick/channel is temporarily unavailable: %1"
+msgstr "Ник/канал временно недоступен: %1"
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1270
 msgid ""
 "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr ""
@@ -2833,24 +3902,108 @@ msgstr ""
 "<другой ник> для продолжения"
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:799
+#: ../src/client/networkmodel.cpp:806
+msgid " is away"
+msgstr ""
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:821 ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr "неактивен с %1"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:802
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:824 ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr "время входа: %1"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:805
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:827 ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "сервер: %1"
 
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:50
+msgid "Show icons"
+msgstr "Показать иконки"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:66
+msgid "Chat List"
+msgstr "Список Чата"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:72
+msgid "Display topic in tooltip"
+msgstr "Показывать тему во всплывающей подсказке"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:85
+msgid "Mouse wheel changes selected chat"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:101
+msgid "Use Custom Colors"
+msgstr "Использовать Пользовательские Цвета"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+msgid "Standard:"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+msgid "Inactive:"
+msgstr "Неактивно:"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+msgid "Unread messages:"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+msgid "Highlight:"
+msgstr "Подсветка:"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+msgid "Other activity:"
+msgstr "Другая активность:"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
+msgid "1"
+msgstr "1"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+msgid "Custom Nick List Colors"
+msgstr "Список Цветов Пользовательского Ника"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+msgid "Online:"
+msgstr "Онлайн:"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+msgid "Away:"
+msgstr "Отсутствует:"
+
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 msgid "Chat & Nick Lists"
-msgstr ""
+msgstr "Чат & Ник Списки"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
@@ -2870,260 +4023,493 @@ msgstr ""
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
 msgid "Other activity"
+msgstr "Другая активность"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context KNotificationBackend
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SystrayNotificationBackend
+#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/systraynotificationbackend.cpp:125
+msgid "%n pending highlights"
+msgid_plural "%n pending highlights"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:50
-msgid "Show icons"
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:66
-msgid "Chat List"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:85
-msgid "Mouse wheel changes selected chat"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:101
-msgid "Use Custom Colors"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
-msgid "Standard:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+msgctxt "Alt key"
+msgid "Alt"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
-msgid "Unread messages:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
-msgid "Other activity:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
-msgid "Custom Nick List Colors"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid ""
+"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:293
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "&Подключиться к ядру..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:295
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Отключиться от ядра"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:297
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "&Инфромация ядра..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:301
+#: ../src/qtui/mainwin.cpp:320
+msgid "Configure &Networks..."
+msgstr "Настроить &сети..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "В&ыход"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:302
-msgid "Ctrl+Q"
-msgstr "Ctrl+Q"
+#: ../src/qtui/mainwin.cpp:327
+msgid "&Configure Chat Lists..."
+msgstr "&Настройка Списка Чата"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:330
+msgid "&Lock Layout"
+msgstr "&Блокировать расположение"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:312
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Показать строку &поиска"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:319
-msgid "Show Status &Bar"
-msgstr "Показать строку &статуса"
+#: ../src/qtui/mainwin.cpp:336
+msgid "Show Away Log"
+msgstr "Показать журнал отсутствия"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:323
-msgid "&Configure Quassel..."
-msgstr "&Настройки Quassel..."
+#: ../src/qtui/mainwin.cpp:338
+msgid "Show &Menubar"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
-msgid "F7"
-msgstr "F7"
+#: ../src/qtui/mainwin.cpp:341
+msgid "Show Status &Bar"
+msgstr "Показать строку &статуса"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
-msgid "Debug &NetworkModel"
-msgstr "Отладить &NetworkModel"
+#: ../src/qtui/mainwin.cpp:343 ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
-msgid "&File"
-msgstr "&Файл"
+#: ../src/qtui/mainwin.cpp:347
+msgid "Configure &Shortcuts..."
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:365
-msgid "&Networks"
-msgstr "&Сети"
+#: ../src/qtui/mainwin.cpp:349
+msgid "&Configure Quassel..."
+msgstr "&Настройки Quassel..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
-msgid "&View"
-msgstr "&Вид"
+#: ../src/qtui/mainwin.cpp:353
+msgid "&About Quassel"
+msgstr "&О Quassel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:388
-msgid "&Settings"
-msgstr "&Настройки"
+#: ../src/qtui/mainwin.cpp:355
+msgid "About &Qt"
+msgstr "О &Qt"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:395
-msgid "&Help"
-msgstr "&Помощь"
+#: ../src/qtui/mainwin.cpp:357
+msgid "Debug &NetworkModel"
+msgstr "Отладить &NetworkModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:403
-msgid "Debug"
-msgstr "Отладка"
+#: ../src/qtui/mainwin.cpp:359
+msgid "Debug &BufferViewOverlay"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:542
-msgid "Nicks"
-msgstr "Ники"
+#: ../src/qtui/mainwin.cpp:361
+msgid "Debug &MessageModel"
+msgstr "Отладить &MessageModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:551
-msgid "Show Nick List"
-msgstr "Показать список ников"
+#: ../src/qtui/mainwin.cpp:363
+msgid "Debug &HotList"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:573
-msgid "Show Chat Monitor"
-msgstr "Показать монитор чата"
+#: ../src/qtui/mainwin.cpp:365
+msgid "Debug &Log"
+msgstr "&Журнал отладки"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:577
-msgid "Inputline"
-msgstr "Строкаввода"
+#: ../src/qtui/mainwin.cpp:367
+msgid "Reload Stylesheet"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:586
-msgid "Show Input Line"
-msgstr "Показать строку ввода"
+#: ../src/qtui/mainwin.cpp:371
+msgid "Navigation"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:609
-msgid "Show Topic Line"
-msgstr "Показать строку темы"
+#: ../src/qtui/mainwin.cpp:373
+msgid "Jump to hot chat"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:680
-msgid "Main Toolbar"
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:719
-msgid "Connected to core."
-msgstr "Соединение с ядром установлено."
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:789
-msgid "Not connected to core."
-msgstr "Нет соединения с ядром."
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
-msgid "Debug &MessageModel"
-msgstr "Отладить &MessageModel"
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:339
-msgid "Debug &Log"
-msgstr "&Журнал отладки"
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
-msgid "&About Quassel"
-msgstr "&О Quassel"
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:329
-msgid "About &Qt"
-msgstr "О &Qt"
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:299
-msgid "Configure &Networks..."
-msgstr "Настроить &сети..."
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:753
-msgid "Core Lag: %1"
-msgstr "Лаг ядра: %1"
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:308
-msgid "&Lock Layout"
-msgstr "&Блокировать расположение"
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:305
-msgid "&Configure Chat Lists..."
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:314
-msgid "Show Away Log"
-msgstr "Показать журнал отсутствия"
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:316
-msgid "Show &Menubar"
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
-msgid "Ctrl+M"
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
-msgid "Debug &BufferViewOverlay"
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:337
-msgid "Debug &HotList"
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:341
-msgid "Reload Stylesheet"
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:345
-msgid "Jump to hot chat"
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:372
-msgid "&Chat Lists"
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+msgid "Activate Next Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+msgid "Go to Next Chat"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+msgid "Go to Previous Chat"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:374
+#: ../src/qtui/mainwin.cpp:441
+msgid "&File"
+msgstr "&Файл"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:454
+msgid "&Networks"
+msgstr "&Сети"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:460
+msgid "&View"
+msgstr "&Вид"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:461
+msgid "&Chat Lists"
+msgstr "&Список Чатов"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "Па&нели"
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:477
+msgid "&Settings"
+msgstr "&Настройки"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:486
+msgid "&Help"
+msgstr "&Помощь"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:494
+msgid "Debug"
+msgstr "Отладка"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:723
+msgid "Nicks"
+msgstr "Ники"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:732
+msgid "Show Nick List"
+msgstr "Показать список ников"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:755
+msgid "Show Chat Monitor"
+msgstr "Показать монитор чата"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:759
+msgid "Inputline"
+msgstr "Строкаввода"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:768
+msgid "Show Input Line"
+msgstr "Показать строку ввода"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:793
+msgid "Show Topic Line"
+msgstr "Показать строку темы"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:871
+msgid "Main Toolbar"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:910
+msgid "Connected to core."
+msgstr "Соединение с ядром установлено."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1001
+msgid "Not connected to core."
+msgstr "Нет соединения с ядром."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015 ../src/qtui/mainwin.cpp:1023
+msgid "Unencrypted Connection"
+msgstr "Незашифрованное Подключение"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015
+msgid "<b>Your client does not support SSL encryption</b>"
+msgstr "<b> Ваш клиент не поддерживает SSL шифрование</b>"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1017 ../src/qtui/mainwin.cpp:1025
+msgid ""
+"Sensitive data, like passwords, will be transmitted unencrypted to your "
+"Quassel core."
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1023
+msgid "<b>Your core does not support SSL encryption</b>"
+msgstr "<b> Ваше ядро не поддерживает SSL шифрование</b>"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1060
+msgid "Untrusted Security Certificate"
+msgstr "Недоверяемый Сертификат Безопасности"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1041
+msgid ""
+"<b>The SSL certificate provided by the core at %1 is untrusted for the "
+"following reasons:</b>"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1045
+msgid "Show Certificate"
+msgstr "Показать Сертификаты"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1061
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1063
+msgid "Current Session Only"
+msgstr "Только Текущий Сеанс"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1064
+msgid "Forever"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1073
+msgid "Core Connection Error"
+msgstr "Основная Ошибка Подключения"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+msgid "&Normal mode"
+msgstr ""
+
 #. ts-context MessageModel
-#: ../src/client/messagemodel.cpp:373
+#: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "Запрашиваю %1 сообщений из журнала для буфера %2:%3"
 
@@ -3133,50 +4519,66 @@ msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:333
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:670
+msgid "Paste Protection"
+msgstr "Защита при вставке"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:13
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:14
+#: ../src/qtui/settingspages/networkssettingspage.cpp:705
 msgid "Add Network"
 msgstr "Добавить сеть"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:21
+#: ../src/qtui/settingspages/networkadddlg.ui:22
 msgid "Use preset:"
 msgstr "Выбрать известную сеть:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:56
+#: ../src/qtui/settingspages/networkadddlg.ui:57
 msgid "Manually specify network settings"
 msgstr "Вручную указать параметры сети"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:66
+#: ../src/qtui/settingspages/networkadddlg.ui:67
 msgid "Manual Settings"
 msgstr "Ручные настройки"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:74
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkadddlg.ui:75
+#: ../src/qtui/ui/simplenetworkeditor.ui:28
 msgid "Network name:"
 msgstr "Название сети:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:84
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:85
+#: ../src/qtui/settingspages/servereditdlg.ui:38
 msgid "Server address:"
 msgstr "Адрес сервера:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:114
+#: ../src/qtui/settingspages/networkadddlg.ui:115
 msgid "Server password:"
 msgstr "Пароль сервера:"
 
 #. ts-context NetworkAddDlg
-#: ../src/qtui/settingspages/networkadddlg.ui:130
+#: ../src/qtui/settingspages/networkadddlg.ui:131
 msgid "Use secure connection"
 msgstr "Использовать безопасное соединение"
 
@@ -3186,32 +4588,69 @@ msgid "Please enter a network name:"
 msgstr "Пожалуйста введите название сети:"
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:194
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Сервер: %1"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/client/networkmodel.cpp:197 ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Пользователи: %1"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:198
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/client/networkmodel.cpp:200 ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Лаг: %1 мс"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:830
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr ""
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:830
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Ников"
 
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:154
+msgid "Do you want to delete the following buffer(s) permanently?"
+msgid_plural "Do you want to delete the following buffer(s) permanently?"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:167
+msgid "...and <b>%1</b> more<br><br>"
+msgstr "... и <b> %1 </b> больше <br> <br>"
+
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:168
+msgid ""
+"<b>Note:</b> This will delete all related data, including all backlog data, "
+"from the core's database and cannot be undone."
+msgstr ""
+"<b>Замечание:</b> Это удалит все соответствующие данные, включае весь "
+"журнал, из базы данных ядра без возможности отмены."
+
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:172
+msgid "Remove buffers permanently?"
+msgstr "Удалить буфера навсегда?"
+
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:484
+msgid "Join Channel"
+msgstr "Зайти на канал"
+
 #. ts-context NetworkModelController::JoinDlg
-#: ../src/uisupport/networkmodelcontroller.cpp:477
+#: ../src/uisupport/networkmodelcontroller.cpp:489
 msgid "Channel:"
 msgstr "Канал:"
 
@@ -3221,60 +4660,45 @@ msgid "Setup Network Connection"
 msgstr "Настройка сетевого соединения"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
-msgid "Networks"
-msgstr "Сети"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:161
-msgid "<li>All networks need at least one server defined</li>"
-msgstr "<li>У каждой сети должен быть хотя бы один сервер</li>"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:163
-msgid "Invalid Network Settings"
-msgstr "Некорректные настройки сети"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:527
-msgid "Delete Network?"
-msgstr "Удалить сеть?"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:528
-msgid ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
-msgstr ""
-"Действительно удалить сеть \"%1\" и все сопутствующие данные, включая журнал?"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:123
+#: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgid "Network Details"
 msgstr "Подробности сети"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:131
+#: ../src/qtui/settingspages/networkssettingspage.ui:132
 msgid "Identity:"
 msgstr "Личность:"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:189
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:190
+#: ../src/qtui/ui/simplenetworkeditor.ui:63
 msgid "Servers"
 msgstr "Серверы"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:192
+#: ../src/qtui/settingspages/networkssettingspage.ui:193
 msgid "Manage servers for this network"
 msgstr "Управление серверами данной сети"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:216
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:217
+#: ../src/qtui/ui/simplenetworkeditor.ui:99
 msgid "&Edit..."
 msgstr "&Править..."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:339
+#: ../src/qtui/settingspages/networkssettingspage.ui:337
+msgid "Commands"
+msgstr "Команды"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:340
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
@@ -3283,12 +4707,12 @@ msgstr ""
 "команд при подключении к серверу"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:345
+#: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgid "Commands to execute on connect:"
 msgstr "При подключении выполнить команды:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:361
+#: ../src/qtui/settingspages/networkssettingspage.ui:362
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely "
@@ -3299,23 +4723,73 @@ msgstr ""
 "нужен редко!"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:491
-#: ../src/qtui/settingspages/networkssettingspage.ui:500
+#: ../src/qtui/settingspages/networkssettingspage.ui:383
+msgid "Automatically reconnect to the IRC network after connection failures"
+msgstr "Автоматически переподключиться к IRC сети после ошибки подключения"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:386
+msgid "Automatic Reconnect"
+msgstr "Автоматическое соединение"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:397
+msgid "Wait"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:404
+msgid " s"
+msgstr " сек"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:420
+msgid "between retries"
+msgstr "между повторениями"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:444
+msgid "Number of retries:"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:489
+msgid "Rejoin all channels after reconnect"
+msgstr "Перезайти на все каналы после переподключения"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:516
+#: ../src/qtui/settingspages/networkssettingspage.ui:525
 msgid "Auto Identify"
 msgstr "Автоматическая идентификация"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:515
+#: ../src/qtui/settingspages/networkssettingspage.ui:540
 msgid "NickServ"
 msgstr "NickServ"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:532
+#: ../src/qtui/settingspages/networkssettingspage.ui:557
 msgid "Service:"
 msgstr "Служба:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:569
+#: ../src/qtui/settingspages/networkssettingspage.ui:580
+msgid "Use SASL Authentication"
+msgstr "Использовать SASL Аутентификацию"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:625
+msgid "Account:"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:649
+msgid "Encodings"
+msgstr "Кодировки"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:652
 msgid ""
 "Configure advanced settings such as message encodings and automatic reconnect"
 msgstr ""
@@ -3323,18 +4797,18 @@ msgstr ""
 "автоматическое соединение"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:578
+#: ../src/qtui/settingspages/networkssettingspage.ui:661
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Управление кодировками для входящих и исходящих сообщений"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:566
-msgid "Encodings"
-msgstr "Кодировки"
+#: ../src/qtui/settingspages/networkssettingspage.ui:664
+msgid "Use Custom Encodings"
+msgstr "Использовать свои кодировки"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:592
-#: ../src/qtui/settingspages/networkssettingspage.ui:612
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
+#: ../src/qtui/settingspages/networkssettingspage.ui:695
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
@@ -3343,13 +4817,13 @@ msgstr ""
 "UTF-8 должен быть разумным выбором для большинства сетей."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:596
+#: ../src/qtui/settingspages/networkssettingspage.ui:679
 msgid "Send messages in:"
 msgstr "Отправлять сообщения в:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:623
-#: ../src/qtui/settingspages/networkssettingspage.ui:643
+#: ../src/qtui/settingspages/networkssettingspage.ui:706
+#: ../src/qtui/settingspages/networkssettingspage.ui:726
 msgid ""
 "Incoming messages encoded in Utf8 will always be treated as such.\n"
 "This setting defines the encoding for messages that are not Utf8."
@@ -3359,13 +4833,13 @@ msgstr ""
 "Эти настройки затрагивают только сообщения не в кодировке Utf8."
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:627
+#: ../src/qtui/settingspages/networkssettingspage.ui:710
 msgid "Receive fallback:"
 msgstr "Альтернативная входящая кодировка:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:654
-#: ../src/qtui/settingspages/networkssettingspage.ui:668
+#: ../src/qtui/settingspages/networkssettingspage.ui:737
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
 msgid ""
 "This specifies how control messages, nicks and servernames are encoded.\n"
 "Unless you *really* know what you do, leave this as ISO-8859-1!"
@@ -3375,44 +4849,37 @@ msgstr ""
 "1!"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:658
+#: ../src/qtui/settingspages/networkssettingspage.ui:741
 msgid "Server encoding:"
 msgstr "Кодировка сервера:"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:382
-msgid "Control automatic reconnect to the network"
-msgstr "Настройки автоматического соединения с сетью"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:385
-msgid "Automatic Reconnect"
-msgstr "Автоматическое соединение"
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:396
-msgid "Interval:"
-msgstr "Интервал:"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgid "Networks"
+msgstr "Сети"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:419
-msgid "Retries:"
-msgstr "Попыток:"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+msgid "<li>All networks need at least one server defined</li>"
+msgstr "<li>У каждой сети должен быть хотя бы один сервер</li>"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
-msgid "Rejoin all channels on reconnect"
-msgstr "Вернуться на все каналы при повторном соединении"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+msgid "Invalid Network Settings"
+msgstr "Некорректные настройки сети"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:336
-msgid "Commands"
-msgstr "Команды"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+msgid "Delete Network?"
+msgstr "Удалить сеть?"
 
 #. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:581
-msgid "Use Custom Encodings"
-msgstr "Использовать свои кодировки"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"
+msgstr ""
+"Действительно удалить сеть \"%1\" и все сопутствующие данные, включая журнал?"
 
 #. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
@@ -3439,22 +4906,28 @@ msgid "Notifications"
 msgstr "Уведомления"
 
 #. ts-context PhononNotificationBackend::ConfigWidget
-#: ../src/qtui/phononnotificationbackend.cpp:142
+#: ../src/qtui/phononnotificationbackend.cpp:143
 msgid "Select Audio File"
 msgstr "Выбрать звуковой файл"
 
 #. ts-context PhononNotificationConfigWidget
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:19
-msgid "Audio Notification (via Phonon)"
-msgstr "Звуковое уведомление (через Phonon)"
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
+msgid "Play a sound"
+msgstr ""
+
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
+msgid "Prelisten to the selected sound"
+msgstr "Предварительно прослушать выбранный звук"
 
 #. ts-context PhononNotificationConfigWidget
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:28
-msgid "Play File:"
-msgstr "Играть файл:"
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
+msgid "Select the sound file to play"
+msgstr "Выберите звуковой файл чтобы воспроизвести"
 
 #. ts-context PostgreSqlStorage
-#: ../src/core/postgresqlstorage.cpp:61
+#: ../src/core/postgresqlstorage.cpp:62
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 
@@ -3465,10 +4938,11 @@ msgstr "Всего запрашиваю сообщений: %1 для буфер
 
 #. ts-context QObject
 #: ../src/client/backlogrequester.cpp:106
-msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
+msgid ""
+"Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
-"Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные %"
-"2)"
+"Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные "
+"%2)"
 
 #. ts-context QObject
 #: ../src/client/backlogrequester.cpp:123
@@ -3495,7 +4969,7 @@ msgstr ""
 
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
@@ -3515,144 +4989,144 @@ msgid "Invalid subelement name in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
-msgstr ""
+msgstr "Недопустимый тип сообщения в %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
-msgstr ""
+msgstr "Недопустимая метка сообщения: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456 ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458 ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465 ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467 ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "год"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "день"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "ч"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "мин"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "сек"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:407
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Приват с %1</b>"
 
@@ -3672,22 +5146,22 @@ msgid "Abort"
 msgstr "Прервать"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:101
-msgid "Use SSL"
-msgstr "Использовать SSL"
-
-#. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:37
+#: ../src/qtui/settingspages/servereditdlg.ui:30
 msgid "Server Info"
 msgstr "Информация о сервере"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:155
+#: ../src/qtui/settingspages/servereditdlg.ui:94
+msgid "Use SSL"
+msgstr "Использовать SSL"
+
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:140
 msgid "SSL Version:"
 msgstr "Версия SSL:"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:162
+#: ../src/qtui/settingspages/servereditdlg.ui:147
 msgid ""
 "Do not change unless you're going to connect to a server not supporting "
 "SSLv3!"
@@ -3696,98 +5170,166 @@ msgstr ""
 "SSLv3!"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:166
+#: ../src/qtui/settingspages/servereditdlg.ui:151
 msgid "SSLv3 (default)"
 msgstr "SSLv3 (по умолчанию)"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+#: ../src/qtui/settingspages/servereditdlg.ui:156
 msgid "SSLv2"
 msgstr "SSLv2"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:176
+#: ../src/qtui/settingspages/servereditdlg.ui:161
 msgid "TLSv1"
 msgstr "TLSv1"
 
 #. ts-context ServerEditDlg
-#: ../src/qtui/settingspages/servereditdlg.ui:186
-msgid "Use a Proxy"
-msgstr "Использовать прокси"
+#: ../src/qtui/settingspages/servereditdlg.ui:213
+msgid "Proxy Host:"
+msgstr "Хост прокси:"
+
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:251
+msgid "Proxy Username:"
+msgstr "Имя пользователя прокси:"
 
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:261
+msgid "Proxy Password:"
+msgstr "Пароль прокси:"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/ui/settingsdlg.ui:14 ../src/qtui/ui/settingspagedlg.ui:14
+msgid "Configure Quassel"
+msgstr "Настроить Quassel"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:77 ../src/qtui/ui/settingsdlg.ui:34
-#: ../src/qtui/ui/settingsdlg.ui:49
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
+#: ../src/qtui/settingsdlg.cpp:99 ../src/qtui/ui/settingspagedlg.ui:30
 msgid "Settings"
 msgstr "Настройки"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:87
+#: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:88
+#: ../src/qtui/settingsdlg.cpp:110
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
 msgstr "В текущей вкладке есть несохранённые изменения. Применить их сейчас?"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:171
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
+#: ../src/qtui/settingspagedlg.cpp:36
+msgid "Configure %1"
+msgstr "Настроить %1"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193 ../src/qtui/settingspagedlg.cpp:104
 msgid "Reload Settings"
 msgstr "Вернуть настройки"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:171
-msgid "Do you like to reload the settings, undoing your changes on this page?"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193 ../src/qtui/settingspagedlg.cpp:104
+msgid ""
+"Do you like to reload the settings, undoing your changes on this page?"
 msgstr "Вернуть старый настройки, отменив все изменения на этой вкладке?"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:180
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
 msgid "Restore Defaults"
 msgstr "Вернуть умолчания"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:180
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
 msgid "Do you like to restore the default values for this page?"
 msgstr "Вернуть параметры по-умолчанию для этой вкладки?"
 
-#. ts-context SettingsDlg
-#: ../src/qtui/ui/settingsdlg.ui:13
-msgid "Configure Quassel"
-msgstr "Настроить Quassel"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+msgid "Action"
+msgstr ""
 
-#. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:100 ../src/qtui/settingsdlg.cpp:104
-msgid "Configure %1"
-msgstr "Настроить %1"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
 
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:1030
-msgid "Disconnecting"
-msgstr "Отсоединяюсь"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgid "Search:"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgid "Default:"
+msgstr "По умолчанию:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgid "Custom:"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:865
+#: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
 msgstr "Пир попытался отправить пакет больше максимального размера!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:870
+#: ../src/common/signalproxy.cpp:885
 msgid "Peer tried to send 0 byte package!"
 msgstr "Пир попытался отправить пакет из 0 байт!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:887
+#: ../src/common/signalproxy.cpp:902
 msgid "Peer sent corrupted compressed data!"
 msgstr "Пир отправил испорченные сжатые данные!"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:902
+#: ../src/common/signalproxy.cpp:917
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr "Пир отправил испорченные данные: не могу загрузить QVariant!"
 
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:1050
+msgid "Disconnecting"
+msgstr "Отсоединяюсь"
+
 #. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:35
 msgid "The name of the IRC network you are configuring"
@@ -3828,7 +5370,7 @@ msgstr ""
 "подключении к сети"
 
 #. ts-context SqliteStorage
-#: ../src/core/sqlitestorage.cpp:49
+#: ../src/core/sqlitestorage.cpp:52
 msgid ""
 "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 "
@@ -3842,98 +5384,138 @@ msgstr ""
 "ваше ядро Quassel должно хранить данные на той же машине, на которой "
 "запущено, и если вашим ядром не будет пользоваться много народу."
 
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:568
-msgid "SSL Certificate used by %1"
-msgstr "Сертификат SSL используется %1"
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:14
+msgid "Security Information"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:22
+msgid "<b>Hostname:</b>"
+msgstr ""
 
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:572
-msgid "Issuer Info"
-msgstr "Сертификат выдан"
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:39
+msgid "<b>IP address:</b>"
+msgstr ""
 
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:574 ../src/qtui/coreconnectdlg.cpp:583
-msgid "Organization:"
-msgstr "Организация:"
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:56
+msgid "<b>Encryption:</b>"
+msgstr ""
 
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:575 ../src/qtui/coreconnectdlg.cpp:584
-msgid "Locality Name:"
-msgstr "Название местности:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:576 ../src/qtui/coreconnectdlg.cpp:585
-msgid "Organizational Unit Name:"
-msgstr "Название отделения:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:577 ../src/qtui/coreconnectdlg.cpp:586
-msgid "Country Name:"
-msgstr "Страна:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:578 ../src/qtui/coreconnectdlg.cpp:587
-msgid "State or Province Name:"
-msgstr "Название штата или области:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:581
-msgid "Subject Info"
-msgstr "Информация о субъекте"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:590
-msgid "Additional Info"
-msgstr "Дополнительная информация"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:592
-msgid "Valid From:"
-msgstr "Годен с:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:593
-msgid "Valid To:"
-msgstr "Годен по:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:596
-msgid "Hostname %1:"
-msgstr "Хост %1:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:600
-msgid "E-Mail Address %1:"
-msgstr "E-Mail %1:"
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:602
-msgid "Digest:"
-msgstr "Хеш:"
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:73
+msgid "<b>Protocol:</b>"
+msgstr ""
 
-#. ts-context SystrayNotificationBackend::ConfigWidget
-#: ../src/qtui/systraynotificationbackend.cpp:122
-msgid "System Tray Icon"
-msgstr "Значок в трее"
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:90
+msgid "<b>Certificate chain:</b>"
+msgstr ""
 
-#. ts-context SystrayNotificationBackend::ConfigWidget
-#: ../src/qtui/systraynotificationbackend.cpp:123
-msgid "Animate"
-msgstr "Анимировать"
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:120
+msgid "Subject"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+msgid "<b>Common name:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+msgid "<b>Organization:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+msgid "<b>Organizational unit:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+msgid "<b>Country:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+msgid "<b>State or province:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+msgid "<b>Locality:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:242
+msgid "Issuer"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:367
+msgid "<b>Validity period:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:384
+msgid "<b>MD5 digest:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:401
+msgid "<b>SHA1 digest:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:431
+msgid "<b>Trusted:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:69
+msgid "Yes"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:71
+msgid "No, for the following reasons:<ul>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:78
+msgid "%1 to %2"
+msgstr ""
+
+#. ts-context StatusBufferItem
+#: ../src/client/networkmodel.h:144
+msgid "Status Buffer"
+msgstr "Буфер состояния"
+
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+msgid "&Minimize"
+msgstr ""
+
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:94
+msgid "&Restore"
+msgstr ""
 
 #. ts-context SystrayNotificationBackend::ConfigWidget
-#: ../src/qtui/systraynotificationbackend.cpp:125
-msgid "Show bubble"
-msgstr "Показывать всплывающее уведомление"
+#: ../src/qtui/systraynotificationbackend.cpp:135
+msgid "Show a message in a popup"
+msgstr ""
 
 #. ts-context TaskbarNotificationBackend::ConfigWidget
-#: ../src/qtui/taskbarnotificationbackend.cpp:67
+#: ../src/qtui/taskbarnotificationbackend.cpp:68
 msgid "Activate dock entry, timeout:"
 msgstr "Активация дока, таймаут:"
 
 #. ts-context TaskbarNotificationBackend::ConfigWidget
-#: ../src/qtui/taskbarnotificationbackend.cpp:69
+#: ../src/qtui/taskbarnotificationbackend.cpp:70
 msgid "Mark taskbar entry, timeout:"
 msgstr "Отметка на панели задач, таймаут:"
 
@@ -3957,6 +5539,11 @@ msgstr "Покинуть выделенный канал"
 msgid "Join a channel"
 msgstr "Зайти на канал"
 
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
+msgid "Query"
+msgstr "Приват"
+
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Start a private conversation"
@@ -4027,6 +5614,11 @@ msgstr "Забанить"
 msgid "Ban user from channel"
 msgstr "Запретить пользователю вход на канал"
 
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
+msgid "Kick/Ban"
+msgstr "Выгнать"
+
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Remove and ban user from channel"
@@ -4042,11 +5634,6 @@ msgstr "Подключиться ко всем"
 msgid "Disconnect from all"
 msgstr "Отключиться от всех"
 
-#. ts-context TopicWidgetSettingsPage
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
-msgid "Topic Widget"
-msgstr ""
-
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
 msgid "Resize dynamically to fit contents"
@@ -4057,1669 +5644,171 @@ msgstr ""
 msgid "On hover only"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:695
-msgid "<%1>"
-msgstr "<%1>"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:659 ../src/uisupport/uistyle.cpp:697
-msgid "[%1]"
-msgstr "[%1]"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:713
-msgid "<-x"
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgid "Topic Widget"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:717
-#: ../src/uisupport/uistyle.cpp:719 ../src/uisupport/uistyle.cpp:723
-msgid "*"
-msgstr "*"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:705
-msgid "-->"
-msgstr "-->"
-
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:578
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr ""
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:582
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:583
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:587
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:588
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:592
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:600
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:607
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
-msgstr ""
+msgstr "%DN%1%DN был выкинут %DN%2%DN из %DC%3%DC"
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:624
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
-msgstr ""
+msgstr "{Новые сутки. Сегодня: % 1}"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:636
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
+"Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей присоединилось: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:640 ../src/uisupport/uistyle.cpp:655
+#: ../src/uisupport/uistyle.cpp:645 ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:650
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
-msgstr ""
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:707 ../src/uisupport/uistyle.cpp:709
-msgid "<--"
-msgstr "<--"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:711
-msgid "<-*"
-msgstr "<-*"
+msgstr "Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей вышло: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:721
-msgid "-"
-msgstr ""
+#: ../src/uisupport/uistyle.cpp:667 ../src/uisupport/uistyle.cpp:705
+msgid "[%1]"
+msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:725
-msgid "=>"
-msgstr ""
+#: ../src/uisupport/uistyle.cpp:703
+msgid "<%1>"
+msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:727
-msgid "<="
-msgstr ""
+#: ../src/uisupport/uistyle.cpp:707
+msgid "-*-"
+msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:701
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:699
-msgid "-*-"
-msgstr "-*-"
-
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:675
-msgid "%n Owner(s)"
-msgid_plural "%n Owner(s)"
-msgstr[0] "%n владелец"
-msgstr[1] "%n владельца"
-msgstr[2] "%n владельцев"
-
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:676
-msgid "%n Admin(s)"
-msgid_plural "%n Admin(s)"
-msgstr[0] "%n администратор"
-msgstr[1] "%n администратора"
-msgstr[2] "%n администраторов"
-
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:677
-msgid "%n Operator(s)"
-msgid_plural "%n Operator(s)"
-msgstr[0] "%n оператор"
-msgstr[1] "%n операторов"
-msgstr[2] "%n операторов"
-
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:678
-msgid "%n Half-Op(s)"
-msgid_plural "%n Half-Op(s)"
-msgstr[0] "%n полуоператор"
-msgstr[1] "%n полуоператоров"
-msgstr[2] "%n полуоператоров"
-
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:679
-msgid "%n Voiced"
-msgid_plural "%n Voiced"
-msgstr[0] "%n с голосом"
-msgstr[1] "%n с голосом"
-msgstr[2] "%n с голосом"
-
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:680
-msgid "%n User(s)"
-msgid_plural "%n User(s)"
-msgstr[0] "%n пользователь"
-msgstr[1] "%n пользователя"
-msgstr[2] "%n пользователей"
-
-#~ msgid "Day changed to %1"
-#~ msgstr "День сменился на %1"
-
-#. ts-context AboutDlg
-#~ msgid ""
-#~ "<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2008 by the "
-#~ "Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-irc."
-#~ "org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a "
-#~ "href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
-#~ "licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</"
-#~ "a> and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>."
-#~ "<br>Most icons are &copy; by the <a href=\"http://www.oxygen-icons.org"
-#~ "\">Oxygen Team</a> and used under the <a href=\"http://www.gnu.org/"
-#~ "licenses/lgpl.html\">LGPL</a>.<br><br>Please use <a href=\"http://bugs."
-#~ "quassel-irc.org\">http://bugs.quassel-irc.org</a> to report bugs."
-#~ msgstr ""
-#~ "<b>Современный, распределённый клиент IRC</b><br><br>&copy;2005-2008 "
-#~ "Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-irc."
-#~ "org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> в сети "
-#~ "<a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC "
-#~ "распространяется по двойной лицензии <a href=\"http://www.gnu.org/"
-#~ "licenses/gpl-2.0.txt\">GPLv2</a> и <a href=\"http://www.gnu.org/licenses/"
-#~ "gpl-3.0.txt\">GPLv3</a>.<br>Большинство значков &copy;  <a href=\"http://"
-#~ "www.oxygen-icons.org\">Команда Oxygen</a> и используются по лицензии <a "
-#~ "href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Об "
-#~ "ошибках пожалуйста сообщайте на  <a href=\"http://bugs.quassel-irc.org"
-#~ "\">http://bugs.quassel-irc.org</a>."
-
-#. ts-context AboutDlg
-#~ msgid ""
-#~ "Special thanks goes to:<br><dl><dt><b>John \"nox-Hand\" Hand</b></"
-#~ "dt><dd>for great artwork and the Quassel logo/icon</dt><dt><b><a href="
-#~ "\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
-#~ "creating most of the other shiny icons you see throughout Quassel</"
-#~ "dd><dt><b><a href=\"http://www.trolltech.com\">Trolltech</a></b></"
-#~ "dt><dd>for creating Qt and Qtopia, and for sponsoring development of "
-#~ "Quasseltopia with Greenphones and more</dd>"
-#~ msgstr ""
-#~ "Особая благодарность:<br><dl><dt><b>John \"nox-Hand\" Hand</b></dt><dd>за "
-#~ "прекрасную графическую работу и логотип/значок Quassel</dt><dt><b><a href="
-#~ "\"http://www.oxygen-icons.org\">Команде Oxygen</a></b></dt><dd>за "
-#~ "создания большинства шикарных значков, которые вы видите в Quassel</"
-#~ "dd><dt><b><a href=\"http://www.trolltech.com\">Trolltech</a></b></"
-#~ "dt><dd>за создание Qt и Qtopia, и за поддержку развития Quasseltopia с "
-#~ "помощью Greenphones и прочего</dd>"
-
-#. ts-context AboutDlg
-#~ msgid ""
-#~ "Special thanks goes to:<br><dl><dt><b>John \"nox\" Hand</b></dt><dd>for "
-#~ "great artwork and the Quassel logo/icon</dt><dt><b><a href=\"http://www."
-#~ "oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for creating most of "
-#~ "the other shiny icons you see throughout Quassel</dd><dt><b><a href="
-#~ "\"http://www.trolltech.com\">Qt Software formerly known as Trolltech</a></"
-#~ "b></dt><dd>for creating Qt and Qtopia, and for sponsoring development of "
-#~ "QuasselTopia with Greenphones and more</dd><dt><b><a href=\"http://www."
-#~ "nokia.com\">Nokia</a></b></dt><dd>for keeping Qt alive, and for "
-#~ "sponsoring development of Quassel Mobile with N810s</dd>"
-#~ msgstr ""
-#~ "Особая благодарность:<br><dl><dt><b>John \"nox-Hand\" Hand</b></dt><dd>за "
-#~ "прекрасную графическую работу и логотип/значок Quassel</dt><dt><b><a href="
-#~ "\"http://www.oxygen-icons.org\">Команде Oxygen</a></b></dt><dd>за "
-#~ "создания большинства шикарных значков, которые вы видите в Quassel</"
-#~ "dd><dt><b><a href=\"http://www.trolltech.com\">Qt Software, ранее "
-#~ "известная как Trolltech</a></b></dt><dd>за создание Qt и Qtopia, и за "
-#~ "поддержку развития QuasselTopia с помощью Greenphones и прочего</"
-#~ "dd><dt><b><a href=\"http://www.nokia.com\">Nokia</a></b></dt><dd>за "
-#~ "поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью "
-#~ "N810</dd>"
-
-#. ts-context AliasesSettingsPage
-#~ msgid "Behaviour"
-#~ msgstr "Поведение"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Appearance"
-#~ msgstr "Вид"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "General"
-#~ msgstr "Общие"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Client style:"
-#~ msgstr "Стиль клиента:"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Language:"
-#~ msgstr "Язык:"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Note: needs client restart for full effect!"
-#~ msgstr "Замечание: для полного эффекта нужно перезапустить клиент!"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Misc:"
-#~ msgstr "Прочее:"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Show Web Previews"
-#~ msgstr "Показывать предварительный просмотр веб-ссылок"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Use Icons to represent away state of Users"
-#~ msgstr "Отображать состояние пользователей значками"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Fonts"
-#~ msgstr "Шрифты"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Set font for the main chat window and the chat monitor"
-#~ msgstr "Задаёт шрифт главного окна чата и монитора чата"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Chat window:"
-#~ msgstr "Окно чата:"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Font"
-#~ msgstr "Шрифт"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Choose..."
-#~ msgstr "Выбрать..."
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Set font for channel and nick lists"
-#~ msgstr "Задаёт шрифт списков каналов и ников"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Channel list:"
-#~ msgstr "Список каналов:"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Set font for the input line"
-#~ msgstr "Задаёт шрифт для строки ввода"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Input line:"
-#~ msgstr "Строка ввода:"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid ""
-#~ "Show a website preview window when hovering the mouse over a web address"
-#~ msgstr ""
-#~ "Показывать предварительный просмотр вебсайта при наведении мышью на адрес"
-
-#. ts-context AppearanceSettingsPage
-#~ msgid "Show previews of webpages on URL hover"
-#~ msgstr "Показывать эскиз вебсайта при наведении на URL"
+#: ../src/uisupport/uistyle.cpp:713
+msgid "-->"
+msgstr "-->"
 
-#. ts-context AppearanceSettingsPage
-#~ msgid "Show status icons in channel and nick lists"
-#~ msgstr "Показывать значки статус в списках каналов и ников"
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:717
+msgid "<--"
+msgstr "<--"
 
-#. ts-context AppearanceSettingsPage
-#~ msgid "Use icons in channel and nick lists"
-#~ msgstr "Использовать значки в списках"
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:719
+msgid "<-*"
+msgstr "<-*"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "Backlog Request Method:"
-#~ msgstr "Метод запроса журнала:"
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:721
+msgid "<-x"
+msgstr "<-x"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "Fixed Amount per Buffer"
-#~ msgstr "Фиксированная длина для каждого буфера"
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:723 ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727 ../src/uisupport/uistyle.cpp:731
+msgid "*"
+msgstr "*"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "Unread Messages per Buffer"
-#~ msgstr "Непрочитанные сообщения для каждого буфера"
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:729
+msgid "-"
+msgstr "-"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "Global Unread Messages"
-#~ msgstr "Глобальное количество непрочитанных сообщений"
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:733
+msgid "=>"
+msgstr "=>"
 
-#. ts-context BacklogSettingsPage
-#~ msgid ""
-#~ "The simplest Requester. It fetches a fixed amount of lines for each "
-#~ "buffer from the Backlog."
-#~ msgstr ""
-#~ "Простейший вариант. Запрашивает фиксированное количество строк для "
-#~ "каждого буфера из журнала."
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:735
+msgid "<="
+msgstr "<="
 
-#. ts-context BacklogSettingsPage
-#~ msgid ""
-#~ "This requester fetches unread messages for each buffer individually. The "
-#~ "amount of lines can be limited per buffer.\n"
-#~ "\n"
-#~ "You can also chose to fetch additional older chatlines to provide a "
-#~ "better context."
-#~ msgstr ""
-#~ "Этот метод запрашивает непрочитанные сообщения для каждого буфера "
-#~ "индивидуально. Количество строк может быть ограничено для каждого "
-#~ "буфера.\n"
-#~ "\n"
-#~ "Также можно запрашивать дополнительное количество старых строк для "
-#~ "лучшего контекста."
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+msgid "->"
+msgstr "->"
 
-#. ts-context BacklogSettingsPage
-#~ msgid ""
-#~ "This requester fetches all messages newer than the oldest unread message "
-#~ "for all buffers. \n"
-#~ "This requester determines which is the oldest read message of all buffers "
-#~ "and then requests one large chunk of messages across all buffers.\n"
-#~ "\n"
-#~ "Note: this requester is not recommended if you use hidden buffer or have "
-#~ "inactive buffers (i.e.: no stale queries or channels).\n"
-#~ "It is useful to limit the total amount of the backlog and is probably the "
-#~ "fastest.\n"
-#~ "\n"
-#~ "You can also chose to fetch additional older chatlines to provide a "
-#~ "better context similar."
-#~ msgstr ""
-#~ "Этот метод запрашивает все сообщения новее, чем самое старое сообщение из "
-#~ "каждого буфера. Этот метод определяет самое старое прочитанное сообщение "
-#~ "из всех буферов и затем запрашивает один большой кусок сообщений со всех "
-#~ "буферовПримечание: не рекомендуется использовать этот метод, если "
-#~ "используются скрытые буфера или есть неактивные буфера (например "
-#~ "оконченные диалоги или каналы).Полезно его использовать для ограничения "
-#~ "общего объёма журнала и достижение максимальной скорости.Также можно "
-#~ "запросить дополнительно старые строки для лучшего контекста."
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:702
+msgid "%n User(s)"
+msgid_plural "%n User(s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. ts-context BacklogSettingsPage
-#~ msgid ""
-#~ "This requester fetches all messages newer than the oldest unread message "
-#~ "for all buffers.\n"
-#~ "\n"
-#~ "Note: this requester is not recommended if you use hidden buffer or have "
-#~ "inactive buffers (i.e.: no stale queries or channels).\n"
-#~ "It is useful to limit the total amount of the backlog and is probably the "
-#~ "fastest.\n"
-#~ "\n"
-#~ "You can also chose to fetch additional older chatlines to provide a "
-#~ "better context similar."
-#~ msgstr ""
-#~ "Этот метод запрашивает для каждого буфера все сообщения новее чем самое "
-#~ "старое непрочитанное сообщение.\n"
-#~ "\n"
-#~ "Примечание: этот метод не рекомендуется, при использовании скрытых или "
-#~ "неактивных буферов (например, пустующих диалогов или каналов).\n"
-#~ "Он полезен для ограничения общего размера журнала, и является, вероятно, "
-#~ "самым быстрым.\n"
-#~ "\n"
-#~ "Также можно запрашивать дополнительные старые строки для лучшего "
-#~ "контекста."
+#~ msgid "Finger"
+#~ msgstr "Finger"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "FixedBacklogAmount"
-#~ msgstr "FixedBacklogAmount"
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] сообщение неактивности: %1"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "PerBufferUnreadBacklogLimit"
-#~ msgstr "PerBufferUnreadBacklogLimit"
+#~ msgid "Hide inactive buffers:"
+#~ msgstr "Скройть неактивные буфера:"
 
-#. ts-context BacklogSettingsPage
-#~ msgid "PerBufferUnreadBacklogAdditional"
-#~ msgstr "PerBufferUnreadBacklogAdditional"
-
-#. ts-context BacklogSettingsPage
-#~ msgid "GlobalUnreadBacklogLimit"
-#~ msgstr "GlobalUnreadBacklogLimit"
-
-#. ts-context BacklogSettingsPage
-#~ msgid "GlobalUnreadBacklogAdditional"
-#~ msgstr "GlobalUnreadBacklogAdditional"
-
-#. ts-context BacklogSettingsPage
-#~ msgid "DynamicBacklogAmount"
-#~ msgstr "DynamicBacklogAmount"
-
-#. ts-context BacklogSettingsPage
-#~ msgid ""
-#~ "This requester fetches unread messages for each buffer individually. The "
-#~ "amount of lines can be limited per buffer.\n"
-#~ "\n"
-#~ "You can also choose to fetch additional older chatlines to provide a "
-#~ "better context."
-#~ msgstr ""
-#~ "Этот метод запрашивает непрочитанные сообщения для каждого буфера "
-#~ "индивидуально. Количество строк может быть ограничено для каждого "
-#~ "буфера.\n"
-#~ "\n"
-#~ "Также можно запрашивать дополнительное количество старых строк для "
-#~ "лучшего контекста."
-
-#. ts-context BufferView
-#~ msgid "Show Channel List"
-#~ msgstr "Показать список каналов"
-
-#. ts-context BufferView
-#~ msgid "Connect"
-#~ msgstr "Соединиться"
-
-#. ts-context BufferView
-#~ msgid "Disconnect"
-#~ msgstr "Отсоединиться"
-
-#. ts-context BufferView
-#~ msgid "Join Channel"
-#~ msgstr "Зайти на канал"
-
-#. ts-context BufferView
-#~ msgid "Join"
-#~ msgstr "Зайти"
-
-#. ts-context BufferView
-#~ msgid "Part"
-#~ msgstr "Выйти"
-
-#. ts-context BufferView
-#~ msgid "Hide buffers"
-#~ msgstr "Спрятать буферы"
-
-#. ts-context BufferView
-#~ msgid "Hide buffers permanently"
-#~ msgstr "Спрятать буферы навсегда"
-
-#. ts-context BufferView
-#~ msgid "Delete buffer"
-#~ msgstr "Удалить буфер"
-
-#. ts-context BufferView
-#~ msgid "Ignore list"
-#~ msgstr "Список игнорируемых"
-
-#. ts-context BufferView
-#~ msgid "Join Events"
-#~ msgstr "Вход на канал"
-
-#. ts-context BufferView
-#~ msgid "Part Events"
-#~ msgstr "Выход с канала"
-
-#. ts-context BufferView
-#~ msgid "Quit Events"
-#~ msgstr "Выход из IRC"
-
-#. ts-context BufferView
-#~ msgid "Mode Events"
-#~ msgstr "Смена режимов"
-
-#. ts-context BufferView
-#~ msgid "Hide Events"
-#~ msgstr "Спрятать события"
-
-#. ts-context BufferView
-#~ msgid "Input channel name:"
-#~ msgstr "Введите название канала:"
-
-#. ts-context BufferView
-#~ msgid "Remove buffer permanently?"
-#~ msgstr "Удалить буфер навсегда?"
-
-#. ts-context BufferView
-#~ msgid ""
-#~ "Do you want to delete the buffer \"%1\" permanently? This will delete all "
-#~ "related data, including all backlog data, from the core's database!"
-#~ msgstr ""
-#~ "Удалить буфер \"%1\" навсегда? Это удалить все относящиеся к нему данные, "
-#~ "включая историю, из базы данных ядра!"
-
-#. ts-context BufferView
-#~ msgid "Joins"
-#~ msgstr "Входы"
-
-#. ts-context BufferView
-#~ msgid "Parts"
-#~ msgstr "Выходы из канала"
-
-#. ts-context BufferView
-#~ msgid "Quits"
-#~ msgstr "Выходы из сети"
-
-#. ts-context BufferView
-#~ msgid "Nick Changes"
-#~ msgstr "Смены ника"
-
-#. ts-context BufferView
-#~ msgid "Mode"
-#~ msgstr "Режимы"
-
-#. ts-context BufferView
-#~ msgid "Day Change"
-#~ msgstr "Смены дня"
-
-#. ts-context BufferViewDock
-#~ msgid "All Buffers"
-#~ msgstr "Все буфера"
-
-#. ts-context BufferViewEditDlg
-#~ msgid "Please enter a name for the buffer view:"
-#~ msgstr "Пожалуйста введите названия нового списка буферов:"
-
-#. ts-context BufferViewEditDlg
-#~ msgid "Add Buffer View"
-#~ msgstr "Добавить список буферов"
-
-#. ts-context BufferViewFilter
-#~ msgid "Edit Mode"
-#~ msgstr "Режим правки"
-
-#. ts-context BufferViewFilter
-#~ msgid "Show / Hide buffers"
-#~ msgstr "Показать / спрятать буферы"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Buffer Views"
-#~ msgstr "Списки буферов"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Delete Buffer View?"
-#~ msgstr "Удалить список буферов?"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Do you really want to delete the buffer view \"%1\"?"
-#~ msgstr "Вы действительно хотите удалить список буферов \"%1\"?"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Buffer View  Settings"
-#~ msgstr "Настройки списка буферов"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Restrict Buffers to:"
-#~ msgstr "Ограничить буфера:"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Status Buffers"
-#~ msgstr "Буфера состояния"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Channel Buffers"
-#~ msgstr "Буфера каналов"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Query Buffers"
-#~ msgstr "Буфера диалогов"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Hide inactive Buffers"
-#~ msgstr "Спрятать неактивные буфера"
-
-#. ts-context BufferViewSettingsPage
-#~ msgid "Add new Buffers automatically"
-#~ msgstr "Автоматически добавлять новые буфера"
-
-#. ts-context BufferWidget
-#~ msgid "Enlarge Chat View"
-#~ msgstr "Увеличить окно чата"
-
-#. ts-context BufferWidget
-#~ msgid "Ctrl++"
-#~ msgstr "Ctrl++"
-
-#. ts-context BufferWidget
-#~ msgid "Demagnify Chat View"
-#~ msgstr "Уменьшить окно чата"
-
-#. ts-context BufferWidget
-#~ msgid "Ctrl+-"
-#~ msgstr "Ctrl+-"
-
-#. ts-context BufferWidget
-#~ msgid "Normalize zoom of Chat View"
-#~ msgstr "Нормализовать окно чата"
-
-#. ts-context BufferWidget
-#~ msgid "Ctrl+0"
-#~ msgstr "Ctrl+0"
-
-#. ts-context BufferWidget
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-#~ "REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
-#~ "css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'Trebuchet MS'; font-size:13pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px;\"><img src=\":/pics/"
-#~ "quassel-large.png\" /><span style=\" font-size:89pt; color:#00008b;"
-#~ "\">uassel IRC</span></p>\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;\"><span "
-#~ "style=\" font-size:22pt;\">Chat comfortably. Anywhere.</span></p></body></"
-#~ "html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-#~ "REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1"
-#~ "\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></"
-#~ "head><body style=\" font-family:'Trebuchet MS'; font-size:13pt; font-"
-#~ "weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-"
-#~ "bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-#~ "indent:0px;\"><img src=\":/pics/quassel-large.png\" /><span style=\" font-"
-#~ "size:89pt; color:#00008b;\">uassel IRC</span></p><p style=\" margin-"
-#~ "top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-"
-#~ "indent:0; text-indent:0px; font-size:49pt;\"><span style=\" font-"
-#~ "size:22pt;\">Разговаривать удобно. Везде.</span></p></body></html>"
-
-#. ts-context BufferWidget
-#~ msgid "Zoom Original"
-#~ msgstr "Восстановить размер"
-
-#. ts-context ChannelListDlg
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-#~ "REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
-#~ "css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
-#~ "font-weight:400; font-style:normal;\">\n"
-#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-#~ "Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</p>\n"
-#~ "<p style=\"-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:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
-#~ msgstr ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-#~ "REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1"
-#~ "\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></"
-#~ "head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-#~ "weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-"
-#~ "bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-#~ "indent:0px; font-family:'Lucida Grande'; font-size:13pt;\">СУПЕР ЗЛАЯ "
-#~ "НЕПОПРАВИМАЯ ОШИБКА!!11адин</p><p style=\"-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:'Lucida Grande'; font-"
-#~ "size:13pt;\"></p></body></html>"
-
-#. ts-context ChatMonitorSettingsPage
-#~ msgid "Available Buffers:"
-#~ msgstr "Доступные буферы:"
-
-#. ts-context ChatMonitorView
-#~ msgid "Show network name"
-#~ msgstr "Показывать название сети"
-
-#. ts-context ChatMonitorView
-#~ msgid "Show buffer name"
-#~ msgstr "Показывать название буфера"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Timestamp:"
-#~ msgstr "Время:"
-
-#. ts-context Client
-#~ msgid "Default Identity"
-#~ msgstr "Личность по умолчанию"
-
-#. ts-context ClientSyncer
-#~ msgid "Internal connections not yet supported."
-#~ msgstr "Внутренние соединения пока не поддерживаются."
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color settings"
-#~ msgstr "Настройки цвета"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Bufferview"
-#~ msgstr "Список буферов"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Activities:"
-#~ msgstr "Активности:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "FG"
-#~ msgstr "Текст"
-
-#. ts-context ColorSettingsPage
-#~ msgid "BG"
-#~ msgstr "Фон"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Use BG"
-#~ msgstr "Использовать фон"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Default:"
-#~ msgstr "По умолчанию:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Inactive:"
-#~ msgstr "Неактивно:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Highlight:"
-#~ msgstr "Подсветка:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "New Message:"
-#~ msgstr "Новое сообщение:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Other Activity:"
-#~ msgstr "Другая активность:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "1"
-#~ msgstr "1"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Chatview"
-#~ msgstr "Окно чата"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Server Activity"
-#~ msgstr "Активность сервера"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Foreground"
-#~ msgstr "Текст"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Background"
-#~ msgstr "Фон"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Error Message:"
-#~ msgstr "Сообщение об ошибке:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Notice Message:"
-#~ msgstr "Уведомление:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Plain Message:"
-#~ msgstr "Простое сообщение:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Server Message:"
-#~ msgstr "Сообщение сервера:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Highlight Message:"
-#~ msgstr "Подсвеченное сообщение:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "User Activity"
-#~ msgstr "Пользовательская активность"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Action Message:"
-#~ msgstr "Сообщение о действии:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Join Message:"
-#~ msgstr "Сообщение о входе:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Kick Message:"
-#~ msgstr "Сообщение об изгнании:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Mode Message:"
-#~ msgstr "Сообщение о смене режима:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Part Message:"
-#~ msgstr "Сообщение об уходе:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Quit Message:"
-#~ msgstr "Сообщение о выходе:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Rename Message:"
-#~ msgstr "Сообщение о переименовании:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Message"
-#~ msgstr "Сообщение"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Sender:"
-#~ msgstr "Отправитель:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Nick:"
-#~ msgstr "Ник:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Hostmask:"
-#~ msgstr "Маска:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Channelname:"
-#~ msgstr "Канал:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Mode flags:"
-#~ msgstr "Режимы:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Url:"
-#~ msgstr "Адрес:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "New Message Marker:"
-#~ msgstr "Маркер новых сообщений:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Mirc Color Codes"
-#~ msgstr "Цвета mIRC"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color Codes"
-#~ msgstr "Цвета"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 0:"
-#~ msgstr "Цвет 0:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 1:"
-#~ msgstr "Цвет 1:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 2:"
-#~ msgstr "Цвет 2:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 3:"
-#~ msgstr "Цвет 3:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 4:"
-#~ msgstr "Цвет 4:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 5:"
-#~ msgstr "Цвет 5:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 6:"
-#~ msgstr "Цвет 6:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 7:"
-#~ msgstr "Цвет 7:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 8:"
-#~ msgstr "Цвет 8:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 14:"
-#~ msgstr "Цвет 14:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 15:"
-#~ msgstr "Цвет 15:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 13:"
-#~ msgstr "Цвет 13:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 12:"
-#~ msgstr "Цвет 12:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 11:"
-#~ msgstr "Цвет 11:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 10:"
-#~ msgstr "Цвет 10:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Color 9:"
-#~ msgstr "Цвет 9:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Nickview"
-#~ msgstr "Список  ников"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Nick status:"
-#~ msgstr "Состояние ника:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Online:"
-#~ msgstr "Онлайн:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Away:"
-#~ msgstr "Отсутствует:"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Enable"
-#~ msgstr "Включено"
-
-#. ts-context ColorSettingsPage
-#~ msgid "Sender auto coloring:"
-#~ msgstr "Автоматическая раскраска отправителя:"
-
-#. ts-context ContextMenuActionProvider
-#~ msgid "Delete Buffer(s)..."
-#~ msgstr "Удалить буфер(а)..."
-
-#. ts-context ContextMenuActionProvider
-#~ msgid "Show Buffer"
-#~ msgstr "Показать буфер"
-
-#. ts-context NickView
-#~ msgid "Ignore"
-#~ msgstr "Игнорировать"
-
-#. ts-context ContextMenuActionProvider
-#~ msgid "Hide Buffer(s) Temporarily"
-#~ msgstr "Временно спрятать буфер(а)"
-
-#. ts-context ContextMenuActionProvider
-#~ msgid "Hide Buffer(s) Permanently"
-#~ msgstr "Навсегда спрятать буфер(а)"
-
-#. ts-context Core
-#~ msgid ""
-#~ "Currently, Quassel only supports SQLite3. You need to build your\n"
-#~ "Qt library with the sqlite plugin enabled in order for quasselcore\n"
-#~ "to work."
-#~ msgstr ""
-#~ "В настоящий момент Quassel поддерживает только SQLite3. Вам нужно\n"
-#~ "собрать собственную библиотеку Qt с включенным плагином sqlite\n"
-#~ "чтобы quasselcore заработал."
-
-#. ts-context CoreApplicationInternal
-#~ msgid "The port quasselcore will listen at"
-#~ msgstr "Порт, который будет прослушивать ядро"
-
-#. ts-context CoreApplicationInternal
-#~ msgid "Don't restore last core's state"
-#~ msgstr "Не восстанавливать предыдущее состояние ядра"
-
-#. ts-context CoreApplicationInternal
-#~ msgid "Path to logfile"
-#~ msgstr "Путь к журналу"
-
-#. ts-context CoreApplicationInternal
-#~ msgid "Loglevel Debug|Info|Warning|Error"
-#~ msgstr "Уровень журналирования Debug|Info|Warning|Error"
-
-#. ts-context CoreApplicationInternal
-#~ msgid ""
-#~ "Specify the directory holding datafiles like the Sqlite DB and the SSL "
-#~ "Cert"
-#~ msgstr ""
-#~ "Укажите каталог, в котором лежат базы данных вроде Sqlite DB и сертификат "
-#~ "SSL"
-
-#. ts-context CoreConnectDlg
-#~ msgid "use internal core"
-#~ msgstr "использовать встроенное ядро"
-
-#. ts-context CoreConnectDlg
-#~ msgid ""
-#~ "Core Info\n"
-#~ "reserve\n"
-#~ "some\n"
-#~ "space"
-#~ msgstr ""
-#~ "Информация об ядре\n"
-#~ "reserve\n"
-#~ "some\n"
-#~ "space"
-
-#. ts-context CoreConnectDlg
-#~ msgid "view SSL Certificate"
-#~ msgstr "просмотреть сертификат SSL"
-
-#. ts-context CoreConnectDlg
-#~ msgid "add to known hosts"
-#~ msgstr "добавить в известные адреса"
-
-#. ts-context CoreNetwork
-#~ msgid "Disconnecting."
-#~ msgstr "Отсоединяюсь."
-
-#. ts-context FontsSettingsPage
-#~ msgid "Custom Application Fonts"
-#~ msgstr "Пользовательские шрифты"
-
-#. ts-context FontsSettingsPage
-#~ msgid "Topic:"
-#~ msgstr "Тема:"
-
-#. ts-context FontsSettingsPage
-#~ msgid "Buffer Views:"
-#~ msgstr "Списки буферов:"
-
-#. ts-context FontsSettingsPage
-#~ msgid "Nick List:"
-#~ msgstr "Список ников:"
-
-#. ts-context FontsSettingsPage
-#~ msgid "Inputline:"
-#~ msgstr "Строка ввода:"
-
-#. ts-context FontsSettingsPage
-#~ msgid "General:"
-#~ msgstr "Общий:"
-
-#. ts-context FontsSettingsPage
-#~ msgid "Chat Widget"
-#~ msgstr "Виджет чата"
-
-#. ts-context FontsSettingsPage
-#~ msgid "Nicks:"
-#~ msgstr "Ники:"
-
-#. ts-context FontsSettingsPage
-#~ msgid ""
-#~ "Some of these settings require a restart of the Quassel Client in order "
-#~ "to take effect. We intend to fix this."
-#~ msgstr ""
-#~ "Некоторые из этих настроек требуют перезапуска клиента Quassel. Мы "
-#~ "планируем исправить это."
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Minimize to tray on minimize button"
-#~ msgstr "Прятать  в трей при сворачивании"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Minimize to tray on close button"
-#~ msgstr "Прятать в трей при закрытии"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Display User-Related Messages And Private Notices:"
-#~ msgstr "Показывать личные и относящиеся к пользователю сообщения:"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "in status buffer"
-#~ msgstr "в буфере статуса"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "in query buffer (if exists)"
-#~ msgstr "в буфере привата (если есть)"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "in current buffer"
-#~ msgstr "в текущем буфере"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Buffer View"
-#~ msgstr "Список буферов"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Display topic in tooltip"
-#~ msgstr "Показывать тему во всплывающей подсказке"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Mouse wheel changes displayed buffers"
-#~ msgstr "Изменять отображаемые буфера колёсиком мыши"
-
-#. ts-context GeneralSettingsPage
-#~ msgid ""
-#~ "The suffix appended to a nick on completion via TAB. Default is \": \""
-#~ msgstr ""
-#~ "Суффикс, добавляемый к нику при автодополнении клавишей TAB. По умолчанию "
-#~ "\": \""
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Input Line"
-#~ msgstr "Строка ввода"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Completion suffix:"
-#~ msgstr "Суффикс автодополнения:"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Status Buffer"
-#~ msgstr "Буфер состояния"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Current Buffer"
-#~ msgstr "Текущий буфер"
-
-#. ts-context GeneralSettingsPage
-#~ msgid "Errors"
-#~ msgstr "Ошибки"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Real Name:"
-#~ msgstr "Настоящее имя:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "The \"Real Name\" is shown in /whois."
-#~ msgstr "\"Настоящее имя\" отображается в /whois."
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Nicknames"
-#~ msgstr "Ники"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Add Nickname"
-#~ msgstr "Добавить ник"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Remove Nickname"
-#~ msgstr "Удалить ник"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Move upwards in list"
-#~ msgstr "Передвинуть вверх в списке"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Move downwards in list"
-#~ msgstr "Передвинуть вниз в списке"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "A&way"
-#~ msgstr "&Отсутствую"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Default Away Settings"
-#~ msgstr "Настройки состояния \"Отсутствую\" по умолчанию"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Nick to be used when being away"
-#~ msgstr "Ник для состояния \"Отсутствую\""
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Default away reason"
-#~ msgstr "Причина по-умолчанию"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Away Reason"
-#~ msgstr "Причина"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Away Nick"
-#~ msgstr "Ник"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Set away when all clients have detached from the core"
-#~ msgstr ""
-#~ "Устанавливать состояние \"отсутствую\" когда все клиенты отсоединены от "
-#~ "ядра"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Away On Detach"
-#~ msgstr "\"Отсутствую\" при отсоединении"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Override default away reason for auto-away on detach"
-#~ msgstr ""
-#~ "Игнорировать причину по умолчанию при автоматическом состоянии "
-#~ "\"отсутствую\" при отсоединении"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Not implemented yet"
-#~ msgstr "Ещё не реализовано"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Away On Idle"
-#~ msgstr "\"Отсутствую\" при неактивности"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Set away after"
-#~ msgstr "Устанавливать \"отсутствую\" после"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "minutes of being idle"
-#~ msgstr "минут неактивности"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Advanced"
-#~ msgstr "Дополнительно"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Ident:"
-#~ msgstr "Идент:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid ""
-#~ "The \"ident\" is part of your hostmask and, together with your host, "
-#~ "uniquely identifies you within the IRC network."
-#~ msgstr ""
-#~ "\"Идент\" является частью хостмаски и вместе с хостом является "
-#~ "однозначным идентификатором пользователя сети IRC."
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Messages"
-#~ msgstr "Сообщения"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Part Reason:"
-#~ msgstr "Причина выхода с канала:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Quit Reason:"
-#~ msgstr "Причина выхода:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Kick Reason:"
-#~ msgstr "Причина изгнания:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Load a Key"
-#~ msgstr "Загрузить ключ"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "No Key loaded"
-#~ msgstr "Ключ не загружен"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Load"
-#~ msgstr "Загрузить"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "RSA"
-#~ msgstr "RSA"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "DSA"
-#~ msgstr "DSA"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "No Key Loaded"
-#~ msgstr "Ключ не загружен"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Clear"
-#~ msgstr "Очистить"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Load a Certificate"
-#~ msgstr "Загрузить сертификат"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "No Certificate loaded"
-#~ msgstr "Сертификат не загружен"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid ""
-#~ "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
-#~ msgstr ""
-#~ "Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и "
-#~ "сертификата SSL"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid ""
-#~ "Warning: you are not connected with a secured connection to the Quassel "
-#~ "Core!\n"
-#~ "Proceeding will cause an unencrypted transfer of your SSL Key and SSL "
-#~ "Certificate!"
-#~ msgstr ""
-#~ "Предупреждение: вы не используете безопасное соединение с ядром Quassel!\n"
-#~ "В случае продолжения передача вашего ключа и сертификата будет "
-#~ "небезопасной!"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "continue"
-#~ msgstr "продолжить"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Use SSL Key"
-#~ msgstr "Использовать ключ SSL"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Key Type:"
-#~ msgstr "Тип ключа:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Use SSL Certificate"
-#~ msgstr "Использовать сертификат SSL"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Organisation:"
-#~ msgstr "Организация:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "CommonName:"
-#~ msgstr "ОбщееИмя:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Away Reason:"
-#~ msgstr "Причина отсутствия:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Away Nick:"
-#~ msgstr "Ник при отсутствии:"
-
-#. ts-context IdentitiesSettingsPage
-#~ msgid "Continue"
-#~ msgstr "Продолжить"
-
-#. ts-context InputLine
-#~ msgid "Do you really want to paste %1 lines?"
-#~ msgid_plural "Do you really want to paste %1 lines?"
-#~ msgstr[0] "Действительно вставить %1 строку?"
-#~ msgstr[1] "Действительно вставить %1 строки?"
-#~ msgstr[2] "Действительно вставить %1 строк?"
-
-#. ts-context InputLine
-#~ msgid "Paste Protection"
-#~ msgstr "Защита при вставке"
-
-#. ts-context IrcServerHandler
-#~ msgid ""
-#~ "There is a nickname in your identity's nicklist which contains illegal "
-#~ "characters"
-#~ msgstr "В списке ников вашей личности есть ник с недопустимыми символами"
-
-#. ts-context IrcServerHandler
-#~ msgid ""
-#~ "Due to a bug in Unreal IRCd (and maybe other irc-servers too) we're "
-#~ "unable to determine the erroneous nick"
-#~ msgstr ""
-#~ "Из-за бага в сервере Unreal IRCd (и, возможно, в других) мы не можем "
-#~ "определить ошибочный ник"
-
-#. ts-context IrcServerHandler
-#~ msgid "Please use: /nick <othernick> to continue or clean up your nicklist"
-#~ msgstr ""
-#~ "Для продолжения используйте: /nick <другой ник> или почистите ваш список "
-#~ "ников"
-
-#. ts-context MainWin
-#~ msgid "Edit &Networks..."
-#~ msgstr "&Редактировать сети..."
-
-#. ts-context MainWin
-#~ msgid "&Manage Buffer Views..."
-#~ msgstr "&Управление списками буферов..."
-
-#. ts-context MainWin
-#~ msgid "&Lock Dock Positions"
-#~ msgstr "За&фиксировать позиции"
-
-#. ts-context MainWin
-#~ msgid "Ctrl+F"
-#~ msgstr "Ctrl+F"
-
-#. ts-context MainWin
-#~ msgid "&About Quassel..."
-#~ msgstr "&О Quassel..."
-
-#. ts-context MainWin
-#~ msgid "About &Qt..."
-#~ msgstr "О &Qt..."
-
-#. ts-context MainWin
-#~ msgid "&Buffer Views"
-#~ msgstr "&Буфера"
-
-#. ts-context MainWin
-#~ msgid "Core Lag: %1 msec"
-#~ msgstr "Лаг ядра: %1 мс"
-
-#. ts-context MainWin
-#~ msgid "&Configure Buffer Views..."
-#~ msgstr "Настроить списки &буферов..."
-
-#. ts-context MsgProcessorStatusWidget
-#~ msgid "Processing Messages"
-#~ msgstr "Обработка сообщений"
-
-#. ts-context NetworkModel
-#~ msgid "Buffer"
-#~ msgstr "Буфер"
-
-#. ts-context NetworkModelActionProvider
-#~ msgid "Delete Buffer..."
-#~ msgstr "Удалить буфер..."
-
-#. ts-context NetworkModelActionProvider
-#~ msgid "Apply to All Chat Views..."
-#~ msgstr "Применить ко всем окнам чата..."
-
-#. ts-context NetworkModelActionProvider
-#~ msgid "Do you want to delete the following buffer(s) permanently?"
-#~ msgid_plural "Do you want to delete the following buffer(s) permanently?"
-#~ msgstr[0] "Удалить следующий буфер навсегда?"
-#~ msgstr[1] "Удалить следующие буфера навсегда?"
-#~ msgstr[2] "Удалить следующие буфера навсегда?"
-
-#. ts-context NetworkModelActionProvider
-#~ msgid ""
-#~ "<b>Note:</b> This will delete all related data, including all backlog "
-#~ "data, from the core's database and cannot be undone."
-#~ msgstr ""
-#~ "<b>Замечание:</b> Это удалит все соответствующие данные, включае весь "
-#~ "журнал, из базы данных ядра без возможности отмены."
-
-#. ts-context NetworkModelActionProvider
-#~ msgid ""
-#~ "<br>Active channel buffers cannot be deleted, please part the channel "
-#~ "first."
-#~ msgstr ""
-#~ "<br>Нельзя удалить буфера активных каналов, сначала, пожалуйста, покиньте "
-#~ "канал."
-
-#. ts-context NetworkModelActionProvider
-#~ msgid "Remove buffers permanently?"
-#~ msgstr "Удалить буфера навсегда?"
-
-#. ts-context NetworksSettingsPage
-#~ msgid "Apply first!"
-#~ msgstr "Сначала примени!"
-
-#. ts-context NetworksSettingsPage
-#~ msgid "Connect now"
-#~ msgstr "Соединиться сейчас"
-
-#. ts-context NetworksSettingsPage
-#~ msgid "Choose random server for connecting"
-#~ msgstr "Выбирать случайный сервер для соединения"
-
-#. ts-context NetworksSettingsPage
-#~ msgid "Perform"
-#~ msgstr "Автовыполнение"
-
-#. ts-context NetworksSettingsPage
-#~ msgid "Use default settings for encodings (recommended)"
-#~ msgstr "Использовать настройки кодировок по-умолчанию (рекомендуется)"
-
-#. ts-context NetworksSettingsPage
-#~ msgid "Use defaults"
-#~ msgstr "По умолчанию"
-
-#. ts-context NickView
-#~ msgid "WHOIS"
-#~ msgstr "WHOIS"
-
-#. ts-context NickView
-#~ msgid "VERSION"
-#~ msgstr "VERSION"
-
-#. ts-context NickView
-#~ msgid "PING"
-#~ msgstr "PING"
-
-#. ts-context NickView
-#~ msgid "Modes"
-#~ msgstr "Режимы"
-
-#. ts-context NickView
-#~ msgid "Op %1"
-#~ msgstr "Дать оператора %1"
-
-#. ts-context NickView
-#~ msgid "Deop %1"
-#~ msgstr "Снять оператора %1"
-
-#. ts-context NickView
-#~ msgid "Voice %1"
-#~ msgstr "Дать голос %1"
-
-#. ts-context NickView
-#~ msgid "Devoice %1"
-#~ msgstr "Снять голос %1"
-
-#. ts-context NickView
-#~ msgid "Kick/Ban"
-#~ msgstr "Выгнать"
-
-#. ts-context NickView
-#~ msgid "Kick %1"
-#~ msgstr "Выгнать %1"
-
-#. ts-context NickView
-#~ msgid "Ban %1"
-#~ msgstr "Забанить %1"
-
-#. ts-context NickView
-#~ msgid "Kickban %1"
-#~ msgstr "Выгнать и забанить %1"
-
-#. ts-context NickView
-#~ msgid "Query"
-#~ msgstr "Приват"
-
-#. ts-context NickView
-#~ msgid "DCC-Chat"
-#~ msgstr "DCC-чат"
-
-#. ts-context NickView
-#~ msgid "Send file"
-#~ msgstr "Отправить файл"
-
-#. ts-context QObject
-#~ msgid "Copy to Clipboard"
-#~ msgstr "Скопировать в буфер обмена"
-
-#. ts-context Quassel
-#~ msgid "Enable debug output"
-#~ msgstr "Включить отладочную печать"
-
-#. ts-context Quassel
-#~ msgid "Display this help and exit"
-#~ msgstr "Показать эту справку и выйти"
-
-#. ts-context SignalProxy
-#~ msgid "Client tried to send package larger than max package size!"
-#~ msgstr "Клиент пытался отправить пакет больше максимального размера!"
-
-#. ts-context SignalProxy
-#~ msgid "local client"
-#~ msgstr "локальный клиент"
-
-#. ts-context SignalProxy
-#~ msgid "Client tried to send 0 byte package!"
-#~ msgstr "Клиент пытался отправить пакет из 0 байт!"
-
-#. ts-context SignalProxy
-#~ msgid "Client sent corrupted compressed data!"
-#~ msgstr "Клиент отправил повреждённые сжатые данные!"
-
-#. ts-context SignalProxy
-#~ msgid "Client sent corrupt data: unable to load QVariant!"
-#~ msgstr "Клиент отправил повреждённые данные: не могу загрузить QVariant!"
-
-#. ts-context StatusBufferItem
-#~ msgid "<b>Status buffer of %1</b>"
-#~ msgstr "<b>Буфер состояния %1</b>"
-
-#. ts-context TopicLabel
-#~ msgid "Drag to scroll the topic!"
-#~ msgstr "Перетаскивайте топик для прокрутки!"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%D0%1"
-#~ msgstr "%D0%1"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Dn%1"
-#~ msgstr "%Dn%1"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Ds%1"
-#~ msgstr "%Ds%1"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%De%1"
-#~ msgstr "%De%1"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
-#~ msgstr "%Dj%DN%1%DN %DH(%2@%3)%DH заходит на канал %DC%4%DC"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
-#~ msgstr "%Dp%DN%1%DN %DH(%2@%3)%DH покидает %DC%4%DC"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Dq%DN%1%DN %DH(%2@%3)%DH has quit"
-#~ msgstr "%Dq%DN%1%DN %DH(%2@%3)%DH выходит из сети"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
-#~ msgstr "%Dk%DN%1%DN выгоняет %DN%2%DN с %DC%3%DC"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%DrYou are now known as %DN%1%DN"
-#~ msgstr "%DrВы теперь известны как %DN%1%DN"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Dr%DN%1%DN is now known as %DN%2%DN"
-#~ msgstr "%Dr%DN%1%DN меняет имя на %DN%2%DN"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%DmUser mode: %DM%1%DM"
-#~ msgstr "%DmПользовательский режим: %DM%1%DM"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%DmMode %DM%1%DM by %DN%2%DN"
-#~ msgstr "%DmРежим %DM%1%DM установлен %DN%2%DN"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%Da%DN%1%DN %2"
-#~ msgstr "%Da%DN%1%DN %2"
-
-#. ts-context UiStyle::StyledMessage
-#~ msgid "%De[%1]"
-#~ msgstr "%De[%1]"
+#~ msgid "Add Buffers Automatically:"
+#~ msgstr "Автоматически Добавить Буфер"