X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fru.po;h=66340835cdcd0eb47d1655e128e8cf15d71b5b98;hp=5fea4a88dc78e22b7f8db5f1acc6c3970a4d1b74;hb=d68e9d67200abc51123b357bcdbbc816d4a70791;hpb=c62b8c10bc6c15af2b75415cdaab1058853c6255

diff --git a/po/ru.po b/po/ru.po
index 5fea4a88..66340835 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,357 +1,106 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Translators:
+# Daniel Albers <daniel@lbers.com>, 2011
+# sfionov <fionov@gmail.com>, 2012
+# sfionov <fionov@gmail.com>, 2012
 msgid ""
 msgstr ""
-"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"
+"Project-Id-Version: Quassel IRC\n"
+"Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
+"PO-Revision-Date: 2014-02-22 09:00+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/quassel/language/ru/)\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"
+"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-Qt-Contexts: true\n"
 
-#. ts-context AboutDlg
-#: ../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>Современный, распределённый клиент 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 AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
-msgid "<Untranslated>"
-msgstr "<Untranslated>"
-
-#. 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 ""
-"<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
+msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "О Quassel"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:59
+msgctxt "AboutDlg|"
 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>"
-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>"
-
-#. ts-context AboutDlg
+"</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>"
+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>"
+
 #: ../src/qtui/ui/aboutdlg.ui:75
+msgctxt "AboutDlg|"
 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"
-"<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>"
-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>"
-
-#. ts-context AboutDlg
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; 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;\">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>"
+
 #: ../src/qtui/ui/aboutdlg.ui:115
+msgctxt "AboutDlg|"
 msgid "&About"
 msgstr "&О программе"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:135
+msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "&Авторы"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:155
+msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "&Помощники"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:175
+msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Благодарности"
 
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:32
+#: ../src/qtui/aboutdlg.cpp:33
+#, qt-format
+msgctxt "AboutDlg|"
 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"
+
+#: ../src/qtui/aboutdlg.cpp:49
+msgctxt "AboutDlg|"
+msgid ""
+"<b>A modern, distributed IRC Client</b><br><br>&copy;%1 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"
 
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:62
+#: ../src/qtui/aboutdlg.cpp:67
+msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC разрабатывается в основном:"
 
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:77
+#: ../src/qtui/aboutdlg.cpp:84
+msgctxt "AboutDlg|"
 msgid ""
 "We would like to thank the following contributors (in alphabetical order) "
 "and everybody we forgot to mention here:"
-msgstr ""
-"Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в "
-"алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:"
+msgstr "Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:"
 
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:135
+#: ../src/qtui/aboutdlg.cpp:201
+msgctxt "AboutDlg|"
 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 "
+"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 "
@@ -360,2234 +109,2200 @@ msgid ""
 "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>"
+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:115
+#: ../src/core/abstractsqlstorage.cpp:127
+#, qt-format
+msgctxt "AbstractSqlStorage|"
 msgid ""
 "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Используемая схема (версии %1) устарела. Обновляю до версии %2..."
 
-#. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:117
+#: ../src/core/abstractsqlstorage.cpp:129
+msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Обновление не удалось..."
 
-#. ts-context AliasesModel
-#: ../src/qtui/settingspages/aliasesmodel.cpp:55
+#: ../src/qtui/settingspages/aliasesmodel.cpp:57
+msgctxt "AliasesModel|"
 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"
+msgstr "<b>Ссылка к псевдониму</b><br />Она может использоваться как обыкновенный слэш.<br /><br /><b>Пример:</b> \"foo\"  может использоваться для /foo"
 
-#. ts-context AliasesModel
-#: ../src/qtui/settingspages/aliasesmodel.cpp:59
+#: ../src/qtui/settingspages/aliasesmodel.cpp:61
+msgctxt "AliasesModel|"
 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 "
-"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
+"/> - <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"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:185
+msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Псевдоним"
 
-#. ts-context AliasesModel
-#: ../src/qtui/settingspages/aliasesmodel.cpp:171
+#: ../src/qtui/settingspages/aliasesmodel.cpp:186
+msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Расширение"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. 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
+msgctxt "AliasesSettingsPage|"
 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
+msgctxt "AliasesSettingsPage|"
 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
+msgctxt "AliasesSettingsPage|"
 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
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "AliasesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgctxt "AliasesSettingsPage|"
 msgid "Aliases"
 msgstr "Псевдонимы"
 
-#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:14
+msgctxt "AppearanceSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
+msgctxt "AppearanceSettingsPage|"
 msgid "Client style:"
 msgstr "Стиль клиента:"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:29
+msgctxt "AppearanceSettingsPage|"
 msgid "Set application style"
 msgstr "Задаёт стиль приложения"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:36
+msgctxt "AppearanceSettingsPage|"
 msgid "Language:"
 msgstr "Язык:"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:43
+msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "Задаёт язык приложения. Требует перезапуска!"
 
-#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+msgctxt "AppearanceSettingsPage|"
+msgid "<Untranslated>"
+msgstr "<Untranslated>"
+
 #: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
+msgctxt "AppearanceSettingsPage|"
 msgid "<System Default>"
 msgstr "<По умолчанию>"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:75
+msgctxt "AppearanceSettingsPage|"
 msgid "Use custom stylesheet"
 msgstr "Использовать свою таблицу стилей"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:109
+msgctxt "AppearanceSettingsPage|"
 msgid "Path:"
 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
+msgctxt "AppearanceSettingsPage|"
 msgid "..."
 msgstr "..."
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:150
+msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "Показывать значок в трее"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:184
+msgctxt "AppearanceSettingsPage|"
 msgid "Hide to tray on close button"
 msgstr "При закрытии сворачивать в системный лоток"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:216
+msgctxt "AppearanceSettingsPage|"
 msgid "Enable animations"
 msgstr "Включить анимацию"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:231
+msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Перенаправление сообщений"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:237
+msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "Пользовательские сообщения:"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:280
+msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "Серверные сообщения:"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:294
+msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Цель по умолчанию"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:301
+msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Окно статуса"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:308
+msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Текущий чат"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:315
+msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Ошибки:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AppearanceSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BacklogSettingsPage
-#. #-#-#-#-#  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
+msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 
-#. ts-context AwayLogView
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
+msgctxt "AppearanceSettingsPage|"
+msgid "Please choose a stylesheet file"
+msgstr "Выберите пожалуйста файл стилей"
+
 #: ../src/qtui/awaylogview.cpp:33
+msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr "Журнал отсутствия"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AwayLogView
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatMonitorView
-#: ../src/qtui/awaylogview.cpp:44 ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/awaylogview.cpp:46
+msgctxt "AwayLogView|"
 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
+#: ../src/qtui/awaylogview.cpp:51
+msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr "Показывать название буфера"
 
-#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:14
+msgctxt "BacklogSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/settingspages/backlogsettingspage.ui:22
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "Number of messages to be requested from the core when using scrolling up in "
 "the buffer view."
-msgstr ""
-"Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх."
+msgstr "Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх."
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:25
+msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
 msgstr "Динамический размер журнала:"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:75
+msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr "Способ показа журнала:"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:83
+msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr "Постоянное количество строк в чате"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:88
+msgctxt "BacklogSettingsPage|"
 msgid "Unread messages per chat"
 msgstr "Непрочитанные сообщения в чате"
 
-#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:93
+msgctxt "BacklogSettingsPage|"
+msgid "Globally unread messages"
+msgstr "Общее количество непрочитанных сообщений"
+
 #: ../src/qtui/settingspages/backlogsettingspage.ui:123
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
-msgstr ""
-"Самый простой запросчик. Он получает фиксированное количество строк из "
-"журнала для каждого окна чата."
+msgstr "Самый простой запросчик. Он получает фиксированное количество строк из журнала для каждого окна чата."
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "amount of messages per buffer that are requested after the core connection "
 "has been established."
-msgstr ""
-"количество сообщений из каждого буфера, которые запрашиваются у ядра после "
-"установления соединения."
+msgstr "количество сообщений из каждого буфера, которые запрашиваются у ядра после установления соединения."
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
+msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr "Начальный размер журнала:"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:205
+msgctxt "BacklogSettingsPage|"
 msgid ""
-"This requester fetches unread messages for each chat window individually. "
-"The amount of lines can be limited per chat.\n"
+"This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
 "\n"
-"You can also choose to fetch additional older chatlines to provide a better "
-"context."
-msgstr ""
-"Этот запрос индивидуально извлекает непрочитанные сообщения для каждого окна "
-"чата. Количество полученных из журнала строк может быть ограничено.\n"
-"\n"
-"Также вы можете выбрать дополнительное количество строк, для извлечения, что-"
-"бы лучше понять тему разговора."
+"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
 #: ../src/qtui/settingspages/backlogsettingspage.ui:232
 #: ../src/qtui/settingspages/backlogsettingspage.ui:354
+msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr "Максимальное количество запрашиваемых сообщений для буфера."
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:225
 #: ../src/qtui/settingspages/backlogsettingspage.ui:347
+msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr "Предел:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BacklogSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  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
+msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:260
 #: ../src/qtui/settingspages/backlogsettingspage.ui:270
 #: ../src/qtui/settingspages/backlogsettingspage.ui:382
 #: ../src/qtui/settingspages/backlogsettingspage.ui:392
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
-msgstr ""
-"Количество сообщений, запрашиваемых в дополнение к непрочитанным. Здесь не "
-"применяется ограничение."
+msgstr "Количество сообщений, запрашиваемых в дополнение к непрочитанным. Здесь не применяется ограничение."
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
 #: ../src/qtui/settingspages/backlogsettingspage.ui:385
+msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
 msgstr "Дополнительных сообщений:"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:324
+msgctxt "BacklogSettingsPage|"
 msgid ""
-"This requester fetches all messages newer than the oldest unread message for "
-"all chats.\n"
+"This requester fetches all messages newer than the oldest unread message for all chats.\n"
 "\n"
-"Note: This requester is not recommended if you use hidden chat windows or "
-"have inactive chats (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"
+"Note: This requester is not recommended if you use hidden chat windows or have inactive chats (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."
-msgstr ""
-"Эта программа запрашивает все сообщения, моложе самого старого "
-"непрочитанного сообщения для всех чатов.\n"
-"Примечание: Этот запросчик не рекомендуется использовать если вы используете "
-"скрытые окна чата или есть неактивные чаты (т. е.: нет устаревших запросов "
-"или каналов).\n"
-"Лучше всего, и вероятно - быстрее, задать ограничение максимального размера "
-"журнала.\n"
-"В дополнение ко всему, вы также можете запросить более старые разговорные "
-"каналы, чтобы лучше вникнуть в контекст."
-
-#. ts-context BacklogSettingsPage
+"You can also chose to fetch additional older chatlines to provide a better context."
+msgstr "Эта программа запрашивает все сообщения, моложе самого старого непрочитанного сообщения для всех чатов.\nПримечание: Этот запросчик не рекомендуется использовать если вы используете скрытые окна чата или есть неактивные чаты (т. е.: нет устаревших запросов или каналов).\nЛучше всего, и вероятно - быстрее, задать ограничение максимального размера журнала.\nВ дополнение ко всему, вы также можете запросить более старые разговорные каналы, чтобы лучше вникнуть в контекст."
+
 #: ../src/qtui/settingspages/backlogsettingspage.ui:344
+msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Максимальное количество сообщений, запрашиваемых из всех буферов."
 
-#. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:346
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgctxt "BacklogSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgctxt "BacklogSettingsPage|"
+msgid "Backlog Fetching"
+msgstr "Просмотр Журнала"
+
+#: ../src/client/networkmodel.cpp:386
+#, qt-format
+msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#. ts-context BufferView
-#: ../src/uisupport/bufferview.cpp:248
+#: ../src/uisupport/bufferview.cpp:272
+msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Произвести необратимое слияние буферов?"
 
-#. ts-context BufferView
-#: ../src/uisupport/bufferview.cpp:249
+#: ../src/uisupport/bufferview.cpp:273
+#, qt-format
+msgctxt "BufferView|"
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"
-msgstr ""
-"Хотите ли вы слить буфер \"%1\" с буфером \"%2\"?\n"
-" Это нельзя обратить!"
+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
+msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
 msgstr "Диалог"
 
-#. ts-context BufferViewFilter
-#: ../src/uisupport/bufferviewfilter.cpp:52
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
+msgctxt "BufferViewEditDlg|"
+msgid "Please enter a name for the chat list:"
+msgstr "Пожалуйста, введите имя чатлиста:"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575
+msgctxt "BufferViewEditDlg|"
+msgid "Add Chat List"
+msgstr "Добавить Чатлист"
+
+#: ../src/uisupport/bufferviewfilter.cpp:54
+msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr "Показать / Скрыть Чаты"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
+msgctxt "BufferViewSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:31
-#: ../src/qtui/settingspages/identityeditwidget.ui:139
-#: ../src/qtui/settingspages/networkssettingspage.ui:48
+msgctxt "BufferViewSettingsPage|"
 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
+msgctxt "BufferViewSettingsPage|"
 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
+msgctxt "BufferViewSettingsPage|"
 msgid "De&lete"
 msgstr "У&далить"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
+msgctxt "BufferViewSettingsPage|"
 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
+msgctxt "BufferViewSettingsPage|"
 msgid "Network:"
 msgstr "Сеть:"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123
+msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Все"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
+msgctxt "BufferViewSettingsPage|"
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."
-msgstr ""
-"Эта опция недоступна когда видны все сети.\n"
-"В этом режиме отдельные буфера состояния не отображаются."
+msgstr "Эта опция недоступна когда видны все сети.\nВ этом режиме отдельные буфера состояния не отображаются."
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
+msgctxt "BufferViewSettingsPage|"
 msgid "Show status window"
 msgstr "Показать окно статуса"
 
-#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
+msgctxt "BufferViewSettingsPage|"
+msgid "Show channels"
+msgstr "Показывать каналы"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
+msgctxt "BufferViewSettingsPage|"
+msgid "Show queries"
+msgstr "Показывать приваты"
+
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
+msgctxt "BufferViewSettingsPage|"
 msgid "Hide inactive chats"
 msgstr "Скрыть неактивные чаты"
 
-#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
+msgctxt "BufferViewSettingsPage|"
+msgid "Add new chats automatically"
+msgstr "Добавлять новые чаты автоматически"
+
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+msgctxt "BufferViewSettingsPage|"
 msgid "Sort alphabetically"
 msgstr "Сортировать по алфавиту"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
+msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Минимальная активность:"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Нет активности"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Другая активность"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+msgctxt "BufferViewSettingsPage|"
 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
+msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Подсветка"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Предварительный просмотр:"
 
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgctxt "BufferViewSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgctxt "BufferViewSettingsPage|"
+msgid "Custom Chat Lists"
+msgstr "Пользовательские Чатлисты"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378
+msgctxt "BufferViewSettingsPage|"
+msgid "Delete Chat List?"
+msgstr "Удалить Чатлист?"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379
+#, qt-format
+msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr "Вы действительно хотите удалить чат \"%1\"?"
 
-#. ts-context BufferViewWidget
 #: ../src/qtui/ui/bufferviewwidget.ui:26
+msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr "СписокБуферов"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:79
+#: ../src/qtui/bufferwidget.cpp:78
+msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "Увеличить"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:85
+#: ../src/qtui/bufferwidget.cpp:84
+msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "Уменьшить"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:90
+#: ../src/qtui/bufferwidget.cpp:89
+msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "Действительный размер"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:94
+#: ../src/qtui/bufferwidget.cpp:93
+msgctxt "BufferWidget|"
 msgid "Set Marker Line"
-msgstr ""
+msgstr "Отметка:"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:98
+#: ../src/qtui/bufferwidget.cpp:97
+msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
-msgstr ""
+msgstr "Отметка:"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:566
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Channel %1</b>"
 msgstr "<b>Канал %1</b>"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:506
+#: ../src/client/networkmodel.cpp:569
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Users:</b> %1"
 msgstr "<b>Пользователи:</b> %1"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:510
+#: ../src/client/networkmodel.cpp:573
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Режим:</b> %1"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:521
+#: ../src/client/networkmodel.cpp:584
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Тема:</b> %1"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:525
+#: ../src/client/networkmodel.cpp:589
+msgctxt "ChannelBufferItem|"
 msgid "Not active <br /> Double-click to join"
 msgstr "Неактивно <br /> Дважды щёлкните чтобы войти"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:528
+#: ../src/client/networkmodel.cpp:592
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:14
+msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "Список каналов"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:38
+msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr "Шаблон поиска:"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:48
+msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
-"Advanced mode allows to pass search strings to the IRC Server."
-msgstr ""
-"Переключение между простым и расширенным режимами.\n"
-"Расширенный режим позволяет передавать поисковые строки серверу IRC."
+"Advanced mode allows one to pass search strings to the IRC Server."
+msgstr "Переключение между простым и расширенным режимами.\nРасширенный режим позволяет передавать поисковые строки серверу IRC."
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:62
+msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr "Показать каналы"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:86
+msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:98
-msgid "Errors Occured:"
+msgctxt "ChannelListDlg|"
+msgid "Errors Occurred:"
 msgstr "Произошли ошибки:"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:132
+msgctxt "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;\"><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\">\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: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
+"</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;\">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\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, 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>"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Operation Mode:"
 msgstr "Режим:"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
+msgctxt "ChatMonitorSettingsPage|"
 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"
-"<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;\">Operation modes:</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-weight:600;\"><span "
-"style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span "
-"style=\" font-weight:400;\">Only buffers on the right side are shown in "
-"chatmonitor</span></p>\n"
-"<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> 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-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;\">В мониторе чата отображаются только буферы из списка "
-"справа.</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>Буферы из списка "
-"справа монитором чата игнорируются.</p></body></html>"
-
-#. ts-context ChatMonitorSettingsPage
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; 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-weight:600;\">Operation modes:</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-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
+"<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> 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-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;\">В мониторе чата отображаются только буферы из списка справа.</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>Буферы из списка справа монитором чата игнорируются.</p></body></html>"
+
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Available:"
 msgstr "Доступно:"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Move selected buffers to the left"
 msgstr "Переместить выбранные буферы влево"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Move selected buffers to the right"
 msgstr "Переместить выбранные буферы вправо"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Показывать:"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
+msgctxt "ChatMonitorSettingsPage|"
 msgid ""
 "Show highlights in chatmonitor even if the originating buffer is ignored"
 msgstr "Показывать подсвеченные сообщения даже если их буфер игнорируется"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Always show highlighted messages"
 msgstr "Всегда показывать подсвеченные сообщения"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
+msgctxt "ChatMonitorSettingsPage|"
 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
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Монитор чата"
 
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr "Белый список"
 
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr "Чёрный список"
 
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Игнорировать:"
 
-#. ts-context ChatMonitorView
-#: ../src/qtui/chatmonitorview.cpp:52
+#: ../src/qtui/chatmonitorview.cpp:54
+msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Показывать свои сообщения"
 
-#. ts-context ChatMonitorView
-#: ../src/qtui/chatmonitorview.cpp:71
+#: ../src/qtui/chatmonitorview.cpp:61
+msgctxt "ChatMonitorView|"
+msgid "Show Network Name"
+msgstr "Показывать название сети"
+
+#: ../src/qtui/chatmonitorview.cpp:66
+msgctxt "ChatMonitorView|"
+msgid "Show Buffer Name"
+msgstr "Показывать название буфера"
+
+#: ../src/qtui/chatmonitorview.cpp:73
+msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Настроить..."
 
-#. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:745
+#: ../src/qtui/chatscene.cpp:813
+msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Скопировать выделение"
 
-#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:13
+msgctxt "ChatViewSearchBar|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/ui/chatviewsearchbar.ui:19
+#: ../src/qtui/ui/chatviewsearchbar.ui:33
+#: ../src/qtui/ui/chatviewsearchbar.ui:44
+msgctxt "ChatViewSearchBar|"
+msgid "..."
+msgstr "..."
+
 #: ../src/qtui/ui/chatviewsearchbar.ui:55
+msgctxt "ChatViewSearchBar|"
 msgid "case sensitive"
 msgstr "учитывать регистр"
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:62
+msgctxt "ChatViewSearchBar|"
 msgid "search nick"
 msgstr "искать ник"
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:69
+msgctxt "ChatViewSearchBar|"
 msgid "search message"
 msgstr "искать сообщение"
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:82
+msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr "игнорировать входы, уходы, и т. п."
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:14
+msgctxt "ChatViewSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
+msgctxt "ChatViewSettingsPage|"
+msgid "Timestamp format:"
+msgstr "Формат датировки:"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"<html><head/><body><p>Usage examples:</p>\n"
+"<table cellpadding=\"2\">\n"
+"<tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
+"<tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
+"<tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
+"<tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
+"</table>\n"
+"</body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
+msgctxt "ChatViewSettingsPage|"
+msgid "[hh:mm:ss]"
+msgstr "[hh:mm:ss]"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom chat window font:"
+msgstr "Пользовательский шрифт окна чата:"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
+msgctxt "ChatViewSettingsPage|"
 msgid "Show colored text in the chat window"
 msgstr "Показать цветной текст в окне чата"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
+msgctxt "ChatViewSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
+msgstr "Разрешить вывод цветного текста (mIRC color codes)"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:121
+msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"
-msgstr ""
-"Показывать предварительный просмотр вебсайта при наведении мышью на адрес"
+msgstr "Показывать предварительный просмотр вебсайта при наведении мышью на адрес"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
+msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Показывать эскиз вебсайта при наведении на URL"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:140
+msgctxt "ChatViewSettingsPage|"
 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:133
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr ""
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
+msgctxt "ChatViewSettingsPage|"
 msgid "Custom Colors"
 msgstr "Пользовательские цвета"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:177
+msgctxt "ChatViewSettingsPage|"
 msgid "Action:"
 msgstr "Действие:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:184
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:208
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:232
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:269
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:293
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:324
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:348
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:372
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:396
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:413
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:453
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:470
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:487
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:504
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:521
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:538
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:555
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:572
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:589
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:606
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:623
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:640
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:657
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:674
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:691
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:708
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:736
+msgctxt "ChatViewSettingsPage|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:201
+msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp:"
 msgstr "Время:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:225
+msgctxt "ChatViewSettingsPage|"
 msgid "Channel message:"
 msgstr "Сообщение канала:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:262
+msgctxt "ChatViewSettingsPage|"
 msgid "Highlight foreground:"
-msgstr ""
+msgstr "Подсветка:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:286
+msgctxt "ChatViewSettingsPage|"
 msgid "Command message:"
 msgstr "Сообщение команды:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:310
+msgctxt "ChatViewSettingsPage|"
 msgid "Highlight background:"
-msgstr ""
+msgstr "Подсвечивать ники"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:317
+msgctxt "ChatViewSettingsPage|"
 msgid "Server message:"
 msgstr "Сообщение сервера:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:341
+msgctxt "ChatViewSettingsPage|"
 msgid "Marker line:"
 msgstr "Отметка:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:365
+msgctxt "ChatViewSettingsPage|"
 msgid "Error message:"
 msgstr "Сообщение об ошибке:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:389
+msgctxt "ChatViewSettingsPage|"
+msgid "Background:"
+msgstr "Фон"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:433
+msgctxt "ChatViewSettingsPage|"
 msgid "Use Sender Coloring"
 msgstr "Использовать Цветовую Палитру Отправителя"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:729
+msgctxt "ChatViewSettingsPage|"
 msgid "Own messages:"
 msgstr "Собственные сообщения:"
 
-#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Chat View"
+msgstr "Вид Окна Чата"
+
 #: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
-msgid "You need at 0.6 quasselcore to use this feature"
-msgstr ""
-"Для использования этой функции вам нужно иметь quasselcore версии 0.6"
+msgctxt "ChatViewSettingsPage|"
+msgid "You need at least version 0.6 of quasselcore to use this feature"
+msgstr "Для использования этой функции вам нужно иметь quasselcore версии 0.6"
 
-#. ts-context Client
-#: ../src/client/client.cpp:270
+#: ../src/client/client.cpp:320
+msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr "Личность уже есть в клиенте!"
 
-#. ts-context ClientBacklogManager
-#: ../src/client/clientbacklogmanager.cpp:161
+#: ../src/client/clientauthhandler.cpp:61
+#: ../src/client/clientauthhandler.cpp:256
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr "Незашифрованное подключение отменено"
+
+#: ../src/client/clientauthhandler.cpp:84
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connecting to %1..."
+msgstr "Соединяюсь с %1..."
+
+#: ../src/client/clientauthhandler.cpp:154
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr "Синхронизация с ядром..."
+
+#: ../src/client/clientauthhandler.cpp:167
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid ""
+"<b>The Quassel Core you are trying to connect to is too old!</b><br>We need "
+"at least protocol v%1, but the core speaks v%2 only."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:169
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:176
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:207
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:275
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connected to %1"
+msgstr "Соединение с %1 установлено"
+
+#: ../src/client/clientauthhandler.cpp:317
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr "Авторизуюсь..."
+
+#: ../src/client/clientauthhandler.cpp:322
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr "Вход в систему отменен"
+
+#: ../src/client/clientbacklogmanager.cpp:178
+#, qt-format
+msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
 msgstr "Обработано сообщений: %1. Затрачено секунд: %2."
 
-#. ts-context ClientUserInputHandler
-#: ../src/client/clientuserinputhandler.cpp:86
+#: ../src/client/clientbufferviewmanager.cpp:60
+msgctxt "ClientBufferViewManager|"
+msgid "All Chats"
+msgstr "Все Чаты"
+
+#: ../src/client/clientuserinputhandler.cpp:98
+msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr ""
 
-#. ts-context ClientUserInputHandler
-#: ../src/client/clientuserinputhandler.cpp:96
+#: ../src/client/clientuserinputhandler.cpp:110
+msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY предполагает наличие хотя бы ника"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
+msgctxt "ConnectionSettingsPage|"
 msgid "Configure the IRC Connection"
 msgstr "Настройка подключения IRC"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:20
+msgctxt "ConnectionSettingsPage|"
 msgid "Enable Ping Timeout Detection"
 msgstr "Включить определение Ping Timeout"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/settingspages/connectionsettingspage.ui:37
+msgctxt "ConnectionSettingsPage|"
+msgid "Ping interval:"
+msgstr "Интервал пинга:"
+
 #: ../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
+msgctxt "ConnectionSettingsPage|"
 msgid " seconds"
 msgstr " сек."
 
-#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:80
+msgctxt "ConnectionSettingsPage|"
+msgid "Disconnect after"
+msgstr "Отсоединиться после"
+
 #: ../src/qtui/settingspages/connectionsettingspage.ui:103
+msgctxt "ConnectionSettingsPage|"
 msgid "missed pings"
 msgstr "потерянных пингов"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:128
+msgctxt "ConnectionSettingsPage|"
 msgid ""
-"This enables periodic polling of user information using /WHO. This is mostly "
-"interesting for tracking users' away status."
-msgstr ""
-"Данный параметр периодически обновляет информацию о  пользователях, "
-"используя IRC команду /WHO. В основном, это нужно для отслеживания статуса "
-"отсутствия пользователя (Away)."
+"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
+msgctxt "ConnectionSettingsPage|"
 msgid "Enable Automatic User Information Lookup (/WHO)"
 msgstr "Включить автоматическое получение информации о пользователях (/WHO)"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:148
+msgctxt "ConnectionSettingsPage|"
 msgid "Update interval:"
 msgstr "Интервал обновления:"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:177
+msgctxt "ConnectionSettingsPage|"
 msgid "Ignore channels with more than:"
 msgstr "Игнорировать каналы с более чем:"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:184
+msgctxt "ConnectionSettingsPage|"
 msgid " users"
 msgstr " пользователи"
 
-#. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:683
+#: ../src/qtui/settingspages/connectionsettingspage.ui:206
+msgctxt "ConnectionSettingsPage|"
+msgid "Minimum delay between requests:"
+msgstr "Минимальное время задержки между запросами:"
+
+#: ../src/qtui/settingspages/connectionsettingspage.ui:250
+msgctxt "ConnectionSettingsPage|"
+msgid "Enable standard-compliant CTCP behavior"
+msgstr ""
+
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+msgctxt "ConnectionSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/chatitem.cpp:803
+msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "Скопировать адрес ссылки"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:38
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
+msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Соединиться"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
-#: ../src/uisupport/toolbaractionprovider.cpp:32
+#: ../src/uisupport/contextmenuactionprovider.cpp:40
+msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Отсоединиться"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:41
-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
+msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Зайти"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
+msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr "Выйти"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:46
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
+msgctxt "ContextMenuActionProvider|"
+msgid "Delete Chat(s)..."
+msgstr "Удалить Чат(ы)..."
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:45
+msgctxt "ContextMenuActionProvider|"
+msgid "Go to Chat"
+msgstr "Войти в Чат"
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
+msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "Входы"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
+msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Выходы из канала"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
+msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Выходы из сети"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
+msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Смены ника"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
+msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Смены режимов"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
+msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Смены дня"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
+msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
-msgstr ""
+msgstr "Смены ника"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
+msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Задать буфер по умолчанию..."
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
+msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Использовать по умолчанию..."
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
+msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Зайти на канал..."
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
+msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Начать диалог"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Показать диалог"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
+msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
+msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Версия"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
+msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Время"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
+msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
+msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "Информация о IRC клиенте"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
+msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:78
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
+msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Дать оператора"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
+msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr "Снять оператора"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
+msgctxt "ContextMenuActionProvider|"
+msgid "Give Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
+msgctxt "ContextMenuActionProvider|"
+msgid "Take Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
+msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "Дать голос"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
+msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "Снять голос"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
+msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Выгнать с канала"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
+msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Забанить на канале"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
+msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Выгнать и забанить"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
+msgctxt "ContextMenuActionProvider|"
+msgid "Hide Chat(s) Temporarily"
+msgstr "Скрыть чат(ы), временно"
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
+msgctxt "ContextMenuActionProvider|"
+msgid "Hide Chat(s) Permanently"
+msgstr "Скрыть чат(ы), Постоянно"
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "Показать список каналов"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr "Показать список игнорируемых"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:102
+#: ../src/uisupport/contextmenuactionprovider.cpp:105
+msgctxt "ContextMenuActionProvider|"
 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
+#: ../src/uisupport/contextmenuactionprovider.cpp:113
+msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:122
+#: ../src/uisupport/contextmenuactionprovider.cpp:128
+msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr "Действия"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:126
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
+msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#. ts-context ContextMenuActionProvider
-#: ../src/uisupport/contextmenuactionprovider.cpp:132
+#: ../src/uisupport/contextmenuactionprovider.cpp:137
+msgctxt "ContextMenuActionProvider|"
+msgid "Add Ignore Rule"
+msgstr "Добавить правило игнорирования"
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:138
+msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Имеющиеся правила"
 
-#. ts-context Core
-#: ../src/core/core.cpp:182
+#: ../src/core/core.cpp:193
+msgctxt "Core|"
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr "Не могу инициализировать ни одно хранилище! Выхожу..."
 
-#. ts-context Core
-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:194
+msgctxt "Core|"
 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"
+"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"
-"для работы."
+msgstr "Сейчас, Quassel поддерживает SQLite3 и PostgreSQL. вам нужно создать свою\nбиблиотеку Qt с разрешенными в ядре Quassel плагинами sqlite или postgres\nдля работы."
 
-#. ts-context Core
-#: ../src/core/core.cpp:232
+#: ../src/core/core.cpp:253
+msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "Вызываю restoreState(), несмотря на существующие активные сессии!"
 
-#. ts-context Core
-#: ../src/core/core.cpp:273
+#: ../src/core/core.cpp:287
+msgctxt "Core|"
+msgid "Core is already configured! Not configuring again..."
+msgstr ""
+
+#: ../src/core/core.cpp:290
+msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr "Нет пользователя-администратора или пароля."
 
-#. ts-context Core
-#: ../src/core/core.cpp:277
+#: ../src/core/core.cpp:293
+msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr "Не могу настроить хранилище!"
 
-#. ts-context Core
-#: ../src/core/core.cpp:281
+#: ../src/core/core.cpp:298
+msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Создаю пользователя-администратора..."
 
-#. ts-context Core
-#: ../src/core/core.cpp:394
+#: ../src/core/core.cpp:451
+#, qt-format
+msgctxt "Core|"
 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"
+#: ../src/core/core.cpp:460
+#, qt-format
+msgctxt "Core|"
+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
+#: ../src/core/core.cpp:469
+#, qt-format
+msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
 
-#. ts-context Core
-#: ../src/core/core.cpp:437
+#: ../src/core/core.cpp:477
+#, qt-format
+msgctxt "Core|"
+msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr "Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол версии %3"
+
+#: ../src/core/core.cpp:488
+#, qt-format
+msgctxt "Core|"
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
+
+#: ../src/core/core.cpp:496
+#, qt-format
+msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
-msgstr ""
-"Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
+msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
 
-#. ts-context Core
-#: ../src/core/core.cpp:446
+#: ../src/core/core.cpp:505
+msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"
 
-#. ts-context Core
-#: ../src/core/core.cpp:480
+#: ../src/core/core.cpp:545
+msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Клиент соединился с"
 
-#. ts-context Core
-#: ../src/core/core.cpp:483
+#: ../src/core/core.cpp:548
+msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Закрываю сервер для базовой настройки."
 
-#. ts-context Core
-#: ../src/core/core.cpp:502
-msgid "Antique client trying to connect... refusing."
-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."
-msgstr ""
-"<b>Ваш клиент Quassel слишком старый!</b><br>Этому ядру нужна версия клиент-"
-"серверного протокола по крайней мере %1.<br>Пожалуйста обновите клиент."
-
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context Core
-#. #-#-#-#-#  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 "Клиент"
-
-#. ts-context Core
-#: ../src/core/core.cpp:518
-msgid "too old, rejecting."
-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)"
-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:606
-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
-msgstr ""
-"<b>Клиент не инициализирован!</b><br>Вам нужно отправить инициализационное "
-"сообщение перед попыткой входа."
-
-#. ts-context Core
-#: ../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:626
-msgid ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
+#: ../src/core/core.cpp:560
+msgctxt "Core|"
+msgid "Non-authed client disconnected:"
 msgstr ""
-"<b>Неверное имя пользователя или пароль!</b><br>Предоставленные вами имя "
-"пользователя и пароль не найдены в базе."
-
-#. ts-context Core
-#: ../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:643
-msgid "Non-authed client disconnected."
-msgstr "Неавторизованный клиент отсоединён."
 
-#. ts-context Core
-#: ../src/core/core.cpp:649
-msgid "Non-authed client disconnected. (socket allready destroyed)"
-msgstr "Неавторизованный клиент отсоединён. (сокет уже уничтожен)"
-
-#. ts-context Core
-#: ../src/core/core.cpp:697
+#: ../src/core/core.cpp:592
+msgctxt "Core|"
 msgid "Could not initialize session for client:"
 msgstr "Не могу инициализировать сессию для клиента:"
 
-#. ts-context Core
-#: ../src/core/core.cpp:719
+#: ../src/core/core.cpp:619
+msgctxt "Core|"
 msgid "Could not find a session for client:"
 msgstr "Не удалось найти сессии для клиента:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccount
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountModel
-#: ../src/client/coreaccount.h:39 ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccount.h:40
+msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr "Встроенное ядро"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:260
+msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr "Редактировать аккаунт в ядре"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
+msgctxt "CoreAccountEditDlg|"
 msgid "Account Details"
 msgstr "Подробности аккаунта"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
+msgctxt "CoreAccountEditDlg|"
 msgid "Account Name:"
 msgstr "Название аккаунта:"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
+msgctxt "CoreAccountEditDlg|"
 msgid "Local Core"
 msgstr "Локальное ядро"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Хост:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:47
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:180
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+msgctxt "CoreAccountEditDlg|"
 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
+msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "Порт:"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+msgctxt "CoreAccountEditDlg|"
 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
+msgctxt "CoreAccountEditDlg|"
 msgid "Password:"
 msgstr "Пароль:"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
+msgctxt "CoreAccountEditDlg|"
 msgid "Remember"
 msgstr "Запомнить"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+msgctxt "CoreAccountEditDlg|"
 msgid "Use a Proxy"
 msgstr "Использовать прокси"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+msgctxt "CoreAccountEditDlg|"
 msgid "Socks 5"
 msgstr "Socks 5"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
-#: ../src/qtui/settingspages/servereditdlg.ui:201
+msgctxt "CoreAccountEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:262
+msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Добавить аккаунт в ядре"
 
-#. ts-context CoreAccountSettingsPage
+#: ../src/client/coreaccountmodel.cpp:68
+msgctxt "CoreAccountModel|"
+msgid "Internal Core"
+msgstr "Встроенное ядро"
+
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
+msgctxt "CoreAccountSettingsPage|"
 msgid "Connect to Quassel Core"
 msgstr "Соединение с ядром Quassel"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
+msgctxt "CoreAccountSettingsPage|"
 msgid "Core Accounts"
 msgstr "Учетные записи Quassel Core серверов"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
+msgctxt "CoreAccountSettingsPage|"
 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
+msgctxt "CoreAccountSettingsPage|"
 msgid "Add..."
 msgstr "Добавить..."
 
-#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
+msgctxt "CoreAccountSettingsPage|"
+msgid "Delete"
+msgstr "Удалить"
+
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
+msgctxt "CoreAccountSettingsPage|"
 msgid "Automatically connect on startup"
 msgstr "Подключаться при запуске"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
+msgctxt "CoreAccountSettingsPage|"
 msgid "Connect to last account used"
 msgstr "Подключаюсь к учетной записи, использовавшейся в прошлый сеанс"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
+msgctxt "CoreAccountSettingsPage|"
 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
+msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "Удаленные Quassel Core сервера"
 
-#. ts-context CoreConfigWizard
+#: ../src/core/coreauthhandler.cpp:54 ../src/core/coreauthhandler.cpp:90
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr "Клиент"
+
+#: ../src/core/coreauthhandler.cpp:54
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr "слишком старый, отказываю."
+
+#: ../src/core/coreauthhandler.cpp:55
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Your Quassel Client is too old!</b><br>This core needs at least "
+"client/core protocol version %1 (got: %2).<br>Please consider upgrading your"
+" client."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:69
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:90
+msgctxt "CoreAuthHandler|"
+msgid "did not send an init message before trying to login, rejecting."
+msgstr "не отправил инициализационное сообщение перед попыткой входа, отказываю."
+
+#: ../src/core/coreauthhandler.cpp:91
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Client not initialized!</b><br>You need to send an init message before "
+"trying to login."
+msgstr "<b>Клиент не инициализирован!</b><br>Вам нужно отправить инициализационное сообщение перед попыткой входа."
+
+#: ../src/core/coreauthhandler.cpp:105
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
+"core."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:146
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Invalid username or password!</b><br>The username/password combination "
+"you supplied could not be found in the database."
+msgstr "<b>Неверное имя пользователя или пароль!</b><br>Предоставленные вами имя пользователя и пароль не найдены в базе."
+
+#: ../src/core/coreauthhandler.cpp:151
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
 #: ../src/qtui/coreconfigwizard.cpp:69
+msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Мастер конфигурации ядра"
 
-#. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:97
+#: ../src/qtui/coreconfigwizard.cpp:98
+msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Ваше ядро сконфигурировано успешно. Выполняю вход в..."
 
-#. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:104
+#: ../src/qtui/coreconfigwizard.cpp:107
+#, qt-format
+msgctxt "CoreConfigWizard|"
 msgid ""
-"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
-msgstr ""
-"Ошибка конфигурации ядра:<br><b>%1</b><br>Нажмите <em>Далее</em> чтобы "
-"начать сначала."
+"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start "
+"over."
+msgstr "Ошибка конфигурации ядра:<br><b>%1</b><br>Нажмите <em>Далее</em> чтобы начать сначала."
 
-#. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:119
+#: ../src/qtui/coreconfigwizard.cpp:126
+msgctxt "CoreConfigWizard|"
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "
 "remember to configure your identities and networks now."
-msgstr ""
-"Вы вошли в свежесконфигурированное ядро Quassel!<br>Теперь, пожалуйста, не "
-"забудьте настроить ваши личности и сети."
+msgstr "Вы вошли в свежесконфигурированное ядро Quassel!<br>Теперь, пожалуйста, не забудьте настроить ваши личности и сети."
+
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+msgctxt "CoreConfigWizardAdminUserPage|"
+msgid "Form"
+msgstr "Форма"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardAdminUserPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectAuthDlg
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
-#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#. ts-context CoreConfigWizardAdminUserPage
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+msgctxt "CoreConfigWizardAdminUserPage|"
+msgid "Password:"
+msgstr "Пароль:"
+
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Повторите пароль:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardAdminUserPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectAuthDlg
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
-#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
-#. ts-context CoreConfigWizardAdminUserPage
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
-"<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
+"<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>\"."
+
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+msgctxt "CoreConfigWizardIntroPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:19
+msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Этот мастер поможет вам настроить ядро Quassel."
 
-#. ts-context CoreConfigWizardPages::AdminUserPage
-#: ../src/qtui/coreconfigwizard.cpp:150
+#: ../src/qtui/coreconfigwizard.cpp:162
+msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "Создание пользователя-администратора"
 
-#. ts-context CoreConfigWizardPages::AdminUserPage
-#: ../src/qtui/coreconfigwizard.cpp:151
+#: ../src/qtui/coreconfigwizard.cpp:163
+msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
-msgstr ""
-"Для начала мы создадим пользователя в ядре. У этого первого пользователя "
-"будут привилегии администратора."
+msgstr "Для начала мы создадим пользователя в ядре. У этого первого пользователя будут привилегии администратора."
 
-#. ts-context CoreConfigWizardPages::IntroPage
-#: ../src/qtui/coreconfigwizard.cpp:135
+#: ../src/qtui/coreconfigwizard.cpp:145
+msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Введение"
 
-#. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:182
+#: ../src/qtui/coreconfigwizard.cpp:198
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "Выбор средства хранения"
 
-#. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:183
+#: ../src/qtui/coreconfigwizard.cpp:199
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "
 "backlog and other data in."
-msgstr ""
-"Пожалуйста выберите движок базы данных, с помощью которого ядро Quassel "
-"будет хранить журнал и прочие данные."
+msgstr "Пожалуйста выберите движок базы данных, с помощью которого ядро Quassel будет хранить журнал и прочие данные."
 
-#. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:277
+#: ../src/qtui/coreconfigwizard.cpp:300
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Connection Properties"
 msgstr "Свойства соединения"
 
-#. ts-context CoreConfigWizardPages::SyncPage
-#: ../src/qtui/coreconfigwizard.cpp:317
+#: ../src/qtui/coreconfigwizard.cpp:342
+msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "Сохранение настроек"
 
-#. ts-context CoreConfigWizardPages::SyncPage
-#: ../src/qtui/coreconfigwizard.cpp:318
+#: ../src/qtui/coreconfigwizard.cpp:343
+msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "
 "automatically."
-msgstr ""
-"Ваши настройки сохраняются в ядре, вы будете подсоединены к ядру "
-"автоматически."
+msgstr "Ваши настройки сохраняются в ядре, вы будете подсоединены к ядру автоматически."
+
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+msgctxt "CoreConfigWizardStorageSelectionPage|"
+msgid "Form"
+msgstr "Форма"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardStorageSelectionPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Движок хранения:"
 
-#. ts-context CoreConfigWizardStorageSelectionPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Description"
 msgstr "Описание"
 
-#. ts-context CoreConfigWizardStorageSelectionPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Foobar"
 msgstr "Foobar"
 
-#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+msgctxt "CoreConfigWizardSyncPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Ваши выборы"
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Пользователь-администратор:"
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "foo"
 msgstr "foo"
 
-#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+msgctxt "CoreConfigWizardSyncPage|"
+msgid "Storage Backend:"
+msgstr "Движок хранения:"
+
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "bar"
 msgstr "bar"
 
-#. ts-context CoreConfigWizardSyncPage
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
-msgid "Please wait while your settings are being transmitted to the core..."
-msgstr "Пожалуйста подождите пока ваши настройки передаются ядру..."
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+msgctxt "CoreConfigWizardSyncPage|"
+msgid "Please wait while your settings are being transmitted to the core..."
+msgstr "Пожалуйста подождите пока ваши настройки передаются ядру..."
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+msgctxt "CoreConnectAuthDlg|"
+msgid "Authentication Required"
+msgstr "Требуется проверка подлинности"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+msgctxt "CoreConnectAuthDlg|"
+msgid "Please enter your account data:"
+msgstr "Пожалуйста, введите данные Вашей учётной записи:"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+msgctxt "CoreConnectAuthDlg|"
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgctxt "CoreConnectAuthDlg|"
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgctxt "CoreConnectAuthDlg|"
+msgid "Remember password"
+msgstr "Запомнить пароль"
+
+#: ../src/qtui/coreconnectdlg.cpp:81
+#, qt-format
+msgctxt "CoreConnectAuthDlg|"
+msgid "Please enter your credentials for %1:"
+msgstr "Пожалуйста, введите учетные данные для %1:"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:40
+#: ../src/qtui/coreconnectdlg.cpp:41
+msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr "Подключение к ядру"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
+#: ../src/client/coreconnection.cpp:193
+msgctxt "CoreConnection|"
+msgid "Network is down"
+msgstr "Сеть недоступна"
+
+#: ../src/client/coreconnection.cpp:227 ../src/client/coreconnection.cpp:328
+msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "Отключено"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:205
+#: ../src/client/coreconnection.cpp:230
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Looking up %1..."
 msgstr "Ищу хост %1..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:233
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Connecting to %1..."
 msgstr "Соединяюсь с %1..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
+#: ../src/client/coreconnection.cpp:236
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Connected to %1"
 msgstr "Соединение с %1 установлено"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:214
+#: ../src/client/coreconnection.cpp:239
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Disconnecting from %1..."
 msgstr "Идет отключение от %1..."
 
-#. 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 CoreConnection
-#: ../src/client/coreconnection.cpp:300
-msgid "Invalid data received from core"
-msgstr "От ядра были получены недопустимые данные"
-
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:349
+#: ../src/client/coreconnection.cpp:363
+msgctxt "CoreConnection|"
 msgid "Disconnected from core."
-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 CoreConnection
-#: ../src/client/coreconnection.cpp:457
-msgid "Synchronizing to core..."
-msgstr "Синхронизация с ядром..."
-
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:478
-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 CoreConnection
-#: ../src/client/coreconnection.cpp:592
-msgid "Logging in..."
-msgstr "Авторизуюсь..."
-
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:597
-msgid "Login canceled"
-msgstr "Вход в систему отменен"
+msgstr "&Отключиться от ядра"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:622
+#: ../src/client/coreconnection.cpp:501
+msgctxt "CoreConnection|"
 msgid "Receiving session state"
-msgstr ""
+msgstr "Получение состояния сетей"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:624
+#: ../src/client/coreconnection.cpp:503
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr "Синхронизация с %1..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:648
+#: ../src/client/coreconnection.cpp:539
+msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Получение состояния сетей"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:698
+#: ../src/client/coreconnection.cpp:590
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
 msgstr "Синхронизировано с %1"
 
-#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:14
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Network Status Detection"
+msgstr "Определение состояния сети"
+
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
+msgctxt "CoreConnectionSettingsPage|"
 msgid ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most "
-"KDE users"
-msgstr ""
-"Полагаться на аппаратный уровень KDE, чтобы определить, онлайн ли мы. "
-"Рекомендуется для большинства пользователей KDE"
+"Rely on KDE's hardware layer to detect if we're online. Recommended for most"
+" KDE users"
+msgstr "Полагаться на аппаратный уровень KDE, чтобы определить, онлайн ли мы. Рекомендуется для большинства пользователей KDE"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Use KDE's network status detection (via Solid)"
 msgstr "Используйте сетевое обнаружение состояния KDE (via Solid)"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Actively ping the remote core and disconnect if we didn't get a reply after "
 "a certain time"
-msgstr ""
-"Периодически запрашивать удаленное ядро, и отключаться, если от него нет "
-"отклика"
+msgstr "Периодически запрашивать удаленное ядро, и отключаться, если от него нет отклика"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Ping timeout after"
 msgstr "Отключаться через"
 
-#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
+msgctxt "CoreConnectionSettingsPage|"
+msgid " seconds"
+msgstr " сек."
+
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
+msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Only disconnect if the network socket gets closed by the operating system. "
 "This may take a long time after actually losing connectivity"
-msgstr ""
-"Отключаться только после закрытия соединения системой. Обнаружение "
-"отключения может пройти занять много времени"
+msgstr "Отключаться только после закрытия соединения системой. Обнаружение отключения может пройти занять много времени"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Never time out actively"
 msgstr "Неактивное время"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Automatically reconnect on network failures"
 msgstr "Автоматически переподключаться после разрыва соединения"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
+msgctxt "CoreConnectionSettingsPage|"
 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
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Remote Cores"
+msgstr "Удаленные Quassel Core сервера"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Connection"
 msgstr "Соединения"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionStatusWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+msgctxt "CoreConnectionStatusWidget|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "Сообщение"
 
-#. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgctxt "seconds"
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
-msgstr ""
+msgstr " сек"
 
-#. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgctxt "milliseconds"
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "мс"
 
-#. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#, qt-format
+msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr "(Задержка: %1 %2)"
 
-#. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:75
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
+msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr "Соединение с ядром использует SSL-шифрование."
 
-#. ts-context CoreConnectionStatusWidget
-#: ../src/qtui/coreconnectionstatuswidget.cpp:78
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
+msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr "Соединение с ядром не использует шифрование."
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:13
+msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Информация о ядре"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:21
+msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "Версия:"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:28
+msgctxt "CoreInfoDlg|"
 msgid "<core version>"
 msgstr "<core version>"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:35
+msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Аптайм:"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:42
+msgctxt "CoreInfoDlg|"
 msgid "Connected Clients:"
 msgstr "Соединено клиентов:"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:49
+msgctxt "CoreInfoDlg|"
 msgid "<connected clients>"
 msgstr "<connected clients>"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:56
+msgctxt "CoreInfoDlg|"
 msgid "<core uptime>"
 msgstr "<core uptime>"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:63
+msgctxt "CoreInfoDlg|"
 msgid "Build date:"
 msgstr "Дата сборки:"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:70
+msgctxt "CoreInfoDlg|"
 msgid "<build date>"
 msgstr "<build date>"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreInfoDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context DebugLogWidget
-#: ../src/qtui/ui/coreinfodlg.ui:81 ../src/qtui/ui/debuglogwidget.ui:43
+#: ../src/qtui/ui/coreinfodlg.ui:81
+msgctxt "CoreInfoDlg|"
 msgid "Close"
 msgstr "Закрыть"
 
-#. ts-context CoreInfoDlg
-#: ../src/qtui/coreinfodlg.cpp:53
+#: ../src/qtui/coreinfodlg.cpp:57
+#, qt-format
+msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
 msgid_plural "%n Day(s)"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#. ts-context CoreInfoDlg
-#: ../src/qtui/coreinfodlg.cpp:54
+#: ../src/qtui/coreinfodlg.cpp:58
+#, qt-format
+msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 (с %4)"
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:153
+#: ../src/core/corenetwork.cpp:167
+msgctxt "CoreNetwork|"
 msgid "Connection failed. Cycling to next Server"
 msgstr "Сбой соединения. Пробую следующий сервер"
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:161 ../src/core/corenetwork.cpp:162
+#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
-msgstr "Соединяюсь с %1:%2..."
+msgstr ""
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:210
+#: ../src/core/corenetwork.cpp:228
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
-msgstr "Отсоединяюсь. (%1)"
+msgstr ""
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:210
+#: ../src/core/corenetwork.cpp:228
+msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Ядро завершает работу"
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:339
+#: ../src/core/corenetwork.cpp:423
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr "Не могу подсоединиться к %1 (%2)"
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:341
+#: ../src/core/corenetwork.cpp:425
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "Сбой соединения: %1"
 
-#. ts-context CoreSession
-#: ../src/core/coresession.cpp:195
+#: ../src/core/coresession.cpp:230
+msgctxt "CoreSession|"
+msgid "Client"
+msgstr "Клиент"
+
+#: ../src/core/coresession.cpp:230
+#, qt-format
+msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr "отсоединён (UserId: %1)."
 
-#. ts-context CoreSession
-#: ../src/core/coresession.cpp:413
+#: ../src/core/coresession.cpp:477
+#, qt-format
+msgctxt "CoreSession|"
 msgid ""
-"CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
-"create network %1!"
-msgstr ""
-"CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь "
-"создать сеть %1!"
+"CoreSession::createNetwork(): Got invalid networkId from Core when trying to"
+" create network %1!"
+msgstr "CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь создать сеть %1!"
 
-#. ts-context CoreSession
-#: ../src/core/coresession.cpp:444
+#: ../src/core/coresession.cpp:509
+msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
+msgstr "CoreSession::createNetwork(): Попытался создать уже существующую сеть, вместо этого обновляю!"
+
+#: ../src/core/coresessioneventprocessor.cpp:78
+msgctxt "CoreSessionEventProcessor|"
+msgid ""
+"No free and valid nicks in nicklist found. use: /nick <othernick> to "
+"continue"
+msgstr "Среди ников в списке не найдено свободного и корректного. Используйте /nick <другой ник> для продолжения"
+
+#: ../src/core/coresessioneventprocessor.cpp:450
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to perform key exchange, missing qca-ossl plugin."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:461
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to parse the DH1080_INIT. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:465
+#: ../src/core/coresessioneventprocessor.cpp:473
+msgctxt "CoreSessionEventProcessor|"
+msgid "Your key is set and messages will be encrypted."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:475
+msgctxt "CoreSessionEventProcessor|"
+msgid "Failed to parse DH1080_FINISH. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1056
+msgctxt "CoreSessionEventProcessor|"
+msgid "Reverse DCC SEND not supported"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1074
+#, qt-format
+msgctxt "CoreSessionEventProcessor|"
+msgid "DCC %1 not supported"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:58
+msgctxt "CoreTransfer|"
+msgid "Socket closed while still transferring!"
 msgstr ""
-"CoreSession::createNetwork(): Попытался создать уже существующую сеть, "
-"вместо этого обновляю!"
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:81
+#: ../src/core/coretransfer.cpp:70
+#, qt-format
+msgctxt "CoreTransfer|"
+msgid "DCC connection error: %1"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:114
+msgctxt "CoreTransfer|"
+msgid "Reverse DCC not supported yet!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:160
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Got more data than expected!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:176
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Quassel Client disconnected during transfer!"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:88
+msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "отсутствует"
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:150
+#: ../src/core/coreuserinputhandler.cpp:169
+#, qt-format
+msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
-msgstr "посылка % CTCP-1 запрос к %2"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:190
+#: ../src/core/coreuserinputhandler.cpp:361
+#: ../src/core/coreuserinputhandler.cpp:606
+#: ../src/core/coreuserinputhandler.cpp:644
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
+" plugin."
+msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:173
+#: ../src/core/coreuserinputhandler.cpp:201
+msgctxt "CoreUserInputHandler|"
 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
+#: ../src/core/coreuserinputhandler.cpp:208
+#: ../src/core/coreuserinputhandler.cpp:662
+#, qt-format
+msgctxt "CoreUserInputHandler|"
 msgid "No key has been set for %1."
-msgstr ""
+msgstr "Тема для канала %1 не установлена."
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:193
+#: ../src/core/coreuserinputhandler.cpp:213
+#, qt-format
+msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:197
+#: ../src/core/coreuserinputhandler.cpp:217
+#: ../src/core/coreuserinputhandler.cpp:670
+msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
 "support for the Qt Cryptographic Architecture (QCA2) library. Contact your "
@@ -2595,20 +2310,32 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:461
+#: ../src/core/coreuserinputhandler.cpp:371
+msgctxt "CoreUserInputHandler|"
 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."
+"[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:476
-msgid "The key for %1 has been set."
+#: ../src/core/coreuserinputhandler.cpp:378
+msgctxt "CoreUserInputHandler|"
+msgid "It is only possible to exchange keys in a query buffer."
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:479
+#: ../src/core/coreuserinputhandler.cpp:388
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Failed to initiate key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:393
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Initiated key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:397
+#: ../src/core/coreuserinputhandler.cpp:628
+msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
 "support for the Qt Cryptographic Architecture (QCA) library. Contact your "
@@ -2616,703 +2343,954 @@ msgid ""
 "with QCA present."
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:587
+#: ../src/core/coreuserinputhandler.cpp:556
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:616
+msgctxt "CoreUserInputHandler|"
+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 ""
+
+#: ../src/core/coreuserinputhandler.cpp:625
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been set."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:654
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
+" or just /showkey when in a channel or query."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:666
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 is %2:%3"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:794
+#, qt-format
+msgctxt "CoreUserInputHandler|"
 msgid "[Error] Could not encrypt your message: %1"
 msgstr ""
 
-#. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
+msgctxt "CreateIdentityDlg|"
 msgid "Create New Identity"
 msgstr "Создать новую личность"
 
-#. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:25
+msgctxt "CreateIdentityDlg|"
 msgid "Identity name:"
 msgstr "Название личности:"
 
-#. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:37
+msgctxt "CreateIdentityDlg|"
 msgid "Create blank identity"
 msgstr "Создать пустую личность"
 
-#. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:49
+msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
 msgstr "Дублировать:"
 
-#. ts-context CtcpHandler
-#: ../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: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:229
-msgid "Received CTCP VERSION request by %1"
-msgstr "Получен запрос CTCP VERSION от %1"
-
-#. ts-context CtcpHandler
-#: ../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: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
+msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
 msgstr ""
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay View"
 msgstr ""
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
-msgstr ""
+msgstr "Свойства соединения"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:50
+msgctxt "DebugBufferViewOverlay|"
 msgid "BufferViews:"
 msgstr "Просмотр Буфера:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:51
+msgctxt "DebugBufferViewOverlay|"
 msgid "All Networks:"
 msgstr "Все сети:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:52
+msgctxt "DebugBufferViewOverlay|"
 msgid "Networks:"
 msgstr "Сети:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:53
+msgctxt "DebugBufferViewOverlay|"
 msgid "Buffers:"
-msgstr ""
+msgstr "Просмотр Буфера:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:54
+msgctxt "DebugBufferViewOverlay|"
 msgid "Removed buffers:"
 msgstr "Удаленные буфера:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:55
+msgctxt "DebugBufferViewOverlay|"
 msgid "Temp. removed buffers:"
 msgstr "Врем. удаленные буфера:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:57
+msgctxt "DebugBufferViewOverlay|"
 msgid "Allowed buffer types:"
 msgstr "Разрешенные типы буфера:"
 
-#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
+msgctxt "DebugBufferViewOverlay|"
+msgid "Minimum activity:"
+msgstr "Минимальная активность:"
+
 #: ../src/qtui/debugbufferviewoverlay.cpp:60
+msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr "Инициализирован:"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:14
+msgctxt "DebugConsole|"
 msgid "Debug Console"
 msgstr "Консоль отладки"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:44
+msgctxt "DebugConsole|"
 msgid "local"
 msgstr "local"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:54
+msgctxt "DebugConsole|"
 msgid "core"
 msgstr "core"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:82
+msgctxt "DebugConsole|"
 msgid "Evaluate!"
 msgstr "Вычислить!"
 
-#. ts-context DebugLogWidget
 #: ../src/qtui/ui/debuglogwidget.ui:13
+msgctxt "DebugLogWidget|"
 msgid "Debug Log"
 msgstr "Журнал отладки"
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:45
+#: ../src/qtui/ui/debuglogwidget.ui:43
+msgctxt "DebugLogWidget|"
+msgid "Close"
+msgstr "Закрыть"
+
+#: ../src/qtui/dockmanagernotificationbackend.cpp:184
+msgctxt "DockManagerNotificationBackend::ConfigWidget|"
+msgid "Mark dockmanager entry"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370
+msgctxt "EventStringifier|"
+msgid "[Whois] "
+msgstr "[Whois] %1"
+
+#: ../src/core/eventstringifier.cpp:239
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:341
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 has changed topic for %2 to: \"%3\""
+msgstr "%1 меняет тему канала %2 на \"%3\""
+
+#: ../src/core/eventstringifier.cpp:347
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Operwall] %1: %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:355
+msgctxt "EventStringifier|"
+msgid ""
+"Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
+"behavior!"
+msgstr "Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!"
+
+#: ../src/core/eventstringifier.cpp:384
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 is away: \"%2\""
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:391
+msgctxt "EventStringifier|"
+msgid "You are no longer marked as being away"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:399
+msgctxt "EventStringifier|"
+msgid "You have been marked as being away"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:421
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is %2 (%3)"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:437
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is online via %2 (%3)"
+msgstr "%1 подключен через %2 (%3)"
+
+#: ../src/core/eventstringifier.cpp:439
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was online via %2 (%3)"
+msgstr "[Whowas] %1 был %2 (%3)"
+
+#: ../src/core/eventstringifier.cpp:449
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was %2@%3 (%4)"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:458
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] End of /WHO list for %1"
+msgstr "[Who] Конец списка /WHO для %1"
+
+#: ../src/core/eventstringifier.cpp:470
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is logged in since %2"
+msgstr "[Whois] %1 в онлайне с %2"
+
+#: ../src/core/eventstringifier.cpp:474
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is idling for %2 (since %3)"
+msgstr "[Whois] %1 неактивен %2 (%3)"
+
+#: ../src/core/eventstringifier.cpp:484
+msgctxt "EventStringifier|"
+msgid "[Whois] End of /WHOIS list"
+msgstr "[Who] Конец списка /WHO для %1"
+
+#: ../src/core/eventstringifier.cpp:507
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is a user on channels: %2"
+msgstr "[Whois] %1 является участником каналов: %2"
+
+#: ../src/core/eventstringifier.cpp:509
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 has voice on channels: %2"
+msgstr "[Whois] %1 является участником с голосом на каналах: %2"
+
+#: ../src/core/eventstringifier.cpp:511
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is an operator on channels: %2"
+msgstr "[Whois] %1 является оператором каналов: %2"
+
+#: ../src/core/eventstringifier.cpp:532
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Channel %1 has %2 users. Topic is: \"%3\""
+msgstr "На канале %1 %2 пользователей. Тема: %3"
+
+#: ../src/core/eventstringifier.cpp:540
+msgctxt "EventStringifier|"
+msgid "End of channel list"
+msgstr "Конец списка каналов"
+
+#: ../src/core/eventstringifier.cpp:558
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Homepage for %1 is %2"
+msgstr "Домашняя страница для %1 %2"
+
+#: ../src/core/eventstringifier.cpp:575
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Channel %1 created on %2"
+msgstr "Создан канал %1 на сервере %2"
+
+#: ../src/core/eventstringifier.cpp:589
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is authed as %2"
+msgstr "[Whois] %1 отсутствует: \"%2\""
+
+#: ../src/core/eventstringifier.cpp:592
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was authed as %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:601
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "No topic is set for %1."
+msgstr "Тема для канала %1 не установлена."
+
+#: ../src/core/eventstringifier.cpp:609
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Topic for %1 is \"%2\""
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:621
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Topic set by %1 on %2"
+msgstr "Тема установлена %1 %2"
+
+#: ../src/core/eventstringifier.cpp:634
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:642
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] %1"
+msgstr "[Who] %1"
+
+#: ../src/core/eventstringifier.cpp:649
+msgctxt "EventStringifier|"
+msgid "End of /WHOWAS"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:659
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick %1 contains illegal characters"
+msgstr "Ник %1 содержит недопустимые символы"
+
+#: ../src/core/eventstringifier.cpp:669
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick already in use: %1"
+msgstr "Ник уже используется: %1"
+
+#: ../src/core/eventstringifier.cpp:679
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick/channel is temporarily unavailable: %1"
+msgstr "Ник/канал временно недоступен: %1"
+
+#: ../src/core/eventstringifier.cpp:702
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "sending CTCP-%1 request to %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:717
+msgctxt "EventStringifier|"
+msgid "unknown"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:718
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received %1CTCP-%2 request by %3"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:721
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-%1 answer from %2: %3"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:736
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
+msgstr "Получен ответ на CTCP от %1 с временем полного пути %2"
+
+#: ../src/client/execwrapper.cpp:49
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Invalid command string for /exec: %1"
 msgstr "Недопустимая командная строка для /exec: %1"
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:53
+#: ../src/client/execwrapper.cpp:58
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr "Имя \"%1\" недопустимо: ../ или ..\\ не допускаются!"
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:82
+#: ../src/client/execwrapper.cpp:69
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Could not find script \"%1\""
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:93
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
-msgstr "Скрипт \"%1\" потерпел крах с кодом завершения %2."
+msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:98
+#: ../src/client/execwrapper.cpp:111
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr "Не удалось запустить сценарий \"%1\""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:100
+#: ../src/client/execwrapper.cpp:113
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
-msgstr "Скрипт \"%1\" вызванная ошибка %2."
+msgstr ""
 
-#. ts-context FontSelector
-#: ../src/uisupport/fontselector.cpp:31
+#: ../src/uisupport/fontselector.cpp:32
+msgctxt "FontSelector|"
 msgid "Choose..."
 msgstr "Выбрать..."
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:19
+#: ../src/qtui/settingspages/highlightsettingspage.ui:14
+msgctxt "HighlightSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:20
+msgctxt "HighlightSettingsPage|"
 msgid "Custom Highlights"
 msgstr "Произвольные подсветки"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:37
+#: ../src/qtui/settingspages/highlightsettingspage.ui:33
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Highlight"
+msgstr "Подсветка"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "Регэксп"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "Регистр"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:47
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
+msgctxt "HighlightSettingsPage|"
 msgid "Enable"
 msgstr "Включено"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:55
+#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+msgctxt "HighlightSettingsPage|"
+msgid "Channel"
+msgstr "Канал"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
+msgctxt "HighlightSettingsPage|"
 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
+#: ../src/qtui/settingspages/highlightsettingspage.ui:76
+msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr "Удалить"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:85
+#: ../src/qtui/settingspages/highlightsettingspage.ui:101
+msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr "Подсвечивать ники"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:91
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
+msgctxt "HighlightSettingsPage|"
 msgid "All nicks from identity"
 msgstr "Все ники личности"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:98
+#: ../src/qtui/settingspages/highlightsettingspage.ui:114
+msgctxt "HighlightSettingsPage|"
 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
+#: ../src/qtui/settingspages/highlightsettingspage.ui:124
+msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr "Нет"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:115
+#: ../src/qtui/settingspages/highlightsettingspage.ui:131
+msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:184
+msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr "это не должно быть пусто"
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.h:45
+#: ../src/qtui/settingspages/highlightsettingspage.h:46
+msgctxt "HighlightSettingsPage|"
 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
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:370
+msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr "Переименовать личность"
 
-#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+msgctxt "IdentitiesSettingsPage|"
+msgid "..."
+msgstr ""
+
 #: ../src/qtui/settingspages/identitiessettingspage.ui:51
+msgctxt "IdentitiesSettingsPage|"
 msgid "Add Identity"
 msgstr "Добавить личность"
 
-#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
+msgctxt "IdentitiesSettingsPage|"
+msgid "Add..."
+msgstr "Добавить..."
+
 #: ../src/qtui/settingspages/identitiessettingspage.ui:74
+msgctxt "IdentitiesSettingsPage|"
 msgid "Remove Identity"
 msgstr "Удалить личность"
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgctxt "IdentitiesSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgctxt "IdentitiesSettingsPage|"
 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
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
+msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
-msgstr ""
-"<b>Прежде чем сохранить настройки, необходимо устранить следующие "
-"проблемы:</b><ul>"
+msgstr "<b>Прежде чем сохранить настройки, необходимо устранить следующие проблемы:</b><ul>"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr "<li>У всех личностей должно быть название</li>"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr "<li>В каждой личности должен быть хотя бы один ник</li>"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:208
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr "<li>Вам нужно указать настоящее имя для каждой личности</li>"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
+msgctxt "IdentitiesSettingsPage|"
 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
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
+msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:211
+msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr "Одна или несколько личностей некорректны"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
+msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr "Удалить личность?"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:357
+#, qt-format
+msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Вы действительно хотите удалить личность \"%1\"?"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:323
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:371
+#, qt-format
+msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr "Пожалуйста введите новое название личности \"%1\"!"
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:134
+#: ../src/common/identity.cpp:147
+msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr "Пользователь Quassel IRC"
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:162
+#: ../src/common/identity.cpp:177
+msgctxt "Identity|"
 msgid "<empty>"
 msgstr "<пусто>"
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:168
+#: ../src/common/identity.cpp:183
+msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Ловлю рыбу."
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:172
+#: ../src/common/identity.cpp:187
+msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr "Нет меня. Не, честно, нет меня!"
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:175
+#: ../src/common/identity.cpp:190
+msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr "Все клиенты Quassel стёрты с лица земли..."
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:178
+#: ../src/common/identity.cpp:193
+msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr "Детский сад в другом месте!"
 
-#. ts-context Identity
-#: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180
+#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
+msgctxt "Identity|"
 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
+msgctxt "IdentityEditWidget|"
 msgid "General"
 msgstr "Общие"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:38
+msgctxt "IdentityEditWidget|"
 msgid "Real Name:"
 msgstr "Настоящее имя:"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:45
+msgctxt "IdentityEditWidget|"
 msgid "The \"Real Name\" is shown in /whois."
 msgstr "\"Настоящее имя\" отображается в /whois."
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:54
+msgctxt "IdentityEditWidget|"
 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
+msgctxt "IdentityEditWidget|"
 msgid "Add Nickname"
 msgstr "Добавить ник"
 
-#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:93
+msgctxt "IdentityEditWidget|"
+msgid "&Add..."
+msgstr "Доб&авить..."
+
 #: ../src/qtui/settingspages/identityeditwidget.ui:116
+msgctxt "IdentityEditWidget|"
 msgid "Remove Nickname"
 msgstr "Удалить ник"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
+msgctxt "IdentityEditWidget|"
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:136
+msgctxt "IdentityEditWidget|"
+msgid "Rename Identity"
+msgstr "Переименовать личность"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:139
+msgctxt "IdentityEditWidget|"
+msgid "Re&name..."
+msgstr ""
+
 #: ../src/qtui/settingspages/identityeditwidget.ui:165
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
-#: ../src/qtui/ui/simplenetworkeditor.ui:165
+msgctxt "IdentityEditWidget|"
 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:168
+#: ../src/qtui/settingspages/identityeditwidget.ui:182
+msgctxt "IdentityEditWidget|"
+msgid "..."
+msgstr ""
+
 #: ../src/qtui/settingspages/identityeditwidget.ui:179
-#: ../src/qtui/settingspages/networkssettingspage.ui:292
-#: ../src/qtui/ui/simplenetworkeditor.ui:179
+msgctxt "IdentityEditWidget|"
 msgid "Move downwards in list"
 msgstr "Передвинуть вниз в списке"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:227
+msgctxt "IdentityEditWidget|"
 msgid "A&way"
-msgstr "&Отсутствую"
+msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:233
+msgctxt "IdentityEditWidget|"
 msgid "Default Away Settings"
 msgstr "Настройки состояния \"Отсутствую\" по умолчанию"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:244
+msgctxt "IdentityEditWidget|"
 msgid "Nick to be used when being away"
 msgstr "Ник для состояния \"Отсутствую\""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:254
+msgctxt "IdentityEditWidget|"
 msgid "Default away reason"
 msgstr "Причина по-умолчанию"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:261
+msgctxt "IdentityEditWidget|"
 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
+msgctxt "IdentityEditWidget|"
 msgid "Away Reason:"
 msgstr "Причина отсутствия:"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:280
+msgctxt "IdentityEditWidget|"
 msgid "Set away when all clients have detached from the core"
-msgstr ""
-"Устанавливать состояние \"отсутствую\" когда все клиенты отсоединены от ядра"
+msgstr "Устанавливать состояние \"отсутствую\" когда все клиенты отсоединены от ядра"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:283
+msgctxt "IdentityEditWidget|"
 msgid "Away On Detach"
 msgstr "\"Отсутствую\" при отсоединении"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:315
+msgctxt "IdentityEditWidget|"
 msgid "Not implemented yet"
 msgstr "Ещё не реализовано"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:318
+msgctxt "IdentityEditWidget|"
 msgid "Away On Idle"
 msgstr "\"Отсутствую\" при неактивности"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:332
+msgctxt "IdentityEditWidget|"
 msgid "Set away after"
 msgstr "Устанавливать \"отсутствую\" после"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:342
+msgctxt "IdentityEditWidget|"
 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
+#: ../src/qtui/settingspages/identityeditwidget.cpp:238
+msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:407
+msgctxt "IdentityEditWidget|"
 msgid "Ident:"
 msgstr "Идент:"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:414
+msgctxt "IdentityEditWidget|"
 msgid ""
 "The \"ident\" is part of your hostmask and, together with your host, "
 "uniquely identifies you within the IRC network."
-msgstr ""
-"\"Идент\" является частью хостмаски и вместе с хостом является однозначным "
-"идентификатором пользователя сети IRC."
+msgstr "\"Идент\" является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC."
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:423
+msgctxt "IdentityEditWidget|"
 msgid "Messages"
 msgstr "Сообщения"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:431
+msgctxt "IdentityEditWidget|"
 msgid "Part Reason:"
 msgstr "Причина выхода с канала:"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:444
+msgctxt "IdentityEditWidget|"
 msgid "Quit Reason:"
 msgstr "Причина выхода:"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:454
+msgctxt "IdentityEditWidget|"
 msgid "Kick Reason:"
 msgstr "Причина изгнания:"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:488
+msgctxt "IdentityEditWidget|"
 msgid ""
 "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
-msgstr ""
-"Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и "
-"сертификата SSL"
+msgstr "Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:517
+msgctxt "IdentityEditWidget|"
 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
+"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В случае продолжения передача вашего ключа и сертификата будет небезопасной!"
+
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:1044
+msgctxt "IdentityEditWidget|"
 msgid "Continue"
 msgstr "Продолжить"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:584
+msgctxt "IdentityEditWidget|"
 msgid "Use SSL Key"
 msgstr "Использовать ключ SSL"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:598
+msgctxt "IdentityEditWidget|"
 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
+#: ../src/qtui/settingspages/identityeditwidget.cpp:353
+#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+msgctxt "IdentityEditWidget|"
 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
+#: ../src/qtui/settingspages/identityeditwidget.cpp:354
+#: ../src/qtui/settingspages/identityeditwidget.cpp:408
+msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr "Загрузить"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:637
+msgctxt "IdentityEditWidget|"
 msgid "Use SSL Certificate"
 msgstr "Использовать сертификат SSL"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:656
+msgctxt "IdentityEditWidget|"
 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
+#: ../src/qtui/settingspages/identityeditwidget.cpp:406
+#: ../src/qtui/settingspages/identityeditwidget.cpp:407
+msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Сертификат не загружен"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:690
+msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "ОбщееИмя:"
 
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:321
+msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr "Загрузить ключ"
 
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+#: ../src/qtui/settingspages/identityeditwidget.cpp:344
+msgctxt "IdentityEditWidget|"
+msgid "Failed to read key"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:344
+msgctxt "IdentityEditWidget|"
+msgid ""
+"Failed to read the key file. It is either incompatible or invalid. Note that"
+" the key file must not have a passphrase."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:359
+msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:362
+msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr "DSA"
 
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:330
-#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+#: ../src/qtui/settingspages/identityeditwidget.cpp:367
+#: ../src/qtui/settingspages/identityeditwidget.cpp:413
+msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Очистить"
 
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#: ../src/qtui/settingspages/identityeditwidget.cpp:379
+msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Загрузить сертификат"
 
-#. ts-context IdentityPage
-#: ../src/qtui/ircconnectionwizard.cpp:107
+#: ../src/qtui/ircconnectionwizard.cpp:115
+msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr "Настроить личность"
 
-#. ts-context IdentityPage
-#: ../src/qtui/ircconnectionwizard.cpp:112
+#: ../src/qtui/ircconnectionwizard.cpp:120
+msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr "Личность по умолчанию"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
+msgctxt "IgnoreListEditDlg|"
 msgid "Configure Ignore Rule"
 msgstr "Настроить правило игнорирования"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
+msgctxt "IgnoreListEditDlg|"
 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 ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
+msgctxt "IgnoreListEditDlg|"
 msgid "Strictness"
 msgstr "Строгость"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
+msgctxt "IgnoreListEditDlg|"
 msgid "Dynamic"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
+msgctxt "IgnoreListEditDlg|"
 msgid "Permanent"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Rule Type:</b></p>\n"
 "<p><u>Sender:</u></p>\n"
@@ -3322,22 +3300,31 @@ msgid ""
 "<p>The rule is matched against the actual message content</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
+msgctxt "IgnoreListEditDlg|"
 msgid "Rule Type"
 msgstr "Тип правила"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
+msgctxt "IgnoreListEditDlg|"
 msgid "Sender"
 msgstr "Отправитель"
 
-#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgctxt "IgnoreListEditDlg|"
+msgid "Message"
+msgstr "Сообщение"
+
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
+msgctxt "IgnoreListEditDlg|"
+msgid "CTCP"
+msgstr "CTCP"
+
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
+msgctxt "IgnoreListEditDlg|"
 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"
@@ -3347,84 +3334,67 @@ msgid ""
 "<br />\n"
 "- <i>*@foobar.com</i> matches any sender from host <i>foobar.com</i>\n"
 "<br />\n"
-"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> "
-"from any host</p>"
+"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+msgctxt "IgnoreListEditDlg|"
 msgid "Ignore Rule"
-msgstr ""
+msgstr "Добавить правило игнорирования"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:123
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Use regular expressions:</b></p>\n"
 "<p>If enabled, rules follow regular expression syntax.</p>\n"
-"<p>Otherwise rules allow wildcard matching with the following special "
-"characters:</p>\n"
+"<p>Otherwise rules allow wildcard matching with the following special characters:</p>\n"
 "<p> *: representing \"any amount of any character\"\n"
 "<br />\n"
 "?: representing \"exactly one character\"</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
+msgctxt "IgnoreListEditDlg|"
 msgid "Regular expression"
 msgstr "Регулярное выражение"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
 "<p>The rule is active for any channel on any network</p>\n"
 "<p><u>Network:</u></p>\n"
-"<p>The list below is interpreted as a list of networks for which the rule "
-"should match</p>\n"
+"<p>The list below is interpreted as a list of networks for which the rule should match</p>\n"
 "<p><u>Channel:</u></p>\n"
-"<p>The list below is interpreted as a list of channels for which the rule "
-"should match</p>"
+"<p>The list below is interpreted as a list of channels for which the rule should match</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
+msgctxt "IgnoreListEditDlg|"
 msgid "Scope"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
+msgctxt "IgnoreListEditDlg|"
 msgid "Global"
 msgstr "Общие"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+msgctxt "IgnoreListEditDlg|"
 msgid "Network"
-msgstr ""
+msgstr "Сеть:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcListModel
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
-#: ../src/client/irclistmodel.cpp:59
+msgctxt "IgnoreListEditDlg|"
 msgid "Channel"
 msgstr "Канал"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Scope rule:</b></p>\n"
-"<p>A scope rule is a semicolon separated list of either <i>network</i> or "
-"<i>channel</i> names.</p>\n"
+"<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
 "<i>#quassel*; #foobar</i>\n"
@@ -3432,8 +3402,8 @@ msgid ""
 "would match on #foobar and on any channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -3441,20 +3411,20 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Правило включено"
 
-#. ts-context IgnoreListModel
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:69
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:71
+msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
 "dynamic rules, disabling actually shows the filtered messages again"
 msgstr ""
 
-#. ts-context IgnoreListModel
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:73
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
+msgctxt "IgnoreListModel|"
 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 "
@@ -3466,2349 +3436,2645 @@ msgid ""
 "host<br />"
 msgstr ""
 
-#. ts-context IgnoreListModel
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+msgctxt "IgnoreListModel|"
 msgid "By Sender"
-msgstr ""
+msgstr "Отправитель"
 
-#. ts-context IgnoreListModel
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:93
+msgctxt "IgnoreListModel|"
 msgid "By Message"
-msgstr ""
+msgstr "Сообщение"
 
-#. ts-context IgnoreListModel
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
+msgctxt "IgnoreListModel|"
 msgid "Enabled"
-msgstr ""
+msgstr "Включено"
 
-#. ts-context IgnoreListModel
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
+msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Вид"
 
-#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
+msgctxt "IgnoreListModel|"
+msgid "Ignore Rule"
+msgstr "Добавить правило игнорирования"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14
+msgctxt "IgnoreListSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
+msgctxt "IgnoreListSettingsPage|"
+msgid "New"
+msgstr "Новый"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42
+msgctxt "IgnoreListSettingsPage|"
+msgid "Delete"
+msgstr "Удалить"
+
 #: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
-msgstr ""
+msgstr "&Править..."
 
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+msgctxt "IgnoreListSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Список Игнорирования"
 
-#. ts-context IgnoreListSettingsPage
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
+msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Правило уже существует"
 
-#. ts-context IgnoreListSettingsPage
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
+#, qt-format
+msgctxt "IgnoreListSettingsPage|"
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
 "Please choose another rule."
-msgstr ""
-"Уже есть правило\n"
-"\"%1\"\n"
-"Пожалуйста выберите другое правило."
+msgstr "Уже есть правило\n\"%1\"\nПожалуйста выберите другое правило."
+
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
+msgctxt "IndicatorNotificationConfigWidget|"
+msgid "Form"
+msgstr "Форма"
 
-#. ts-context IndicatorNotificationConfigWidget
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
+msgctxt "IndicatorNotificationConfigWidget|"
 msgid ""
 "This enables support for the Ayatana Project's application indicator "
 "(libindicate)."
-msgstr ""
-"Это включает поддержку индикатора приложения Ayatana Project's (libindicate)."
+msgstr "Это включает поддержку индикатора приложения Ayatana Project's (libindicate)."
 
-#. ts-context IndicatorNotificationConfigWidget
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
+msgctxt "IndicatorNotificationConfigWidget|"
 msgid "Show messages in application indicator"
 msgstr "Показать сообщение в индикаторе приложения"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/ui/inputwidget.ui:26
+msgctxt "InputWidget|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "White"
 msgstr "Белый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Черный"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Темно-синий"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Темно-зеленый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Красный"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Темно-красный"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Фиолетовый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Оранжевый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Жёлтый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Зелёный"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Сине-зеленый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr ""
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Blue"
 msgstr ""
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Magenta"
-msgstr ""
+msgstr "Фиолетовый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Dark gray"
-msgstr ""
+msgstr "Темно-зеленый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
+msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Светло-серый"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+#: ../src/qtui/inputwidget.cpp:85 ../src/qtui/inputwidget.cpp:86
+msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Очистить цвет"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:132
+#: ../src/qtui/inputwidget.cpp:133
+msgctxt "InputWidget|"
 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:14
+msgctxt "InputWidgetSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:22
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
-#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
+msgctxt "InputWidgetSettingsPage|"
 msgid "Custom font:"
-msgstr ""
+msgstr "Пользовательский шрифт окна чата:"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable spell check"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr "Включить историю чата"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "Показать выбраные ники"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "Показать стиль кнопок"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgctxt "InputWidgetSettingsPage|"
 msgid "Emacs key bindings"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+msgctxt "InputWidgetSettingsPage|"
 msgid "Multi-Line Editing"
-msgstr "Многострочное поле текста"
+msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Показывать не более"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "строк"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "Включить прокрутку"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
-msgstr ""
+msgstr "Скопировать выделение"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr "Суффикс автодополнения:"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+msgctxt "InputWidgetSettingsPage|"
 msgid ": "
-msgstr ": "
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+msgctxt "InputWidgetSettingsPage|"
+msgid "Add space after nick when completing mid-sentence"
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
+msgctxt "InputWidgetSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
+msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
+msgstr "Строкаввода"
+
+#: ../src/common/internalpeer.cpp:58
+msgctxt "InternalPeer|"
+msgid "internal connection"
 msgstr ""
 
-#. ts-context IrcConnectionWizard
-#: ../src/qtui/ircconnectionwizard.cpp:51
+#: ../src/qtui/ircconnectionwizard.cpp:49
+msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr "Сохранить и соединиться"
 
-#. ts-context IrcListModel
-#: ../src/client/irclistmodel.cpp:60
+#: ../src/client/irclistmodel.cpp:65
+msgctxt "IrcListModel|"
+msgid "Channel"
+msgstr "Канал"
+
+#: ../src/client/irclistmodel.cpp:66
+msgctxt "IrcListModel|"
 msgid "Users"
 msgstr "Пользователи"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcListModel
-#. #-#-#-#-#  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
+#: ../src/client/irclistmodel.cpp:67
+msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Тема"
 
-#. ts-context IrcServerHandler
-#: ../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:634
-msgid "Received RPL_ISUPPORT (005) without parameters!"
-msgstr "Получено RPL_ISUPPORT (005) без параметров!"
-
-#. ts-context IrcServerHandler
-#: ../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
-#. #-#-#-#-#  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:718
-msgid "[Whois] %1 is away: \"%2\""
-msgstr "[Whois] %1 отсутствует: \"%2\""
-
-#. ts-context IrcServerHandler
-#: ../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: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:802 ../src/core/ircserverhandler.cpp:805
-msgid "[Whois] %1 is %2 (%3)"
-msgstr "[Whois] %1 это %2 (%3)"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:820
-msgid "%1 is online via %2 (%3)"
-msgstr "%1 подключен через %2 (%3)"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:824 ../src/core/ircserverhandler.cpp:1131
-msgid "[Whowas] %1"
-msgstr "[Whowas] %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:850
-msgid "[Whowas] %1 was %2 (%3)"
-msgstr "[Whowas] %1 был %2 (%3)"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:864
-msgid "[Who] End of /WHO list for %1"
-msgstr "[Who] Конец списка /WHO для %1"
-
-#. ts-context IrcServerHandler
-#: ../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: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:928
-msgid "[Whois] %1 is a user on channels: %2"
-msgstr "[Whois] %1 является участником каналов: %2"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:930
-msgid "[Whois] %1 has voice on channels: %2"
-msgstr "[Whois] %1 является участником с голосом на каналах: %2"
-
-#. ts-context IrcServerHandler
-#: ../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:960
-msgid "Channel %1 has %2 users. Topic is: %3"
-msgstr "На канале %1 %2 пользователей. Тема: %3"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:969
-msgid "End of channel list"
-msgstr "Конец списка каналов"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:987
-msgid "Homepage for %1 is %2"
-msgstr "Домашняя страница для %1 %2"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1005
-msgid "Channel %1 created on %2"
-msgstr "Создан канал %1 на сервере %2"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1019
-msgid "No topic is set for %1."
-msgstr "Тема для канала %1 не установлена."
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1039
-msgid "Topic for %1 is \"%2\""
-msgstr "Тема канала %1 \"%2\""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1050
-msgid "Topic set by %1 on %2"
-msgstr "Тема установлена %1 %2"
-
-#. ts-context IrcServerHandler
-#: ../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:1149
-msgid "Nick %1 contains illegal characters"
-msgstr "Ник %1 содержит недопустимые символы"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1160
-msgid "Nick already in use: %1"
-msgstr "Ник уже используется: %1"
-
-#. ts-context IrcServerHandler
-#: ../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 ""
-"Среди ников в списке не найдено свободного и корректного. Используйте /nick "
-"<другой ник> для продолжения"
-
-#. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:806
+#: ../src/client/networkmodel.cpp:914
+msgctxt "IrcUserItem|"
 msgid " is away"
-msgstr ""
+msgstr "%1 отсутствует: \"%2\""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcUserItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:821 ../src/client/networkmodel.cpp:447
+#: ../src/client/networkmodel.cpp:929
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "idling since %1"
 msgstr "неактивен с %1"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcUserItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:824 ../src/client/networkmodel.cpp:450
+#: ../src/client/networkmodel.cpp:932
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "login time: %1"
 msgstr "время входа: %1"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcUserItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:827 ../src/client/networkmodel.cpp:453
+#: ../src/client/networkmodel.cpp:935
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "server: %1"
 msgstr "сервер: %1"
 
-#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:14
+msgctxt "ItemViewSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
+msgctxt "ItemViewSettingsPage|"
+msgid "Custom font:"
+msgstr "Пользовательский шрифт окна чата:"
+
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:50
+msgctxt "ItemViewSettingsPage|"
 msgid "Show icons"
 msgstr "Показать иконки"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:66
+msgctxt "ItemViewSettingsPage|"
 msgid "Chat List"
 msgstr "Список Чата"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:72
+msgctxt "ItemViewSettingsPage|"
 msgid "Display topic in tooltip"
 msgstr "Показывать тему во всплывающей подсказке"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:85
+msgctxt "ItemViewSettingsPage|"
 msgid "Mouse wheel changes selected chat"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:101
+msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr "Использовать Пользовательские Цвета"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
+#: ../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
+msgctxt "ItemViewSettingsPage|"
+msgid "..."
+msgstr ""
+
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+msgctxt "ItemViewSettingsPage|"
 msgid "Inactive:"
 msgstr "Неактивно:"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
-msgstr ""
+msgstr "Собственные сообщения:"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr "Подсветка:"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+msgctxt "ItemViewSettingsPage|"
 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
+msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Список Цветов Пользовательского Ника"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "Онлайн:"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Отсутствует:"
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
+msgctxt "ItemViewSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
+msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr "Чат & Ник Списки"
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
-msgid "Inactive"
-msgstr ""
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:34
+msgctxt "ItemViewSettingsPage|"
+msgid "Network"
+msgstr "Сеть:"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+msgctxt "ItemViewSettingsPage|"
+msgid "Inactive"
+msgstr "Неактивно:"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+msgctxt "ItemViewSettingsPage|"
 msgid "Normal"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages"
-msgstr ""
+msgstr "Непрочитанные сообщения в чате"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+msgctxt "ItemViewSettingsPage|"
+msgid "Highlight"
+msgstr "Подсветка"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41
+msgctxt "ItemViewSettingsPage|"
 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"
+#: ../src/qtui/knotificationbackend.cpp:130
+#, qt-format
+msgctxt "KNotificationBackend|"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#. ts-context KeySequenceButton
-#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+#: ../src/qtui/settingspages/keysequencewidget.cpp:80
+msgctxt "KeySequenceButton|"
 msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
-#. ts-context KeySequenceButton
-#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+#: ../src/qtui/settingspages/keysequencewidget.cpp:81
+msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+#: ../src/qtui/settingspages/keysequencewidget.cpp:176
+msgctxt "KeySequenceWidget|"
 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 KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:259
-msgctxt "Meta key"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:274
+msgctxt "KeySequenceWidget|Meta key"
 msgid "Meta"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:260
-msgctxt "Ctrl key"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:275
+msgctxt "KeySequenceWidget|Ctrl key"
 msgid "Ctrl"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:261
-msgctxt "Alt key"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276
+msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
-msgstr ""
+msgstr "Все"
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:262
-msgctxt "Shift key"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:277
+msgctxt "KeySequenceWidget|Shift key"
 msgid "Shift"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:265
-msgctxt "What the user inputs now will be taken as the new shortcut"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:281
+msgctxt ""
+"KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
 msgid "Input"
-msgstr ""
+msgstr "Строкаввода"
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:272
-msgctxt "No shortcut defined"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:288
+msgctxt "KeySequenceWidget|No shortcut defined"
 msgid "None"
-msgstr ""
+msgstr "Нет"
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:355
-#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+#: ../src/qtui/settingspages/keysequencewidget.cpp:383
+#: ../src/qtui/settingspages/keysequencewidget.cpp:389
+msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#: ../src/qtui/settingspages/keysequencewidget.cpp:384
+#, qt-format
+msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is already in use, and cannot be configured.\n"
 "Please choose another one."
-msgstr ""
+msgstr "Уже есть правило\n\"%1\"\nПожалуйста выберите другое правило."
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+#: ../src/qtui/settingspages/keysequencewidget.cpp:390
+#, qt-format
+msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+#: ../src/qtui/settingspages/keysequencewidget.cpp:392
+msgctxt "KeySequenceWidget|"
 msgid "Do you want to reassign this shortcut to the selected action?"
 msgstr ""
 
-#. ts-context KeySequenceWidget
-#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+#: ../src/qtui/settingspages/keysequencewidget.cpp:395
+msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:314
+#: ../src/common/protocols/legacy/legacypeer.cpp:175
+msgctxt "LegacyPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:246
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:295
+#, qt-format
+msgctxt "LegacyPeer|"
+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)"
+
+#: ../src/qtui/mainwin.cpp:358
+msgctxt "MainWin|"
+msgid "General"
+msgstr "Общие"
+
+#: ../src/qtui/mainwin.cpp:360
+msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "&Подключиться к ядру..."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:316
+#: ../src/qtui/mainwin.cpp:362
+msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "&Отключиться от ядра"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:318
+#: ../src/qtui/mainwin.cpp:364
+msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "&Инфромация ядра..."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:366
+msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "Настроить &сети..."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:323
+#: ../src/qtui/mainwin.cpp:369
+msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "В&ыход"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:373
+msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "&Настройка Списка Чата"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:330
+#: ../src/qtui/mainwin.cpp:376
+msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr "&Блокировать расположение"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:334
+#: ../src/qtui/mainwin.cpp:380
+msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "Показать строку &поиска"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:336
+#: ../src/qtui/mainwin.cpp:382
+msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Показать журнал отсутствия"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:384
+msgctxt "MainWin|"
 msgid "Show &Menubar"
-msgstr ""
+msgstr "Показать строку &поиска"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:341
+#: ../src/qtui/mainwin.cpp:387
+msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "Показать строку &статуса"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:343 ../src/qtui/mainwin.cpp:1185
-msgid "&Fullscreen mode"
+#: ../src/qtui/mainwin.cpp:393
+msgctxt "MainWin|"
+msgid "&Full Screen Mode"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:347
+#: ../src/qtui/mainwin.cpp:400
+msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
-msgstr ""
+msgstr "Настроить &сети..."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:349
+#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410
+msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr "&Настройки Quassel..."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:353
+#: ../src/qtui/mainwin.cpp:416
+msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&О Quassel"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:421
+msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "О &Qt"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:357
+#: ../src/qtui/mainwin.cpp:425
+msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Отладить &NetworkModel"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:359
+#: ../src/qtui/mainwin.cpp:427
+msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:361
+#: ../src/qtui/mainwin.cpp:429
+msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Отладить &MessageModel"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:363
+#: ../src/qtui/mainwin.cpp:431
+msgctxt "MainWin|"
 msgid "Debug &HotList"
-msgstr ""
+msgstr "&Журнал отладки"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:433
+msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "&Журнал отладки"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:367
+#: ../src/qtui/mainwin.cpp:435
+msgctxt "MainWin|"
 msgid "Reload Stylesheet"
+msgstr "Использовать свою таблицу стилей"
+
+#: ../src/qtui/mainwin.cpp:438
+msgctxt "MainWin|"
+msgid "Hide Current Buffer"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:442
+msgctxt "MainWin|"
 msgid "Navigation"
-msgstr ""
+msgstr "Организация:"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:373
+#: ../src/qtui/mainwin.cpp:444
+msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:385
+#: ../src/qtui/mainwin.cpp:456
+msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:387
+#: ../src/qtui/mainwin.cpp:458
+msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:389
+#: ../src/qtui/mainwin.cpp:460
+msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:462
+msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:464
+msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:395
+#: ../src/qtui/mainwin.cpp:466
+msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:397
+#: ../src/qtui/mainwin.cpp:468
+msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:399
+#: ../src/qtui/mainwin.cpp:470
+msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:401
+#: ../src/qtui/mainwin.cpp:472
+msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:403
+#: ../src/qtui/mainwin.cpp:474
+msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:406
+#: ../src/qtui/mainwin.cpp:477
+msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:408
+#: ../src/qtui/mainwin.cpp:479
+msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:481
+msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:483
+msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:485
+msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:416
+#: ../src/qtui/mainwin.cpp:487
+msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:489
+msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:491
+msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:493
+msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:424
+#: ../src/qtui/mainwin.cpp:495
+msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:428
+#: ../src/qtui/mainwin.cpp:499
+msgctxt "MainWin|"
 msgid "Activate Next Chat List"
-msgstr ""
+msgstr "Удалить Чатлист?"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:430
+#: ../src/qtui/mainwin.cpp:501
+msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:432
+#: ../src/qtui/mainwin.cpp:503
+msgctxt "MainWin|"
 msgid "Go to Next Chat"
-msgstr ""
+msgstr "Войти в Чат"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:434
+#: ../src/qtui/mainwin.cpp:505
+msgctxt "MainWin|"
 msgid "Go to Previous Chat"
-msgstr ""
+msgstr "Войти в Чат"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:441
+#: ../src/qtui/mainwin.cpp:514
+msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Файл"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:454
+#: ../src/qtui/mainwin.cpp:527
+msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Сети"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:460
+#: ../src/qtui/mainwin.cpp:533
+msgctxt "MainWin|"
 msgid "&View"
 msgstr "&Вид"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:461
+#: ../src/qtui/mainwin.cpp:534
+msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Список Чатов"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:463
+#: ../src/qtui/mainwin.cpp:536
+msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "Па&нели"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:550
+msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "&Настройки"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:486
+#: ../src/qtui/mainwin.cpp:559
+msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Помощь"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:494
+#: ../src/qtui/mainwin.cpp:567
+msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Отладка"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:723
+#: ../src/qtui/mainwin.cpp:843
+msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Ники"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:732
+#: ../src/qtui/mainwin.cpp:852
+msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Показать список ников"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:755
+#: ../src/qtui/mainwin.cpp:865
+msgctxt "MainWin|"
+msgid "Chat Monitor"
+msgstr "Монитор чата"
+
+#: ../src/qtui/mainwin.cpp:877
+msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Показать монитор чата"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:759
+#: ../src/qtui/mainwin.cpp:883
+msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Строкаввода"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:768
+#: ../src/qtui/mainwin.cpp:892
+msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Показать строку ввода"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:793
+#: ../src/qtui/mainwin.cpp:907
+msgctxt "MainWin|"
+msgid "Topic"
+msgstr "Тема"
+
+#: ../src/qtui/mainwin.cpp:919
+msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Показать строку темы"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1013
+msgctxt "MainWin|"
 msgid "Main Toolbar"
-msgstr ""
+msgstr "Па&нели"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:910
+#: ../src/qtui/mainwin.cpp:1058
+msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Соединение с ядром установлено."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1001
+#: ../src/qtui/mainwin.cpp:1157
+msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "Нет соединения с ядром."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1015 ../src/qtui/mainwin.cpp:1023
+#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1185
+msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Незашифрованное Подключение"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1175
+msgctxt "MainWin|"
 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
+#: ../src/qtui/mainwin.cpp:1177 ../src/qtui/mainwin.cpp:1187
+msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1023
+#: ../src/qtui/mainwin.cpp:1185
+msgctxt "MainWin|"
 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
+#: ../src/qtui/mainwin.cpp:1203 ../src/qtui/mainwin.cpp:1224
+msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Недоверяемый Сертификат Безопасности"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1041
+#: ../src/qtui/mainwin.cpp:1204
+#, qt-format
+msgctxt "MainWin|"
 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
+#: ../src/qtui/mainwin.cpp:1207
+msgctxt "MainWin|"
+msgid "Continue"
+msgstr "Продолжить"
+
+#: ../src/qtui/mainwin.cpp:1208
+msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Показать Сертификаты"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1061
+#: ../src/qtui/mainwin.cpp:1225
+msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1063
+#: ../src/qtui/mainwin.cpp:1227
+msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Только Текущий Сеанс"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1064
+#: ../src/qtui/mainwin.cpp:1228
+msgctxt "MainWin|"
 msgid "Forever"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1073
+#: ../src/qtui/mainwin.cpp:1239
+msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Основная Ошибка Подключения"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:1190
-msgid "&Normal mode"
-msgstr ""
-
-#. ts-context MessageModel
-#: ../src/client/messagemodel.cpp:375
+#: ../src/client/messagemodel.cpp:404
+#, qt-format
+msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "Запрашиваю %1 сообщений из журнала для буфера %2:%3"
 
-#. ts-context MsgProcessorStatusWidget
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+msgctxt "MsgProcessorStatusWidget|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 
-#. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:661
-msgid "Do you really want to paste %n lines?"
-msgid_plural "Do you really want to paste %n lines?"
+#: ../src/uisupport/multilineedit.cpp:718
+#, qt-format
+msgctxt "MultiLineEdit|"
+msgid "Do you really want to paste %n line(s)?"
+msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:670
+#: ../src/uisupport/multilineedit.cpp:727
+msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Защита при вставке"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkEditDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:14
-#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+msgctxt "NetworkAddDlg|"
 msgid "Add Network"
 msgstr "Добавить сеть"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:22
+msgctxt "NetworkAddDlg|"
 msgid "Use preset:"
 msgstr "Выбрать известную сеть:"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:57
+msgctxt "NetworkAddDlg|"
 msgid "Manually specify network settings"
 msgstr "Вручную указать параметры сети"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:67
+msgctxt "NetworkAddDlg|"
 msgid "Manual Settings"
 msgstr "Ручные настройки"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/networkadddlg.ui:75
-#: ../src/qtui/ui/simplenetworkeditor.ui:28
+msgctxt "NetworkAddDlg|"
 msgid "Network name:"
 msgstr "Название сети:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:85
-#: ../src/qtui/settingspages/servereditdlg.ui:38
+msgctxt "NetworkAddDlg|"
 msgid "Server address:"
 msgstr "Адрес сервера:"
 
-#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:95
+msgctxt "NetworkAddDlg|"
+msgid "Port:"
+msgstr "Порт:"
+
 #: ../src/qtui/settingspages/networkadddlg.ui:115
+msgctxt "NetworkAddDlg|"
 msgid "Server password:"
 msgstr "Пароль сервера:"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:131
+msgctxt "NetworkAddDlg|"
 msgid "Use secure connection"
 msgstr "Использовать безопасное соединение"
 
-#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkeditdlg.ui:13
+msgctxt "NetworkEditDlg|"
+msgid "Dialog"
+msgstr "Диалог"
+
 #: ../src/qtui/settingspages/networkeditdlg.ui:21
+msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "Пожалуйста введите название сети:"
 
-#. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:196
+#: ../src/qtui/settingspages/networkssettingspage.cpp:840
+msgctxt "NetworkEditDlg|"
+msgid "Add Network"
+msgstr "Добавить сеть"
+
+#: ../src/client/networkmodel.cpp:213
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Server: %1"
-msgstr "Сервер: %1"
+msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:197 ../src/qtui/topicwidget.cpp:106
+#: ../src/client/networkmodel.cpp:214
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Users: %1"
-msgstr "Пользователи: %1"
+msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:200 ../src/qtui/topicwidget.cpp:107
+#: ../src/client/networkmodel.cpp:217
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Lag: %1 msecs"
 msgstr "Лаг: %1 мс"
 
-#. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
+msgctxt "NetworkModel|"
 msgid "Chat"
-msgstr ""
+msgstr "Вид Окна Чата"
+
+#: ../src/client/networkmodel.cpp:963
+msgctxt "NetworkModel|"
+msgid "Topic"
+msgstr "Тема"
 
-#. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
+msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Ников"
 
-#. ts-context NetworkModelController
-#: ../src/uisupport/networkmodelcontroller.cpp:154
+#: ../src/uisupport/networkmodelcontroller.cpp:177
+msgctxt "NetworkModelController|"
 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 NetworkModelController
-#: ../src/uisupport/networkmodelcontroller.cpp:167
+#: ../src/uisupport/networkmodelcontroller.cpp:190
+#, qt-format
+msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "... и <b> %1 </b> больше <br> <br>"
 
-#. ts-context NetworkModelController
-#: ../src/uisupport/networkmodelcontroller.cpp:168
+#: ../src/uisupport/networkmodelcontroller.cpp:191
+msgctxt "NetworkModelController|"
 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> Это удалит все соответствующие данные, включае весь "
-"журнал, из базы данных ядра без возможности отмены."
+msgstr "<b>Замечание:</b> Это удалит все соответствующие данные, включае весь журнал, из базы данных ядра без возможности отмены."
+
+#: ../src/uisupport/networkmodelcontroller.cpp:193
+msgctxt "NetworkModelController|"
+msgid ""
+"<br>Active channel buffers cannot be deleted, please part the channel first."
+msgstr "<br>Нельзя удалить буферы активных каналов. Пожалуйста, сначала покиньте канал."
 
-#. ts-context NetworkModelController
-#: ../src/uisupport/networkmodelcontroller.cpp:172
+#: ../src/uisupport/networkmodelcontroller.cpp:195
+msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Удалить буфера навсегда?"
 
-#. ts-context NetworkModelController::JoinDlg
-#: ../src/uisupport/networkmodelcontroller.cpp:484
+#: ../src/uisupport/networkmodelcontroller.cpp:530
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Зайти на канал"
 
-#. ts-context NetworkModelController::JoinDlg
-#: ../src/uisupport/networkmodelcontroller.cpp:489
+#: ../src/uisupport/networkmodelcontroller.cpp:533
+msgctxt "NetworkModelController::JoinDlg|"
+msgid "Network:"
+msgstr "Сеть:"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:535
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Канал:"
 
-#. ts-context NetworkPage
-#: ../src/qtui/ircconnectionwizard.cpp:148
+#: ../src/uisupport/networkmodelcontroller.cpp:537
+msgctxt "NetworkModelController::JoinDlg|"
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../src/qtui/ircconnectionwizard.cpp:158
+msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr "Настройка сетевого соединения"
 
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:14
+msgctxt "NetworksSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:48
+msgctxt "NetworksSettingsPage|"
+msgid "Re&name..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:65
+#: ../src/qtui/settingspages/networkssettingspage.ui:235
+msgctxt "NetworksSettingsPage|"
+msgid "&Add..."
+msgstr "Доб&авить..."
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:88
+#: ../src/qtui/settingspages/networkssettingspage.ui:252
+msgctxt "NetworksSettingsPage|"
+msgid "De&lete"
+msgstr ""
+
 #: ../src/qtui/settingspages/networkssettingspage.ui:124
+msgctxt "NetworksSettingsPage|"
 msgid "Network Details"
 msgstr "Подробности сети"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:132
+msgctxt "NetworksSettingsPage|"
 msgid "Identity:"
 msgstr "Личность:"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:149
+#: ../src/qtui/settingspages/networkssettingspage.ui:281
+#: ../src/qtui/settingspages/networkssettingspage.ui:295
+msgctxt "NetworksSettingsPage|"
+msgid "..."
+msgstr ""
+
 #: ../src/qtui/settingspages/networkssettingspage.ui:190
-#: ../src/qtui/ui/simplenetworkeditor.ui:63
+msgctxt "NetworksSettingsPage|"
 msgid "Servers"
 msgstr "Серверы"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:193
+msgctxt "NetworksSettingsPage|"
 msgid "Manage servers for this network"
 msgstr "Управление серверами данной сети"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/networkssettingspage.ui:217
-#: ../src/qtui/ui/simplenetworkeditor.ui:99
+msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr "&Править..."
 
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:278
+msgctxt "NetworksSettingsPage|"
+msgid "Move upwards in list"
+msgstr "Передвинуть вверх в списке"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
+msgctxt "NetworksSettingsPage|"
+msgid "Move downwards in list"
+msgstr "Передвинуть вниз в списке"
+
 #: ../src/qtui/settingspages/networkssettingspage.ui:337
+msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Команды"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:340
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
-msgstr ""
-"Настройка автоматического выполнения идентификационных или любых других "
-"команд при подключении к серверу"
+msgstr "Настройка автоматического выполнения идентификационных или любых других команд при подключении к серверу"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:346
+msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "При подключении выполнить команды:"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:362
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
-"Note that Quassel IRC automatically rejoins channels, so /join will rarely "
-"be needed here!"
-msgstr ""
-"Укажите список команд IRC, которые будут выполнены при подключении.\n"
-"Учтите, что Quassel автоматически входит на каналы, так что /join здесь "
-"нужен редко!"
+"Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
+msgstr "Укажите список команд IRC, которые будут выполнены при подключении.\nУчтите, что Quassel автоматически входит на каналы, так что /join здесь нужен редко!"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgctxt "NetworksSettingsPage|"
+msgid "Connection"
+msgstr "Соединения"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:383
+msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr "Автоматически переподключиться к IRC сети после ошибки подключения"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:386
+msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Автоматическое соединение"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:397
+msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:404
+msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr " сек"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:420
+msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr "между повторениями"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:444
+msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
-msgstr ""
+msgstr "между повторениями"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:464
+msgctxt "NetworksSettingsPage|"
+msgid "Unlimited"
+msgstr "Неограничено"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:489
+msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "Перезайти на все каналы после переподключения"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:516
 #: ../src/qtui/settingspages/networkssettingspage.ui:525
+msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
 msgstr "Автоматическая идентификация"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:540
+msgctxt "NetworksSettingsPage|"
 msgid "NickServ"
 msgstr "NickServ"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:557
+msgctxt "NetworksSettingsPage|"
 msgid "Service:"
 msgstr "Служба:"
 
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:567
+#: ../src/qtui/settingspages/networkssettingspage.ui:615
+msgctxt "NetworksSettingsPage|"
+msgid "Password:"
+msgstr "Пароль:"
+
 #: ../src/qtui/settingspages/networkssettingspage.ui:580
+msgctxt "NetworksSettingsPage|"
 msgid "Use SASL Authentication"
 msgstr "Использовать SASL Аутентификацию"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:625
+msgctxt "NetworksSettingsPage|"
 msgid "Account:"
+msgstr "Название аккаунта:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:635
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
+" the identity has an ssl certificate set, SASL EXTERNAL will be "
+"used.</p></body></html>"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:649
+#: ../src/qtui/settingspages/networkssettingspage.ui:659
+msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "Кодировки"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:652
+#: ../src/qtui/settingspages/networkssettingspage.ui:662
+msgctxt "NetworksSettingsPage|"
 msgid ""
-"Configure advanced settings such as message encodings and automatic reconnect"
-msgstr ""
-"Настроить дополнительные параметры, такие как кодировки сообщений и "
-"автоматическое соединение"
+"Configure advanced settings such as message encodings and automatic "
+"reconnect"
+msgstr "Настроить дополнительные параметры, такие как кодировки сообщений и автоматическое соединение"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:661
+#: ../src/qtui/settingspages/networkssettingspage.ui:671
+msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Управление кодировками для входящих и исходящих сообщений"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:664
+#: ../src/qtui/settingspages/networkssettingspage.ui:674
+msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr "Использовать свои кодировки"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:675
-#: ../src/qtui/settingspages/networkssettingspage.ui:695
+#: ../src/qtui/settingspages/networkssettingspage.ui:685
+#: ../src/qtui/settingspages/networkssettingspage.ui:705
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
-msgstr ""
-"Укажите кодировки, в которых будут отправляться ваши сообщения.\n"
-"UTF-8 должен быть разумным выбором для большинства сетей."
+msgstr "Укажите кодировки, в которых будут отправляться ваши сообщения.\nUTF-8 должен быть разумным выбором для большинства сетей."
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:679
+#: ../src/qtui/settingspages/networkssettingspage.ui:689
+msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Отправлять сообщения в:"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:706
-#: ../src/qtui/settingspages/networkssettingspage.ui:726
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
+#: ../src/qtui/settingspages/networkssettingspage.ui:736
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Incoming messages encoded in Utf8 will always be treated as such.\n"
 "This setting defines the encoding for messages that are not Utf8."
-msgstr ""
-"Входящие сообщения, закодированные в Utf8, всегда будут обработаны как "
-"надо.\n"
-"Эти настройки затрагивают только сообщения не в кодировке Utf8."
+msgstr "Входящие сообщения, закодированные в Utf8, всегда будут обработаны как надо.\nЭти настройки затрагивают только сообщения не в кодировке Utf8."
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:710
+#: ../src/qtui/settingspages/networkssettingspage.ui:720
+msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr "Альтернативная входящая кодировка:"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:737
-#: ../src/qtui/settingspages/networkssettingspage.ui:751
+#: ../src/qtui/settingspages/networkssettingspage.ui:747
+#: ../src/qtui/settingspages/networkssettingspage.ui:761
+msgctxt "NetworksSettingsPage|"
 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!"
-msgstr ""
-"Это определяет кодировку контрольных сообщений, ников и названий серверов.\n"
-"Если только вы *действительно* не знаете что делаете, оставьте тут ISO-8859-"
-"1!"
+msgstr "Это определяет кодировку контрольных сообщений, ников и названий серверов.\nЕсли только вы *действительно* не знаете что делаете, оставьте тут ISO-8859-1!"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.ui:741
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
+msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
 msgstr "Кодировка сервера:"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "NetworksSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "NetworksSettingsPage|"
 msgid "Networks"
 msgstr "Сети"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+#: ../src/qtui/settingspages/networkssettingspage.cpp:184
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
+msgstr "<b>Прежде чем сохранить настройки, необходимо устранить следующие проблемы:</b><ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:185
+msgctxt "NetworksSettingsPage|"
 msgid "<li>All networks need at least one server defined</li>"
 msgstr "<li>У каждой сети должен быть хотя бы один сервер</li>"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+#: ../src/qtui/settingspages/networkssettingspage.cpp:186
+msgctxt "NetworksSettingsPage|"
+msgid "</ul>"
+msgstr "</ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
 msgstr "Некорректные настройки сети"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+#: ../src/qtui/settingspages/networkssettingspage.cpp:650
+msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
 msgstr "Удалить сеть?"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+#: ../src/qtui/settingspages/networkssettingspage.cpp:651
+#, qt-format
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Do you really want to delete the network \"%1\" and all related settings, "
 "including the backlog?"
-msgstr ""
-"Действительно удалить сеть \"%1\" и все сопутствующие данные, включая журнал?"
+msgstr "Действительно удалить сеть \"%1\" и все сопутствующие данные, включая журнал?"
 
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
+msgctxt "NickEditDlg|"
 msgid "Edit Nickname"
 msgstr "Править ник"
 
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:19
+msgctxt "NickEditDlg|"
 msgid "Please enter a valid nickname:"
 msgstr "Пожалуйста, введите корректный ник:"
 
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:32
+msgctxt "NickEditDlg|"
 msgid ""
 "A valid nickname may contain letters from the English alphabet, digits, and "
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
-msgstr ""
-"Корректный ник может содержать только буквы латинского алфавита, цифры и "
-"спецсимволы {, }, [, ], \\, |, `, ^, _ и -."
+msgstr "Корректный ник может содержать только буквы латинского алфавита, цифры и спецсимволы {, }, [, ], \\, |, `, ^, _ и -."
+
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:480
+msgctxt "NickEditDlg|"
+msgid "Add Nickname"
+msgstr "Добавить ник"
+
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+msgctxt "NotificationsSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
 
-#. ts-context NotificationsSettingsPage
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 msgstr "Уведомления"
 
-#. ts-context PhononNotificationBackend::ConfigWidget
-#: ../src/qtui/phononnotificationbackend.cpp:143
+#: ../src/qtui/phononnotificationbackend.cpp:188
+msgctxt "PhononNotificationBackend::ConfigWidget|"
 msgid "Select Audio File"
 msgstr "Выбрать звуковой файл"
 
-#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+msgctxt "PhononNotificationConfigWidget|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Play a sound"
 msgstr ""
 
-#. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Prelisten to the selected sound"
 msgstr "Предварительно прослушать выбранный звук"
 
-#. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr "Выберите звуковой файл чтобы воспроизвести"
 
-#. ts-context PostgreSqlStorage
-#: ../src/core/postgresqlstorage.cpp:62
+#: ../src/core/postgresqlstorage.cpp:72
+msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 
-#. ts-context QObject
-#: ../src/client/backlogrequester.cpp:82
+#: ../src/client/backlogrequester.cpp:95
+#, qt-format
+msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr "Всего запрашиваю сообщений: %1 для буферов: %2"
 
-#. ts-context QObject
-#: ../src/client/backlogrequester.cpp:106
+#: ../src/client/backlogrequester.cpp:122
+#, qt-format
+msgctxt "QObject|"
 msgid ""
 "Requesting up to %1 of all unread backlog messages (plus additional %2)"
-msgstr ""
-"Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные "
-"%2)"
+msgstr "Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные %2)"
 
-#. ts-context QObject
-#: ../src/client/backlogrequester.cpp:123
+#: ../src/client/backlogrequester.cpp:142
+#, qt-format
+msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
-msgstr ""
-"Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов"
+msgstr "Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов"
 
-#. ts-context QObject
 #: ../src/qtui/ircconnectionwizard.cpp:56
+msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr "Добро пожаловать в Quassel IRC"
 
-#. ts-context QObject
 #: ../src/qtui/ircconnectionwizard.cpp:58
+msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "
 "network connection.<br>This only covers basic settings. You can cancel this "
 "wizard any time and use the settings dialog for more detailed changes."
-msgstr ""
-"Этот мастер поможет настроить личность по умолчанию и сетевое соединение с "
-"IRC.<br>Он устанавливает только базовые настройки. В любой момент можно "
-"отказаться от мастера и использовать окно настройки для более подробной "
-"конфигурации."
+msgstr "Этот мастер поможет настроить личность по умолчанию и сетевое соединение с IRC.<br>Он устанавливает только базовые настройки. В любой момент можно отказаться от мастера и использовать окно настройки для более подробной конфигурации."
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:316
+#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178
+#: ../src/uisupport/qssparser.cpp:334
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:140
+#: ../src/uisupport/qssparser.cpp:147
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
-msgstr ""
+msgstr "Некорректный адрес для прослушивания %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:156
+#: ../src/uisupport/qssparser.cpp:166
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:192
+#: ../src/uisupport/qssparser.cpp:204
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
-msgstr ""
+msgstr "Недопустимый тип сообщения в %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:236
+#: ../src/uisupport/qssparser.cpp:248
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid message type in %1"
-msgstr "Недопустимый тип сообщения в %1"
+msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:245
+#: ../src/uisupport/qssparser.cpp:257
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:269
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr "Недопустимая метка сообщения: %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:268
+#: ../src/uisupport/qssparser.cpp:281
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:272
+#: ../src/uisupport/qssparser.cpp:285
+msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:287
+#: ../src/uisupport/qssparser.cpp:301
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid format name: %1"
-msgstr ""
+msgstr "Недопустимая метка сообщения: %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:294
+#: ../src/uisupport/qssparser.cpp:309
+#, qt-format
+msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:302
+#: ../src/uisupport/qssparser.cpp:318
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:331
+#: ../src/uisupport/qssparser.cpp:349
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid proplist %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:350
+#: ../src/uisupport/qssparser.cpp:368
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
-msgstr ""
+msgstr "Некорректный адрес для прослушивания %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:366
+#: ../src/uisupport/qssparser.cpp:384
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
-msgstr ""
+msgstr "Некорректный адрес для прослушивания %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:392
+#: ../src/uisupport/qssparser.cpp:414
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:416
+#: ../src/uisupport/qssparser.cpp:438
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font property: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:422
+#: ../src/uisupport/qssparser.cpp:444
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:468
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:451
+#: ../src/uisupport/qssparser.cpp:475
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:458 ../src/uisupport/qssparser.cpp:481
-#: ../src/uisupport/qssparser.cpp:503
+#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505
+#: ../src/uisupport/qssparser.cpp:527
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid gradient declaration: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:467 ../src/uisupport/qssparser.cpp:489
-#: ../src/uisupport/qssparser.cpp:513
+#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513
+#: ../src/uisupport/qssparser.cpp:537
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid gradient stops list: %1"
-msgstr ""
+msgstr "Недопустимый тип сообщения в %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:610
+#: ../src/uisupport/qssparser.cpp:646
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:649
+#: ../src/uisupport/qssparser.cpp:687
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:662
+#: ../src/uisupport/qssparser.cpp:702
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
-msgstr ""
+msgstr "Недопустимое условие %1"
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:672
+#: ../src/uisupport/qssparser.cpp:714
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr ""
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:145
+#: ../src/common/util.cpp:169
+msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "год"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:146
+#: ../src/common/util.cpp:170
+msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "день"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:147
+#: ../src/common/util.cpp:171
+msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "ч"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:148
+#: ../src/common/util.cpp:172
+msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "мин"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:149
+#: ../src/common/util.cpp:173
+msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "сек"
 
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:429
+#: ../src/client/networkmodel.cpp:482
+#, qt-format
+msgctxt "QueryBufferItem|"
 msgid "<b>Query with %1</b>"
 msgstr "<b>Приват с %1</b>"
 
-#. ts-context SaveIdentitiesDlg
+#: ../src/client/networkmodel.cpp:500
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "idling since %1"
+msgstr "неактивен с %1"
+
+#: ../src/client/networkmodel.cpp:503
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "login time: %1"
+msgstr "время входа: %1"
+
+#: ../src/client/networkmodel.cpp:506
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "server: %1"
+msgstr "сервер: %1"
+
+#: ../src/qtui/ui/receivefiledlg.ui:14
+msgctxt "ReceiveFileDlg|"
+msgid "Incoming File Transfer"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.cpp:35
+#, qt-format
+msgctxt "ReceiveFileDlg|"
+msgid "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"
+msgstr ""
+
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
+msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"
 msgstr "Синхронизация с ядром"
 
-#. ts-context SaveIdentitiesDlg
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:21
+msgctxt "SaveIdentitiesDlg|"
 msgid "Syncing data with core, please wait..."
 msgstr "Синхронизирую данные с ядром, пожалуйста ожидайте..."
 
-#. ts-context SaveIdentitiesDlg
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:81
+msgctxt "SaveIdentitiesDlg|"
 msgid "Abort"
 msgstr "Прервать"
 
-#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:14
+msgctxt "ServerEditDlg|"
+msgid "Dialog"
+msgstr "Диалог"
+
 #: ../src/qtui/settingspages/servereditdlg.ui:30
+msgctxt "ServerEditDlg|"
 msgid "Server Info"
 msgstr "Информация о сервере"
 
-#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:38
+msgctxt "ServerEditDlg|"
+msgid "Server address:"
+msgstr "Адрес сервера:"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:45
+#: ../src/qtui/settingspages/servereditdlg.ui:227
+msgctxt "ServerEditDlg|"
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:72
+msgctxt "ServerEditDlg|"
+msgid "Password:"
+msgstr "Пароль:"
+
 #: ../src/qtui/settingspages/servereditdlg.ui:94
+msgctxt "ServerEditDlg|"
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
-#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:119
+msgctxt "ServerEditDlg|"
+msgid "Advanced"
+msgstr "Дополнительно"
+
 #: ../src/qtui/settingspages/servereditdlg.ui:140
+msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "Версия SSL:"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:147
+msgctxt "ServerEditDlg|"
 msgid ""
 "Do not change unless you're going to connect to a server not supporting "
 "SSLv3!"
-msgstr ""
-"Не меняйте, если не собираетесь подключаться к серверу, не поддерживающему "
-"SSLv3!"
+msgstr "Не меняйте, если не собираетесь подключаться к серверу, не поддерживающему SSLv3!"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:151
+msgctxt "ServerEditDlg|"
 msgid "SSLv3 (default)"
 msgstr "SSLv3 (по умолчанию)"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:156
+msgctxt "ServerEditDlg|"
 msgid "SSLv2"
 msgstr "SSLv2"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:161
+msgctxt "ServerEditDlg|"
 msgid "TLSv1"
 msgstr "TLSv1"
 
-#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:171
+msgctxt "ServerEditDlg|"
+msgid "Use a Proxy"
+msgstr "Использовать прокси"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:188
+msgctxt "ServerEditDlg|"
+msgid "Proxy Type:"
+msgstr "Тип прокси:"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:196
+msgctxt "ServerEditDlg|"
+msgid "Socks 5"
+msgstr "Socks 5"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:201
+msgctxt "ServerEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"
+
 #: ../src/qtui/settingspages/servereditdlg.ui:213
+msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr "Хост прокси:"
 
-#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:220
+msgctxt "ServerEditDlg|"
+msgid "localhost"
+msgstr "localhost"
+
 #: ../src/qtui/settingspages/servereditdlg.ui:251
+msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Имя пользователя прокси:"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:261
+msgctxt "ServerEditDlg|"
 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
+#: ../src/qtui/ui/settingsdlg.ui:14
+msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr "Настроить Quassel"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  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
+#: ../src/qtui/settingsdlg.cpp:111
+msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr "Настройки"
 
-#. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:109
+#: ../src/qtui/settingsdlg.cpp:121
+msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:110
+#: ../src/qtui/settingsdlg.cpp:122
+msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
 msgstr "В текущей вкладке есть несохранённые изменения. Применить их сейчас?"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140
+#, qt-format
+msgctxt "SettingsDlg|"
 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
+#: ../src/qtui/settingsdlg.cpp:220
+msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Вернуть настройки"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  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?"
+#: ../src/qtui/settingsdlg.cpp:220
+msgctxt "SettingsDlg|"
+msgid "Do you like to reload the settings, undoing your changes on this page?"
+msgstr "Вернуть старый настройки, отменив все изменения на этой вкладке?"
+
+#: ../src/qtui/settingsdlg.cpp:231
+msgctxt "SettingsDlg|"
+msgid "Restore Defaults"
+msgstr "Вернуть умолчания"
+
+#: ../src/qtui/settingsdlg.cpp:231
+msgctxt "SettingsDlg|"
+msgid "Do you like to restore the default values for this page?"
+msgstr "Вернуть параметры по-умолчанию для этой вкладки?"
+
+#: ../src/qtui/ui/settingspagedlg.ui:14
+msgctxt "SettingsPageDlg|"
+msgid "Configure Quassel"
+msgstr "Настроить Quassel"
+
+#: ../src/qtui/ui/settingspagedlg.ui:30
+msgctxt "SettingsPageDlg|"
+msgid "Settings"
+msgstr "Настройки"
+
+#: ../src/qtui/settingspagedlg.cpp:39
+#, qt-format
+msgctxt "SettingsPageDlg|"
+msgid "Configure %1"
+msgstr "Настроить %1"
+
+#: ../src/qtui/settingspagedlg.cpp:120
+msgctxt "SettingsPageDlg|"
+msgid "Reload Settings"
+msgstr "Вернуть настройки"
+
+#: ../src/qtui/settingspagedlg.cpp:120
+msgctxt "SettingsPageDlg|"
+msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr "Вернуть старый настройки, отменив все изменения на этой вкладке?"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:131
+msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Вернуть умолчания"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:131
+msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Вернуть параметры по-умолчанию для этой вкладки?"
 
-#. ts-context ShortcutsModel
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:121
+msgctxt "ShortcutsModel|"
 msgid "Action"
-msgstr ""
+msgstr "Действие:"
 
-#. ts-context ShortcutsModel
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:123
+msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""
 
-#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
+msgctxt "ShortcutsSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgctxt "ShortcutsSettingsPage|"
 msgid "Search:"
-msgstr ""
+msgstr "Шаблон поиска:"
 
-#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcut for Selected Action"
 msgstr ""
 
-#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgctxt "ShortcutsSettingsPage|"
 msgid "Default:"
 msgstr "По умолчанию:"
 
-#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:99
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:111
+msgctxt "ShortcutsSettingsPage|"
+msgid "None"
+msgstr "Нет"
+
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgctxt "ShortcutsSettingsPage|"
 msgid "Custom:"
-msgstr ""
+msgstr "Пользовательские цвета"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+msgctxt "ShortcutsSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
 
-#. ts-context ShortcutsSettingsPage
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr ""
 
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:880
-msgid "Peer tried to send package larger than max package size!"
-msgstr "Пир попытался отправить пакет больше максимального размера!"
-
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:885
-msgid "Peer tried to send 0 byte package!"
-msgstr "Пир попытался отправить пакет из 0 байт!"
-
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:902
-msgid "Peer sent corrupted compressed data!"
-msgstr "Пир отправил испорченные сжатые данные!"
-
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:917
-msgid "Peer sent corrupt data: unable to load QVariant!"
-msgstr "Пир отправил испорченные данные: не могу загрузить QVariant!"
-
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:1050
+#: ../src/common/signalproxy.cpp:758
+msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Отсоединяюсь"
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:28
+msgctxt "SimpleNetworkEditor|"
+msgid "Network name:"
+msgstr "Название сети:"
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:35
+msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr "Название настраиваемой IRC-сети"
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:63
+msgctxt "SimpleNetworkEditor|"
+msgid "Servers"
+msgstr "Серверы"
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:81
+msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr "Список IRC-серверов в этой сети"
 
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:96
+msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr "Редактировать этот сервер"
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:99
+msgctxt "SimpleNetworkEditor|"
+msgid "&Edit..."
+msgstr "&Править..."
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:116
+msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr "Добавить другой IRC-сервер"
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:119
+msgctxt "SimpleNetworkEditor|"
+msgid "&Add..."
+msgstr "Доб&авить..."
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:136
+msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr "Удалить этот сервер из списка"
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:139
+msgctxt "SimpleNetworkEditor|"
+msgid "De&lete"
+msgstr ""
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:165
+msgctxt "SimpleNetworkEditor|"
+msgid "Move upwards in list"
+msgstr "Передвинуть вверх в списке"
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:168
+#: ../src/qtui/ui/simplenetworkeditor.ui:182
+msgctxt "SimpleNetworkEditor|"
+msgid "..."
+msgstr ""
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:179
+msgctxt "SimpleNetworkEditor|"
+msgid "Move downwards in list"
+msgstr "Передвинуть вниз в списке"
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:226
+msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr "Автоматически входить на каналы"
 
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:250
+msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
+msgstr "Список каналов IRC, на которые клиент будет автоматически заходить при подключении к сети"
+
+#: ../src/qtui/snorenotificationbackend.cpp:60
+#: ../src/qtui/snorenotificationbackend.cpp:104
+msgctxt "SnoreNotificationBackend|"
+msgid "Private Message"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:20
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:29
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Snore"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:41
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Backend:"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:64
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Timeout:"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:80
+msgctxt "SnoreNotificationConfigWidget|"
+msgid " s"
+msgstr " сек"
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:96
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "0 means infinite"
 msgstr ""
-"Список каналов IRC, на которые клиент будет автоматически заходить при "
-"подключении к сети"
 
-#. ts-context SqliteStorage
-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/core/sqlitestorage.cpp:60
+msgctxt "SqliteStorage|"
 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 "
 "via network. Use SQLite if your Quassel Core should store its data on the "
 "same machine it is running on, and if you only expect a few users to use "
 "your core."
-msgstr ""
-"SQLite -- это основанная на файлах система управления базами данных, которая "
-"не требует никаких настроек. Она подходит для маленьких и средних баз "
-"данных, для которых не нужен доступ через сеть. Используйте SQLite, если "
-"ваше ядро Quassel должно хранить данные на той же машине, на которой "
-"запущено, и если вашим ядром не будет пользоваться много народу."
+msgstr "SQLite -- это основанная на файлах система управления базами данных, которая не требует никаких настроек. Она подходит для маленьких и средних баз данных, для которых не нужен доступ через сеть. Используйте SQLite, если ваше ядро Quassel должно хранить данные на той же машине, на которой запущено, и если вашим ядром не будет пользоваться много народу."
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:14
+msgctxt "SslInfoDlg|"
 msgid "Security Information"
-msgstr ""
+msgstr "Информация о ядре"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:22
+msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
-msgstr ""
+msgstr "Хост:"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:39
+msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
-msgstr ""
+msgstr "<b>Режим:</b> %1"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:56
+msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:73
+msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
-msgstr ""
+msgstr "<b>Тема:</b> %1"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:90
+msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:120
+msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
-msgstr ""
+msgstr "ОбщееИмя:"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
-msgstr ""
+msgstr "Организация:"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
-msgstr ""
+msgstr "Организация:"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
-msgstr ""
+msgstr "<b>Режим:</b> %1"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
-msgstr ""
+msgstr "<b>Тема:</b> %1"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:242
+msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:367
+msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:384
+msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
-msgstr ""
+msgstr "<b>Режим:</b> %1"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:401
+msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:431
+msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
-msgstr ""
+msgstr "<b>Пользователи:</b> %1"
 
-#. ts-context SslInfoDlg
-#: ../src/qtui/sslinfodlg.cpp:69
+#: ../src/qtui/sslinfodlg.cpp:71
+msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr ""
 
-#. ts-context SslInfoDlg
-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:73
+msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr ""
 
-#. ts-context SslInfoDlg
-#: ../src/qtui/sslinfodlg.cpp:78
+#: ../src/qtui/sslinfodlg.cpp:80
+#, qt-format
+msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 
-#. ts-context StatusBufferItem
-#: ../src/client/networkmodel.h:144
+#: ../src/client/networkmodel.h:150
+msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Буфер состояния"
 
-#. ts-context SystemTray
-#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+#: ../src/qtui/systemtray.cpp:68 ../src/qtui/systemtray.cpp:101
+msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr ""
 
-#. ts-context SystemTray
-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:103
+msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr ""
 
-#. ts-context SystrayNotificationBackend::ConfigWidget
-#: ../src/qtui/systraynotificationbackend.cpp:135
+#: ../src/qtui/systraynotificationbackend.cpp:142
+#, qt-format
+msgctxt "SystrayNotificationBackend|"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/qtui/systraynotificationbackend.cpp:156
+msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
+msgstr "Показывать свои сообщения"
+
+#: ../src/uisupport/tabcompleter.cpp:52
+msgctxt "TabCompleter|"
+msgid "Tab completion"
 msgstr ""
 
-#. ts-context TaskbarNotificationBackend::ConfigWidget
-#: ../src/qtui/taskbarnotificationbackend.cpp:68
+#: ../src/qtui/taskbarnotificationbackend.cpp:83
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr "Активация дока, таймаут:"
 
-#. ts-context TaskbarNotificationBackend::ConfigWidget
-#: ../src/qtui/taskbarnotificationbackend.cpp:70
+#: ../src/qtui/taskbarnotificationbackend.cpp:85
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr "Отметка на панели задач, таймаут:"
 
-#. ts-context ToolBarActionProvider
+#: ../src/qtui/taskbarnotificationbackend.cpp:93
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
+msgid "Unlimited"
+msgstr "Неограничено"
+
+#: ../src/qtui/taskbarnotificationbackend.cpp:94
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
+msgid " seconds"
+msgstr " сек."
+
+#: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ToolBarActionProvider|"
+msgid "Connect"
+msgstr "Соединиться"
+
 #: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
 msgstr "Соединиться с IRC"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ToolBarActionProvider|"
+msgid "Disconnect"
+msgstr "Отсоединиться"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Отсоединиться от IRC"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
+msgid "Part"
+msgstr "Выйти"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr "Покинуть выделенный канал"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ToolBarActionProvider|"
+msgid "Join"
+msgstr "Зайти"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Зайти на канал"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
+msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Приват"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
+msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Начать личную беседу"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ToolBarActionProvider|"
+msgid "Whois"
+msgstr "Whois"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Запросить информацию о пользователе"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:40
+msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Оп"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:40
+msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr "Дать пользователю статус оператора"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:41
+msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Снять оп"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:41
+msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr "Снять статус оператора с пользователя"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:42
+msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Голос"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:42
+msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr "Дать пользователю статус \"с голосом\""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:43
+msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Снять голос"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:43
+msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr "Снять статус \"с голосом\" с пользователя"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:44
+msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Выгнать"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:44
+msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr "Удалить пользователя с канала"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:45
+msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Забанить"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:45
+msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr "Запретить пользователю вход на канал"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
+msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Выгнать"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
+msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr "Удалить пользователя с канала и запретить ему вход"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:51
+msgctxt "ToolBarActionProvider|"
 msgid "Connect to all"
 msgstr "Подключиться ко всем"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:58
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from all"
 msgstr "Отключиться от всех"
 
-#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/ui/topicwidget.ui:32
+msgctxt "TopicWidget|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/ui/topicwidget.ui:79
+msgctxt "TopicWidget|"
+msgid "..."
+msgstr ""
+
+#: ../src/qtui/topicwidget.cpp:120
+#, qt-format
+msgctxt "TopicWidget|"
+msgid "Users: %1"
+msgstr ""
+
+#: ../src/qtui/topicwidget.cpp:121
+#, qt-format
+msgctxt "TopicWidget|"
+msgid "Lag: %1 msecs"
+msgstr "Лаг: %1 мс"
+
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Custom font:"
+msgstr "Пользовательский шрифт окна чата:"
+
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Resize dynamically to fit contents"
 msgstr ""
 
-#. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:84
+msgctxt "TopicWidgetSettingsPage|"
 msgid "On hover only"
 msgstr ""
 
-#. ts-context TopicWidgetSettingsPage
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr ""
 
+#. Plain Message
+#. ----------
+#. Notice Message
+#. ----------
+#. Server Message
+#. ----------
+#. Info Message
+#. ----------
+#. Error Message
+#. ----------
+#. Topic Message
+#. ----------
+#. Invite Message
+#: ../src/uisupport/uistyle.cpp:665 ../src/uisupport/uistyle.cpp:668
+#: ../src/uisupport/uistyle.cpp:709 ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:758
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
+msgid "%1"
+msgstr ""
+
 #. Action Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:583
+#: ../src/uisupport/uistyle.cpp:671
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %2"
 msgstr ""
 
 #. Nick Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:587
+#: ../src/uisupport/uistyle.cpp:675
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:588
+#: ../src/uisupport/uistyle.cpp:676
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:592
+#: ../src/uisupport/uistyle.cpp:680
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:593
+#: ../src/uisupport/uistyle.cpp:681
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:597
+#: ../src/uisupport/uistyle.cpp:685
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:600
+#: ../src/uisupport/uistyle.cpp:688
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:605
+#: ../src/uisupport/uistyle.cpp:693
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:612
+#: ../src/uisupport/uistyle.cpp:701
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
-msgstr "%DN%1%DN был выкинут %DN%2%DN из %DC%3%DC"
+msgstr "%DN%1%DN выкинул %DN%2%DN из %DC%3%DC"
 
 #. Day Change Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:629
+#: ../src/uisupport/uistyle.cpp:719
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
-msgstr "{Новые сутки. Сегодня: % 1}"
+msgstr "{Новые сутки. Сегодня: %1}"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:641
+#: ../src/uisupport/uistyle.cpp:733
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
-msgstr ""
-"Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей присоединилось: "
+msgstr "Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей присоединилось: "
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:645 ../src/uisupport/uistyle.cpp:660
+#: ../src/uisupport/uistyle.cpp:737 ../src/uisupport/uistyle.cpp:753
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:655
+#: ../src/uisupport/uistyle.cpp:748
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
-msgstr "Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей вышло: "
+msgstr "Нетсплит между %DH%1%DH и %DH%2%DH. Пользователей вышло: "
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:667 ../src/uisupport/uistyle.cpp:705
+#: ../src/uisupport/uistyle.cpp:760 ../src/uisupport/uistyle.cpp:808
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "[%1]"
-msgstr "[%1]"
+msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:806
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "<%1>"
-msgstr "<%1>"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:707
-msgid "-*-"
-msgstr "-*-"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:709
-msgid "<->"
-msgstr "<->"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:711
-msgid "***"
-msgstr "***"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:713
-msgid "-->"
-msgstr "-->"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:717
-msgid "<--"
-msgstr "<--"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:719
-msgid "<-*"
-msgstr "<-*"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:721
-msgid "<-x"
-msgstr "<-x"
-
-#. 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 UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:729
-msgid "-"
-msgstr "-"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:733
-msgid "=>"
-msgstr "=>"
-
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:735
-msgid "<="
-msgstr "<="
+msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:737
-msgid "->"
-msgstr "->"
+#: ../src/client/networkmodel.cpp:786
+#, qt-format
+msgctxt "UserCategoryItem|"
+msgid "%n Owner(s)"
+msgid_plural "%n Owner(s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:702
-msgid "%n User(s)"
-msgid_plural "%n User(s)"
+#: ../src/client/networkmodel.cpp:788
+#, qt-format
+msgctxt "UserCategoryItem|"
+msgid "%n Admin(s)"
+msgid_plural "%n Admin(s)"
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#~ msgid "Finger"
-#~ msgstr "Finger"
+#: ../src/client/networkmodel.cpp:790
+#, qt-format
+msgctxt "UserCategoryItem|"
+msgid "%n Operator(s)"
+msgid_plural "%n Operator(s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#~ msgid "[Whois] idle message: %1"
-#~ msgstr "[Whois] сообщение неактивности: %1"
+#: ../src/client/networkmodel.cpp:792
+#, qt-format
+msgctxt "UserCategoryItem|"
+msgid "%n Half-Op(s)"
+msgid_plural "%n Half-Op(s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#~ msgid "Hide inactive buffers:"
-#~ msgstr "Скройть неактивные буфера:"
+#: ../src/client/networkmodel.cpp:794
+#, qt-format
+msgctxt "UserCategoryItem|"
+msgid "%n Voiced"
+msgid_plural "%n Voiced"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#~ msgid "Add Buffers Automatically:"
-#~ msgstr "Автоматически Добавить Буфер"
+#: ../src/client/networkmodel.cpp:796
+#, qt-format
+msgctxt "UserCategoryItem|"
+msgid "%n User(s)"
+msgid_plural "%n User(s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""