--- a/eric6/i18n/eric6_ru.ts Wed Jul 31 19:03:01 2019 +0200
+++ b/eric6/i18n/eric6_ru.ts Wed Jul 31 19:09:44 2019 +0200
@@ -487,7 +487,7 @@
<message>
<location filename="../Project/AddDirectoryDialog.ui" line="93"/>
<source>Enter the target directory for the file</source>
- <translation>Введите имя целевой директории для файлов</translation>
+ <translation>Введите имя целевой директории для файла</translation>
</message>
<message>
<location filename="../Project/AddDirectoryDialog.ui" line="96"/>
@@ -570,7 +570,7 @@
<message>
<location filename="../Project/AddFileDialog.ui" line="80"/>
<source>Enter the target directory for the file</source>
- <translation>Введите имя целевой директории для файлов</translation>
+ <translation>Введите имя целевой директории для файла</translation>
</message>
<message>
<location filename="../Project/AddFileDialog.ui" line="83"/>
@@ -589,7 +589,7 @@
<message>
<location filename="../Project/AddFileDialog.ui" line="94"/>
<source>Select, if the files should be added as sourcecode (overriding automatic detection)</source>
- <translation>Разрешить добавление как файлов исходного кода (вопреки автоматическому определению)</translation>
+ <translation>Разрешить добавление как файлов исходного кода (переопределение автоматического обнаружения)</translation>
</message>
<message>
<location filename="../Project/AddFileDialog.ui" line="97"/>
@@ -2242,11 +2242,6 @@
<translation>Найти в этой директории</translation>
</message>
<message>
- <location filename="../UI/Browser.py" line="269"/>
- <source>Find&&Replace in this directory</source>
- <translation type="obsolete">Найти && заменить в этой директории</translation>
- </message>
- <message>
<location filename="../UI/Browser.py" line="573"/>
<source>New toplevel directory</source>
<translation>Новая директория верхнего уровня</translation>
@@ -2295,7 +2290,7 @@
<message>
<location filename="../UI/Browser.py" line="269"/>
<source>Find && Replace in this directory</source>
- <translation type="unfinished"></translation>
+ <translation>Найти && заменить в этой директории</translation>
</message>
</context>
<context>
@@ -2987,7 +2982,7 @@
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="74"/>
<source>Close Heads</source>
- <translation>Close Heads (закрыть головные ревизии)</translation>
+ <translation>Закрыть головные ревизии (Close Heads)</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="40"/>
@@ -4847,6 +4842,11 @@
<source><conda returned invalid data.></source>
<translation><conda вернула недопустимые данные.></translation>
</message>
+ <message>
+ <location filename="../CondaInterface/__init__.py" line="62"/>
+ <source><conda returned an error: {0}.></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CondaNewEnvironmentDataDialog</name>
@@ -15939,12 +15939,12 @@
<message>
<location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="284"/>
<source>Username:</source>
- <translation>Имя пользователя:</translation>
+ <translation>Логин:</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="291"/>
<source>Enter your mail server username</source>
- <translation>Введите ваше имя на почтовом сервере</translation>
+ <translation>Введите ваш логин на почтовом сервере</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="298"/>
@@ -42746,7 +42746,7 @@
<message>
<location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="288"/>
<source>Identity Name:</source>
- <translation>Имя пользователя:</translation>
+ <translation>Имя для идентификации:</translation>
</message>
<message>
<location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="298"/>
@@ -43611,198 +43611,198 @@
<translation>Сервер отсоединился.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="614"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="615"/>
<source>Message Error</source>
<translation>Ошибка сообщения</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="614"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="615"/>
<source>Unknown message received from server:<br/>{0}</source>
<translation>Неизвестное сообщение от сервера:<br/>{0}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="680"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="681"/>
<source>Notice</source>
<translation>Уведомление</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="698"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="699"/>
<source>Mode</source>
<translation>Режим</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="705"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="706"/>
<source>You have left channel {0}.</source>
<translation>Вы отключились от канала {0}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="716"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="717"/>
<source>You are now known as {0}.</source>
<translation>Вы теперь {0}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="721"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="722"/>
<source>User {0} is now known as {1}.</source>
<translation>Пользователь {0} сменил псевдоним на {1}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="731"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="732"/>
<source>Server Error</source>
<translation>Ошибка сервера</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="767"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="768"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="782"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="783"/>
<source>Welcome</source>
<translation>Добро пожаловать</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="784"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="785"/>
<source>Support</source>
<translation>Поддержка</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="786"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="787"/>
<source>User</source>
<translation>Пользователь</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="788"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="789"/>
<source>MOTD</source>
<translation>MOTD</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="790"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="791"/>
<source>Away</source>
<translation>Отсутствует</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="792"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="793"/>
<source>Info ({0})</source>
<translation>Инфо ({0})</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="796"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="797"/>
<source>Message of the day</source>
<translation>Сообщение дня</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="798"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="799"/>
<source>End of message of the day</source>
<translation>Конец сообщения дня</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="801"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="802"/>
<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="807"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="808"/>
<source>Current users on {0}: {1}, max. {2}</source>
<translation>Текущее число пользователей на {0}: {1}, максимум: {2}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="812"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="813"/>
<source>Current users on the network: {0}, max. {1}</source>
<translation>Текущее число пользователей в сети {0}, максимум: {1}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="816"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="817"/>
<source>You are no longer marked as being away.</source>
<translation>Вы больше не отмечены как отсутствующий.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="818"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="819"/>
<source>You have been marked as being away.</source>
<translation>Вы отмечены как отсутствующий.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="938"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="939"/>
<source>SSL Error</source>
<translation>Ошибка SSL</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="880"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="881"/>
<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="911"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="912"/>
<source>Socket Error</source>
<translation>Ошибка соединения</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="888"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="889"/>
<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="894"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="895"/>
<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="905"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="906"/>
<source>The following network error occurred:<br/>{0}</source>
<translation>Сетевая ошибка:<br/>{0}</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1034"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1035"/>
<source>{0} ({1})</source>
<comment>channel name, users count</comment>
<translation>{0} ({1})</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1075"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1076"/>
<source>Critical</source>
<translation>Критическая</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1056"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1057"/>
<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="1075"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1076"/>
<source>The given nickname is already in use.</source>
<translation>Данный псевдоним уже используется.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1019"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1020"/>
<source>CTCP</source>
<translation>CTCP (Клиент-клиент протокол)</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="996"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="997"/>
<source>Received Version request from {0}.</source>
<translation>Получен запрос версии от {0}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1002"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1003"/>
<source>Received CTCP-PING request from {0}, sending answer.</source>
<translation>CTCP-PING запрос от {0}, отправление ответа.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1010"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1011"/>
<source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source>
<translation>CTCP-CLIENTINFO запрос от {0}, отправление ответа.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="1019"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="1020"/>
<source>Received unknown CTCP-{0} request from {1}.</source>
<translation>Неизвестный CTCP-{0} запрос от {1}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="691"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="692"/>
<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="695"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="696"/>
<source>{0} has changed your personal modes to <b>[{1}]</b>.</source>
<translation>{0} изменил ваши персональные режимы на: <b>[{1}]</b>.</translation>
</message>
@@ -43817,22 +43817,22 @@
<translation>Сеть</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="900"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="901"/>
<source>The SSL handshake failed.</source>
<translation>Неудачное SSL соединение.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="911"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="912"/>
<source>A network error occurred.</source>
<translation>Сетевая ошибка.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="924"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="925"/>
<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="938"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="939"/>
<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>
@@ -43847,17 +43847,17 @@
<translation>Отключение от сервера.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="647"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="648"/>
<source>Received CTCP-PING response from {0} with latency of {1} ms.</source>
<translation>Получен CTCP-PING ответ от {0} с задержкой {1} мс.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="653"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="654"/>
<source>Received unknown CTCP-{0} response from {1}.</source>
<translation>Получен неизвестный CTCP- {0} ответ от {1}.</translation>
</message>
<message>
- <location filename="../Network/IRC/IrcWidget.py" line="727"/>
+ <location filename="../Network/IRC/IrcWidget.py" line="728"/>
<source>Received PONG from {0}</source>
<translation>Получен PONG из {0}</translation>
</message>
@@ -53311,7 +53311,7 @@
<message>
<location filename="../Project/Project.py" line="3956"/>
<source>Show the project lexer associations (overriding defaults)</source>
- <translation>Показать ассоциации для лексеров</translation>
+ <translation>Показать ассоциации для лексеров проекта (переопределяющие по умолчанию)</translation>
</message>
<message>
<location filename="../Project/Project.py" line="3958"/>
@@ -74124,7 +74124,7 @@
<message>
<location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="170"/>
<source>Todo tasks:</source>
- <translation>Задачи:</translation>
+ <translation>Задачи ToDo:</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/TasksPage.ui" line="193"/>
@@ -76553,12 +76553,12 @@
<message>
<location filename="../Project/UicCompilerOptionsDialog.ui" line="49"/>
<source>Package Root</source>
- <translation type="unfinished"></translation>
+ <translation>Корневая директория пакетов</translation>
</message>
<message>
<location filename="../Project/UicCompilerOptionsDialog.ui" line="55"/>
<source>Enter the project relative path of the packages root directory</source>
- <translation type="unfinished"></translation>
+ <translation>Задайте путь корневой директории пакетов относительно проекта</translation>
</message>
</context>
<context>
@@ -78328,11 +78328,6 @@
<translation>Ск&рыть всё</translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4725"/>
- <source>There is no main script defined for the current project. Aborting</source>
- <translation type="obsolete">Для текущего проекта не определён главный сценарий. Отмена</translation>
- </message>
- <message>
<location filename="../UI/UserInterface.py" line="4918"/>
<source>Qt 3 support</source>
<translation>Поддержка Qt3</translation>
@@ -89548,7 +89543,7 @@
<message>
<location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="23"/>
<source>Import {0!r} from line {1!r} shadowed by loop variable.</source>
- <translation>Импорт {0!r} (строка {1!r}) скрывается переменной цикла.</translation>
+ <translation>Импорт {0!r} из строки {1!r} скрывается переменной цикла.</translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="26"/>
