diff -r 5a02bdb1dcba -r c06561080e32 src/eric7/i18n/eric7_ru.ts
--- a/src/eric7/i18n/eric7_ru.ts Sat Nov 12 17:49:08 2022 +0100
+++ b/src/eric7/i18n/eric7_ru.ts Sun Nov 13 14:10:57 2022 +0100
@@ -5593,7 +5593,7 @@
<context>
<name>CodingError</name>
<message>
- <location filename="../Utilities/__init__.py" line="210" />
+ <location filename="../Utilities/__init__.py" line="206" />
<source>The coding '{0}' is wrong for the given text.</source>
<translation>Кодировка '{0}' не подходит для выбранного текста.</translation>
</message>
@@ -7827,27 +7827,33 @@
<context>
<name>CycloneDX</name>
<message>
- <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="169" />
- <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="146" />
- <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="110" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="190" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="182" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="151" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="115" />
<source>CycloneDX - SBOM Creation</source>
<translation>Создание SBOM - CycloneDX</translation>
</message>
<message>
- <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="113" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="118" />
<source><p>The configured input file <b>{0}</b> does not exist. Aborting...</p></source>
<translation><p>Конфигурированный файл ввода <b>{0}</b> не существует. Прерывание...</p></translation>
</message>
<message>
- <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="147" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="152" />
<source><p>Some of the dependencies do not have pinned version numbers.<ul>{0}</ul>The above listed packages will NOT be included in the generated CycloneDX SBOM file as version is a mandatory field.</p></source>
<translation><p>Некоторые зависимости не имеют закрепленных номеров версий.<ul>{0}</ul>Перечисленные выше пакеты НЕ будут включены в сгенерированный файл CycloneDX SBOM, поскольку версия является обязательным полем.</p></translation>
</message>
<message>
- <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="170" />
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="183" />
<source><p>The SBOM data was written to file <b>{0}</b>.</p></source>
<translation><p>Данные SBOM были записаны в файл <b>{0}</b>.</p></translation>
</message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXUtilities.py" line="191" />
+ <source><p>The SBOM file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
+ <translation type="unfinished" />
+ </message>
</context>
<context>
<name>CycloneDXConfigDialog</name>
@@ -7913,21 +7919,6 @@
</message>
<message>
<location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
- <source>Schema Version:</source>
- <translation>Версия схемы:</translation>
- </message>
- <message>
- <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
- <source>File Name:</source>
- <translation>Имя файла:</translation>
- </message>
- <message>
- <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
- <source>Select the SBOM schema version of the SBOM file</source>
- <translation>Выберите версию схемы SBOM файла SBOM</translation>
- </message>
- <message>
- <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
<source>Select the format of the SBOM file</source>
<translation>Выберите формат файла SBOM</translation>
</message>
@@ -7943,16 +7934,6 @@
</message>
<message>
<location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
- <source>File Format:</source>
- <translation>Формат файла:</translation>
- </message>
- <message>
- <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
- <source>Enter the file path for the SBOM file (leave empty for default)</source>
- <translation>Укажите путь к файлу SBOM (оставьте пустым по умолчанию)</translation>
- </message>
- <message>
- <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
<source>Select to include vulnerability data in the generated SBOM (requires Schema 1.4 or newer)</source>
<translation>Разрешить включать данные об уязвимостях в сгенерированный SBOM (требуется схема 1.4 или новее)</translation>
</message>
@@ -7972,6 +7953,41 @@
<translation>Включать зависимости</translation>
</message>
<message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>File Format:</source>
+ <translation>Формат файла:</translation>
+ </message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>Select the SBOM schema version of the SBOM file</source>
+ <translation>Выберите версию схемы SBOM файла SBOM</translation>
+ </message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>Enter the file path for the SBOM file (leave empty for default)</source>
+ <translation>Укажите путь к файлу SBOM (оставьте пустым по умолчанию)</translation>
+ </message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>File Name:</source>
+ <translation>Имя файла:</translation>
+ </message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>Schema Version:</source>
+ <translation>Версия схемы:</translation>
+ </message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>Select to generate non-compact, readable output</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../CycloneDXInterface/CycloneDXConfigDialog.ui" line="0" />
+ <source>Generate Readable Output</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../CycloneDXInterface/CycloneDXConfigDialog.py" line="110" />
<source>Edit Metadata...</source>
<translation>Правка метаданных...</translation>
@@ -78762,28 +78778,28 @@
<translation>%v из %m файла(ов)</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="52" />
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="53" />
<source>Show</source>
<translation>Показать</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="55" />
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="56" />
<source>Press to show all files containing an issue</source>
<translation>Показать все файлы, содержащие ошибки</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="104" />
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="105" />
<source>Errors</source>
<translation>Ошибки</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="304" />
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269" />
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="346" />
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="311" />
<source>Error: {0}</source>
<translation>Ошибка: {0}</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="416" />
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="460" />
<source>No issues found.</source>
<translation>Проблем со стилем не найдено.</translation>
</message>
@@ -78791,28 +78807,28 @@
<context>
<name>SyntaxCheckerPlugin</name>
<message>
- <location filename="../Plugins/PluginSyntaxChecker.py" line="295" />
- <location filename="../Plugins/PluginSyntaxChecker.py" line="213" />
- <location filename="../Plugins/PluginSyntaxChecker.py" line="194" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="297" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="215" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="196" />
<source>Check Syntax</source>
<translation>Проверить синтаксис</translation>
</message>
<message>
- <location filename="../Plugins/PluginSyntaxChecker.py" line="295" />
- <location filename="../Plugins/PluginSyntaxChecker.py" line="213" />
- <location filename="../Plugins/PluginSyntaxChecker.py" line="195" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="297" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="215" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="197" />
<source>&Syntax...</source>
<translation>&Синтаксис...</translation>
</message>
<message>
- <location filename="../Plugins/PluginSyntaxChecker.py" line="201" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="203" />
<source>Check syntax.</source>
<translation>Проверить синтаксис.</translation>
</message>
<message>
- <location filename="../Plugins/PluginSyntaxChecker.py" line="298" />
- <location filename="../Plugins/PluginSyntaxChecker.py" line="216" />
- <location filename="../Plugins/PluginSyntaxChecker.py" line="203" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="300" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="218" />
+ <location filename="../Plugins/PluginSyntaxChecker.py" line="205" />
<source><b>Check Syntax...</b><p>This checks Python files for syntax errors.</p></source>
<translation><b>Проверить синтаксис...</b><p>Проверка файлов Python на синтаксические ошибки.</p></translation>
</message>
@@ -86073,7 +86089,7 @@
<context>
<name>Utilities</name>
<message>
- <location filename="../Utilities/__init__.py" line="1605" />
+ <location filename="../Utilities/__init__.py" line="1616" />
<source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source>
<translation><p>Вы можете использовать %-коды как заполнители в строке:
<table>
@@ -91966,54 +91982,54 @@
<context>
<name>VirtualenvManager</name>
<message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="296" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="304" />
<source>Add Virtual Environment</source>
<translation>Добавить виртуальное окружение</translation>
</message>
<message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="297" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="305" />
<source>A virtual environment named <b>{0}</b> exists already. Shall it be replaced?</source>
<translation>Виртуальное окружение с именем <b>{0}</b> уже существует.Заменить его?</translation>
</message>
<message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="369" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="377" />
<source>Change Virtual Environment</source>
<translation>Изменить виртуальное окружение</translation>
</message>
<message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="434" />
- <location filename="../VirtualEnv/VirtualenvManager.py" line="370" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="442" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="378" />
<source>A virtual environment named <b>{0}</b> does not exist. Aborting!</source>
<translation>Виртуальное окружение с именем <b>{0}</b> не существует. Прерывание!</translation>
</message>
<message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="433" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="441" />
<source>Rename Virtual Environment</source>
<translation>Переименовать виртуальное окружение</translation>
</message>
<message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="532" />
- <location filename="../VirtualEnv/VirtualenvManager.py" line="467" />
- <source>{0} - {1}</source>
- <translation>{0} - {1}</translation>
- </message>
- <message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="474" />
- <source>Delete Virtual Environments</source>
- <translation>Удалить виртуальные окружения</translation>
- </message>
- <message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="475" />
- <source>Do you really want to delete these virtual environments?</source>
- <translation>Вы действительно хотите удалить эти виртуальные окружения?</translation>
- </message>
- <message>
- <location filename="../VirtualEnv/VirtualenvManager.py" line="539" />
- <source>Remove Virtual Environments</source>
- <translation>Убрать виртуальные окружения из списка</translation>
- </message>
- <message>
<location filename="../VirtualEnv/VirtualenvManager.py" line="540" />
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="475" />
+ <source>{0} - {1}</source>
+ <translation>{0} - {1}</translation>
+ </message>
+ <message>
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="482" />
+ <source>Delete Virtual Environments</source>
+ <translation>Удалить виртуальные окружения</translation>
+ </message>
+ <message>
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="483" />
+ <source>Do you really want to delete these virtual environments?</source>
+ <translation>Вы действительно хотите удалить эти виртуальные окружения?</translation>
+ </message>
+ <message>
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="547" />
+ <source>Remove Virtual Environments</source>
+ <translation>Убрать виртуальные окружения из списка</translation>
+ </message>
+ <message>
+ <location filename="../VirtualEnv/VirtualenvManager.py" line="548" />
<source>Do you really want to remove these virtual environments?</source>
<translation>Вы действительно хотите убрать эти виртуальные окружения из списка?</translation>
</message>
