--- a/i18n/eric6_ru.ts Sun Aug 07 15:56:15 2016 +0200
+++ b/i18n/eric6_ru.ts Wed Aug 10 16:23:08 2016 +0200
@@ -32484,7 +32484,7 @@
<translation>Было запрошено шифрованное соединение к IRC сети, но SSL не доступен. Пожалуйста измените настройки сервера.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="500"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="510"/>
<source>Info</source>
<translation>Информация</translation>
</message>
@@ -32499,218 +32499,218 @@
<translation>Поиск сервера {0} (порт {1})...</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="255"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="256"/>
<source>Disconnecting from server {0}...</source>
<translation>Отключение от сервера {0}...</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="456"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="466"/>
<source>Server found,connecting...</source>
<translation>Сервер найден, подключение...</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="465"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="475"/>
<source>Connected,logging in...</source>
<translation>Подключение выполнено, вход...</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="500"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="510"/>
<source>Server disconnected.</source>
<translation>Сервер отсоединился.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="547"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="557"/>
<source>Message Error</source>
<translation>Ошибка сообщения</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="547"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="557"/>
<source>Unknown message received from server:<br/>{0}</source>
<translation>Неизвестное сообщение от сервера:<br/>{0}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="573"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="583"/>
<source>Notice</source>
<translation>Уведомление</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="591"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="601"/>
<source>Mode</source>
<translation>Режим</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="598"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="608"/>
<source>You have left channel {0}.</source>
<translation>Вы отключились от канала {0}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="609"/>
- <source>You are now known as {0}.</source>
- <translation>Вы теперь {0}.</translation>
- </message>
- <message>
- <location filename="../Network/IRC/IrcWidget.py" line="614"/>
- <source>User {0} is now known as {1}.</source>
- <translation>Пользователь {0} сменил псевдоним на {1}.</translation>
- </message>
- <message>
<location filename="../Network/IRC/IrcWidget.py" line="619"/>
+ <source>You are now known as {0}.</source>
+ <translation>Вы теперь {0}.</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="624"/>
+ <source>User {0} is now known as {1}.</source>
+ <translation>Пользователь {0} сменил псевдоним на {1}.</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="629"/>
<source>Server Error</source>
<translation>Ошибка сервера</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="655"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="665"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="670"/>
- <source>Welcome</source>
- <translation>Добро пожаловать</translation>
- </message>
- <message>
- <location filename="../Network/IRC/IrcWidget.py" line="672"/>
- <source>Support</source>
- <translation>Поддержка</translation>
- </message>
- <message>
- <location filename="../Network/IRC/IrcWidget.py" line="674"/>
- <source>User</source>
- <translation>Пользователь</translation>
- </message>
- <message>
- <location filename="../Network/IRC/IrcWidget.py" line="676"/>
- <source>MOTD</source>
- <translation>MOTD</translation>
- </message>
- <message>
- <location filename="../Network/IRC/IrcWidget.py" line="678"/>
- <source>Away</source>
- <translation>Отсутствует</translation>
- </message>
- <message>
<location filename="../Network/IRC/IrcWidget.py" line="680"/>
- <source>Info ({0})</source>
- <translation>Информация ({0})</translation>
+ <source>Welcome</source>
+ <translation>Добро пожаловать</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="682"/>
+ <source>Support</source>
+ <translation>Поддержка</translation>
</message>
<message>
<location filename="../Network/IRC/IrcWidget.py" line="684"/>
- <source>Message of the day</source>
- <translation>Сообщение дня</translation>
+ <source>User</source>
+ <translation>Пользователь</translation>
</message>
<message>
<location filename="../Network/IRC/IrcWidget.py" line="686"/>
+ <source>MOTD</source>
+ <translation>MOTD</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="688"/>
+ <source>Away</source>
+ <translation>Отсутствует</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="690"/>
+ <source>Info ({0})</source>
+ <translation>Информация ({0})</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="694"/>
+ <source>Message of the day</source>
+ <translation>Сообщение дня</translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="696"/>
<source>End of message of the day</source>
<translation>Конец сообщения дня</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="689"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="699"/>
<source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source>
<translation>Сервер {0} (Версия {1}), Пользовательские режимы: {2}, Режимы каналов: {3}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="695"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="705"/>
<source>Current users on {0}: {1}, max. {2}</source>
<translation>Текущее число пользователей на {0}: {1}, максимум: {2}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="700"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="710"/>
<source>Current users on the network: {0}, max. {1}</source>
<translation>Текущее число пользователей в сети {0}, максимум: {1}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="704"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="714"/>
<source>You are no longer marked as being away.</source>
<translation>Вы больше не отмечены как отсутствующий.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="706"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="716"/>
<source>You have been marked as being away.</source>
<translation>Вы отмечены как отсутствующий.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="825"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="835"/>
<source>SSL Error</source>
<translation>Ошибка SSL</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="767"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="777"/>
<source>Connection to server {0} (port {1}) lost while waiting for user response to an SSL error.</source>
<translation>Соединение с сервером {0} (порт {1}) потеряно.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="798"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="808"/>
<source>Socket Error</source>
<translation>Ошибка соединения</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="775"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="785"/>
<source>The host was not found. Please check the host name and port settings.</source>
<translation>Сервер не найден. Пожалуйста проверьте имя сервера и порт.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="781"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="791"/>
<source>The connection was refused by the peer. Please check the host name and port settings.</source>
<translation>Сервер отказал в подключении. Пожалуйста проверьте имя сервера и порт.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="792"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="802"/>
<source>The following network error occurred:<br/>{0}</source>
<translation>Сетевая ошибка:<br/>{0}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="924"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="934"/>
<source>{0} ({1})</source>
<comment>channel name, users count</comment>
<translation>{0} ({1})</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="959"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="969"/>
<source>Critical</source>
<translation>Критическая</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="939"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="949"/>
<source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source>
<translation>Нет приемлимых псевдонимов на сервере, сконфигурированном для <b>{0}</b>. Отключение...</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="959"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="969"/>
<source>The given nickname is already in use.</source>
<translation>Данный псевдоним уже используется.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="909"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="919"/>
<source>CTCP</source>
<translation>CTCP (Клиент-клиент протокол)</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="886"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="896"/>
<source>Received Version request from {0}.</source>
<translation>Получен запрос версии от {0}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="892"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="902"/>
<source>Received CTCP-PING request from {0}, sending answer.</source>
<translation>CTCP-PING запрос от {0}, отправление ответа.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="900"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="910"/>
<source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source>
<translation>CTCP-CLIENTINFO запрос от {0}, отправление ответа.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="909"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="919"/>
<source>Received unknown CTCP-{0} request from {1}.</source>
<translation>Неизвестный CTCP-{0} запрос от {1}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="584"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="594"/>
<source>You have set your personal modes to <b>[{0}]</b>.</source>
<translation>Ваши личные режимы установлены: <b>[{0}]</b>.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="588"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="598"/>
<source>{0} has changed your personal modes to <b>[{1}]</b>.</source>
<translation>{0} изменил ваши личные режимы на: <b>[{1}]</b>.</translation>
</message>
@@ -32725,25 +32725,35 @@
<translation>Сеть</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="787"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="797"/>
<source>The SSL handshake failed.</source>
<translation>SSL соединение провалилось.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="798"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="808"/>
<source>A network error occurred.</source>
<translation>Сетевая ошибка.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="811"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="821"/>
<source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source>
<translation>Ошибка подключения к {0} (порт {1}) с использованием SSL. Либо сервер не поддерживает SSL (Вы выбрали правильный порт?), либо неправильный сертификат.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="825"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="835"/>
<source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source>
<translation>SSL сертификат сервера {0} (порт {1}) не прошел проверку на подлинность. Вы приняли ошибки SSL.</translation>
</message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="261"/>
+ <source>Disconnecting from network {0}...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Network/IRC/IrcWidget.py" line="266"/>
+ <source>Disconnecting from server.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JavaScriptEricObject</name>
