--- a/eric6/i18n/eric6_ru.ts Mon Mar 09 20:21:38 2020 +0100 +++ b/eric6/i18n/eric6_ru.ts Tue Mar 10 19:32:25 2020 +0100 @@ -49356,17 +49356,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1622"/> + <location filename="../Preferences/__init__.py" line="1624"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1650"/> + <location filename="../Preferences/__init__.py" line="1652"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1650"/> + <location filename="../Preferences/__init__.py" line="1652"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation> </message> @@ -51440,7 +51440,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="1021"/> + <location filename="../Project/ProjectFormsBrowser.py" line="1029"/> <source>Forms</source> <translation>Формы</translation> </message> @@ -51585,87 +51585,87 @@ <translation>Компилировать формы</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="630"/> + <location filename="../Project/ProjectFormsBrowser.py" line="637"/> <source>New Form</source> <translation>Новая форма</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="585"/> + <location filename="../Project/ProjectFormsBrowser.py" line="592"/> <source>Select a form type:</source> <translation>Выберите тип формы:</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="599"/> + <location filename="../Project/ProjectFormsBrowser.py" line="606"/> <source>Qt User-Interface Files (*.ui);;All Files (*)</source> <translation>Файлы Qt интерфейса пользователя (*.ui);;Все файлы (*)</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="618"/> + <location filename="../Project/ProjectFormsBrowser.py" line="625"/> <source>The file already exists! Overwrite it?</source> <translation>Файл уже существует! Перезаписать?</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="630"/> + <location filename="../Project/ProjectFormsBrowser.py" line="637"/> <source><p>The new form file <b>{0}</b> could not be created.<br>Problem: {1}</p></source> <translation><p>Файл с формой <b>{0}</b> не может быть создан. Проблема: {1}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="658"/> + <location filename="../Project/ProjectFormsBrowser.py" line="665"/> <source>Delete forms</source> <translation>Удалить формы</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="658"/> + <location filename="../Project/ProjectFormsBrowser.py" line="665"/> <source>Do you really want to delete these forms from the project?</source> <translation>Вы действительно хотите удалить выбранные формы из проекта?</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="812"/> + <location filename="../Project/ProjectFormsBrowser.py" line="819"/> <source>Form Compilation</source> <translation>Компиляция форм</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="784"/> + <location filename="../Project/ProjectFormsBrowser.py" line="791"/> <source>The compilation of the form file was successful.</source> <translation>Компиляция формы прошла успешно.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="799"/> + <location filename="../Project/ProjectFormsBrowser.py" line="806"/> <source><p>The compilation of the form file failed.</p><p>Reason: {0}</p></source> <translation><p>Компиляция формы не удалась.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="812"/> + <location filename="../Project/ProjectFormsBrowser.py" line="819"/> <source>The compilation of the form file failed.</source> <translation>Компиляция формы не удалась.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="886"/> + <location filename="../Project/ProjectFormsBrowser.py" line="894"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="886"/> + <location filename="../Project/ProjectFormsBrowser.py" line="894"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="978"/> + <location filename="../Project/ProjectFormsBrowser.py" line="986"/> <source>Compiling forms...</source> <translation>Компилирую формы...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="1017"/> + <location filename="../Project/ProjectFormsBrowser.py" line="1025"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="1017"/> + <location filename="../Project/ProjectFormsBrowser.py" line="1025"/> <source>Determining changed forms...</source> <translation>Определение измененных форм...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="1049"/> + <location filename="../Project/ProjectFormsBrowser.py" line="1057"/> <source>Compiling changed forms...</source> <translation>Компилирую изменённые формы...</translation> </message> @@ -51720,19 +51720,19 @@ <translation>QStackedWidget</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="1017"/> + <location filename="../Project/ProjectFormsBrowser.py" line="1025"/> <source>%v/%m Forms</source> <translation>%v/%m форм</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="1102"/> + <location filename="../Project/ProjectFormsBrowser.py" line="352"/> <source>Configure uic Compiler</source> <translation>Настройка компилятора uic</translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="1102"/> <source>No project specific uic compiler flags are supported for PySide or PySide2.</source> - <translation>Не поддерживаются определенные флаги компилятора uic для проектов PySide или PySide2.</translation> + <translation type="obsolete">Не поддерживаются определенные флаги компилятора uic для проектов PySide или PySide2.</translation> </message> </context> <context> @@ -52366,7 +52366,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="902"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="896"/> <source>Resources</source> <translation>Ресурсы</translation> </message> @@ -52496,37 +52496,37 @@ <translation>Компиляция ресурса не удалась.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="757"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="751"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="757"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="751"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="823"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="817"/> <source>Compiling resources...</source> <translation>Компиляция ресурсов...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="898"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="892"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="898"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="892"/> <source>Determining changed resources...</source> <translation>Определение изменённых ресурсов...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="936"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="930"/> <source>Compiling changed resources...</source> <translation>Компилирую изменённые ресурсы...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="898"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="892"/> <source>%v/%m Resources</source> <translation>%v/%m ресурсов</translation> </message> @@ -58535,42 +58535,42 @@ <translation><b>Настройка Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="43"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="49"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> <source>Qt Tools</source> <translation>Инструменты Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="117"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Имя исполняемого файла программы состоит из префикса, имени программы и постфикса. Для windows же расширение добавляется автоматически.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> <source>This gives an example of the complete tool name</source> <translation>Пример полного имени инструмента</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> <source>designer</source> <translation>designer</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="37"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Qt Translations Directory</source> <translation>Директория переводов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="59"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="65"/> <source>Enter the path of the Qt translations directory.</source> <translation>Задайте путь к директории переводов Qt.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are <ul> <li>QT4TRANSLATIONSDIR for Qt4</li> @@ -58585,78 +58585,108 @@ </ul></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> <source>Qt-Prefix:</source> <translation>Qt-префикс:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> <source>Enter the prefix for the Qt tools name</source> <translation>Задайте префикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> <source>Qt-Postfix:</source> <translation>Qt-постфикс:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> <source>Enter the postfix for the Qt tools name</source> <translation>Задайте постфикс для инструментов Qt</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> - <translation>Параметры pyuic / pyside-uic</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <translation type="obsolete">Параметры pyuic / pyside-uic</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> <source>Indent Width:</source> <translation>Ширина отступа:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> <source>Select the indent width (default: 4)</source> <translation>Задайте ширину отступа (по умолчанию: 4)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> <source>Generate imports relative to '.'</source> <translation>Генерировать импорт относительно '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> <source>Tools Directory:</source> <translation>Директория инструментов:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="108"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Задайте путь к директории инструментов Qt, если они не найдены.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> <source>PyQt Tools</source> - <translation>Инструменты PyQt</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <translation type="obsolete">Инструменты PyQt</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation>Задайте путь к директории инструментов PyQT, если они не найдены.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="87"/> <source>Sample: {0}designer{1}</source> <translation>Например: {0}designer{1}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> - <source>PySide2 Tools</source> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="37"/> + <source>Qt</source> + <translation type="unfinished">Qt</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <source>PyQt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> - <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <source>Select to generate extra code to test and display the form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <source>Generate Extra Test Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <source>PySide2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> </context> @@ -86729,12 +86759,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="390"/> + <location filename="../eric6.py" line="391"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../eric6.py" line="395"/> + <location filename="../eric6.py" line="396"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message>