--- a/i18n/eric6_ru.ts Fri Oct 05 19:02:37 2018 +0200 +++ b/i18n/eric6_ru.ts Sat Oct 06 14:47:40 2018 +0200 @@ -7152,12 +7152,12 @@ <context> <name>DeepLEngine</name> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="79"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="78"/> <source>Text to be translated exceeds the translation limit of {0} characters.</source> <translation>Текст, подлежащий переводу, превышает лимит перевода в {0} символов.</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="115"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="97"/> <source>Invalid response received from DeepL</source> <translation>От DeepL получен недопустимый ответ</translation> </message> @@ -7165,24 +7165,29 @@ <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="118"/> <source>DeepL reported an error. Message: {0}</source> - <translation>Сообщение DeepL об ошибке. + <translation type="obsolete">Сообщение DeepL об ошибке. Сообщение: {0}</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="122"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="100"/> <source>DeepL call returned an unknown result</source> <translation>Вызов DeepL вернул неизвестный результат</translation> </message> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="126"/> <source>Unsupported language code given (source: {0}, target: {1}).</source> - <translation>Неподдерживаемый язык (исходный: {0}, целевой: {1}).</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="133"/> + <translation type="obsolete">Неподдерживаемый язык (исходный: {0}, целевой: {1}).</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="104"/> <source><p>No translation found</p></source> <translation><p>Перевод не найден</p></translation> </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="84"/> + <source>A valid DeepL Pro key is required.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DeleteFilesConfirmationDialog</name> @@ -72913,50 +72918,55 @@ <context> <name>TranslatorEngines</name> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="41"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="38"/> <source>Google V.1</source> <translation>Google V.1</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="43"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="40"/> <source>MyMemory</source> <translation>MyMemory</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="45"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="42"/> <source>Glosbe</source> <translation>Glosbe</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="47"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="44"/> <source>PROMT</source> <translation>PROMT</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="49"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="46"/> <source>Yandex</source> <translation>Yandex</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="59"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="56"/> <source>Unknow translation service name ({0})</source> <translation>Имя неизвестного сервиса перевода ({0})</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="51"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="48"/> <source>Google V.2</source> <translation>Google V.2</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="53"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="50"/> <source>Microsoft</source> <translation>Microsoft</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="57"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="54"/> <source>IBM Watson</source> <translation>IBM Watson</translation> </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py" line="52"/> + <source>DeepL Pro</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TranslatorLanguagesDb</name> @@ -73219,12 +73229,12 @@ <translation><b>Настройка переводчика</b></translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="137"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="173"/> <source>Show dictionary results</source> <translation>Показывать словарь результатов</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="189"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="199"/> <source>Enabled Languages</source> <translation>Используемые языки</translation> </message> @@ -73249,129 +73259,134 @@ <translation>Стандартный набор</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="189"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="199"/> <source>At least two languages should be selected to work correctly.</source> <translation>Для корректной работы должны быть выбраны по крайней мере два языка.</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="134"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="170"/> <source>Select to show the results of the translation dictionary</source> <translation>Разрешить показ словаря результатов перевода</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="266"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="302"/> <source>MyMemory</source> <translation>MyMemory</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="272"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="308"/> <source>Email:</source> <translation>Email:</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="279"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="315"/> <source>Enter email address to be sent with each request (optional)</source> <translation>Введите адрес электронной почты для отправки с каждым запросом (по желанию)</translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="322"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="358"/> <source>Key:</source> <translation>Ключ:</translation> </message> <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="365"/> + <source>Enter your Yandex key</source> + <translation>Введите ваш Yandex ключ</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="352"/> + <source>Yandex</source> + <translation>Yandex</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="59"/> + <source><p>A key is <b>optional</b> to use this service. <a href="{0}">Get a free API key.</a></p></source> + <translation><p>При использовании данного сервиса ключ является <b>опциональным</b>. <a href="{0}">Получить свободный API ключ.</a></p></translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="63"/> + <source><p>A key is <b>required</b> to use this service. <a href="{0}">Get a free API key.</a></p></source> + <translation><p>Для использования данного сервиса <b>требуется</b> ключ. <a href="{0}">Получить свободный API ключ.</a></p></translation> + </message> + <message> <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="329"/> - <source>Enter your Yandex key</source> - <translation>Введите ваш Yandex ключ</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="316"/> - <source>Yandex</source> - <translation>Yandex</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="55"/> - <source><p>A key is <b>optional</b> to use this service. <a href="{0}">Get a free API key.</a></p></source> - <translation><p>При использовании данного сервиса ключ является <b>опциональным</b>. <a href="{0}">Получить свободный API ключ.</a></p></translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="59"/> - <source><p>A key is <b>required</b> to use this service. <a href="{0}">Get a free API key.</a></p></source> - <translation><p>Для использования данного сервиса <b>требуется</b> ключ. <a href="{0}">Получить свободный API ключ.</a></p></translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="293"/> <source>Enter your MyMemory key</source> <translation>Введите ваш MyMemory ключ</translation> </message> <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="164"/> + <source>Google V.1</source> + <translation>Google V.1</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="183"/> + <source>Google V.2</source> + <translation>Google V.2</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="196"/> + <source>Enter your Google Translate key</source> + <translation>Введите ваш Google Translate ключ</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="46"/> + <source><p>A key is <b>required</b> to use this service. <a href="{0}">Get a commercial API key.</a></p></source> + <translation><p>Для использования данного сервиса <b>требуется</b> ключ. <a href="{0}">Получить коммерческий API ключ.</a></p></translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="269"/> + <source>Microsoft Azure</source> + <translation>Microsoft Azure</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="54"/> + <source><p>A registration of the text translation service is <b>required</b>. <a href="{0}">Register with Microsoft Azure.</a></p></source> + <translation><p><b>Необходима</b> регистрация приложения. <a href="{0}">Регистрация посредством Microsoft Azure.</a></p></translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="275"/> + <source>Subscription Key:</source> + <translation>Ключ подписки:</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="282"/> + <source>Enter the subscription key of the text translator service</source> + <translation>Введите ключ подписки службы перевода текста</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="219"/> + <source>IBM Watson</source> + <translation>IBM Watson</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="225"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="239"/> + <source>API Key:</source> + <translation>API ключ:</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="246"/> + <source>Enter your IBM Watson Translator API key</source> + <translation>Введите ваш API ключ для IBM Watson Translator</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="232"/> + <source>Enter your IBM Watson Translator URL</source> + <translation>Введите ваш URL-адрес IBM Watson Translator</translation> + </message> + <message> + <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="50"/> + <source><p>A key is <b>required</b> to use this service. <a href="{0}">Register with IBM Cloud.</a></p></source> + <translation><p>Для использования данного сервиса <b>требуется</b> ключ. <a href="{0}">Зарегистрироваться в IBM Cloud.</a></p></translation> + </message> + <message> <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="128"/> - <source>Google V.1</source> - <translation>Google V.1</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="147"/> - <source>Google V.2</source> - <translation>Google V.2</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="160"/> - <source>Enter your Google Translate key</source> - <translation>Введите ваш Google Translate ключ</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="42"/> - <source><p>A key is <b>required</b> to use this service. <a href="{0}">Get a commercial API key.</a></p></source> - <translation><p>Для использования данного сервиса <b>требуется</b> ключ. <a href="{0}">Получить коммерческий API ключ.</a></p></translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="233"/> - <source>Microsoft Azure</source> - <translation>Microsoft Azure</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="50"/> - <source><p>A registration of the text translation service is <b>required</b>. <a href="{0}">Register with Microsoft Azure.</a></p></source> - <translation><p><b>Необходима</b> регистрация приложения. <a href="{0}">Регистрация посредством Microsoft Azure.</a></p></translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="239"/> - <source>Subscription Key:</source> - <translation>Ключ подписки:</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="246"/> - <source>Enter the subscription key of the text translator service</source> - <translation>Введите ключ подписки службы перевода текста</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="183"/> - <source>IBM Watson</source> - <translation>IBM Watson</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="189"/> - <source>URL:</source> - <translation>URL:</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="203"/> - <source>API Key:</source> - <translation>API ключ:</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="210"/> - <source>Enter your IBM Watson Translator API key</source> - <translation>Введите ваш API ключ для IBM Watson Translator</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui" line="196"/> - <source>Enter your IBM Watson Translator URL</source> - <translation>Введите ваш URL-адрес IBM Watson Translator</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py" line="46"/> - <source><p>A key is <b>required</b> to use this service. <a href="{0}">Register with IBM Cloud.</a></p></source> - <translation><p>Для использования данного сервиса <b>требуется</b> ключ. <a href="{0}">Зарегистрироваться в IBM Cloud.</a></p></translation> + <source>DeepL Pro</source> + <translation type="unfinished"></translation> </message> </context> <context>