--- a/eric6/i18n/eric6_ru.ts Fri Jun 19 13:43:40 2020 +0200 +++ b/eric6/i18n/eric6_ru.ts Fri Jun 19 13:46:58 2020 +0200 @@ -1984,42 +1984,42 @@ <translation>Ошибка при сохранении закладок в файл <b>{0}</b>.</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="397"/> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="393"/> <source>Export Bookmarks</source> <translation>Экспорт закладок</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="421"/> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="417"/> <source>Exporting Bookmarks</source> <translation>Экспортирование закладок</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="421"/> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="417"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Ошибка при сохранении закладок в файл <b>{0}</b>.</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="537"/> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="533"/> <source>Remove Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="579"/> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="575"/> <source>Insert Bookmark</source> <translation>Вставить закладку</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="616"/> + <source>Name Change</source> + <translation>Изменить имя</translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="620"/> - <source>Name Change</source> - <translation>Изменить имя</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="624"/> <source>Address Change</source> <translation>Изменить адрес</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="397"/> + <location filename="../WebBrowser/Bookmarks/BookmarksManager.py" line="393"/> <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> <translation>XBEL закладки (*.xbel);;XBEL закладки (*.xml);;HTML закладки (*.html)</translation> </message> @@ -3371,7 +3371,7 @@ <translation>Запустить проверку стиля</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1254"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1321"/> <source>Press to fix the selected issues</source> <translation>Редактировать выбранные проблемы</translation> </message> @@ -3486,7 +3486,7 @@ <translation>Автоматическое исправление ошибок</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1167"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1263"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3496,17 +3496,17 @@ по элементу откроет редактор с курсором на соответствующей строке и колонке.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1183"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1279"/> <source>File/Line</source> <translation>Файл/Строка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1188"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1284"/> <source>Code</source> <translation>Код</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1193"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1289"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -3521,27 +3521,27 @@ <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1354"/> <source>Statistics...</source> <translation>Статистика...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="146"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1351"/> <source>Press to show some statistics for the last run</source> <translation>Показать результаты последней проверки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="149"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1344"/> <source>Show</source> <translation>Показать</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="151"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1341"/> <source>Press to show all files containing an issue</source> <translation>Показать все файлы, содержащие ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="241"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="233"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -3551,17 +3551,17 @@ <translation>Исправлено: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="982"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1002"/> <source>No issues found.</source> <translation>Проблем со стилем не найдено.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1214"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1189"/> <source>Shows the progress of the code style check</source> <translation>Отображение выполнения проверки стиля</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1223"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1198"/> <source>%v/%m Files</source> <translation>%v из %m файла(ов)</translation> </message> @@ -3576,12 +3576,12 @@ <translation>Показывать проигнорированные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="927"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="931"/> <source>{0} (ignored)</source> <translation>{0} (проигнорировано)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="820"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="824"/> <source>Preparing files...</source> <translation>Подготовка файлов...</translation> </message> @@ -3591,12 +3591,12 @@ <translation>Задайте максимально допустимую сложность кода (McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="214"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="206"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="859"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="863"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -3681,7 +3681,7 @@ <translation>&Старт</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1324"/> <source>&Fix Selected</source> <translation>&Исправить выделенные</translation> </message> @@ -3701,7 +3701,7 @@ <translation>&Сброс к стандартным</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="985"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="1005"/> <source>No files found (check your ignore list).</source> <translation>Файлы не найдены (проверьте ваш игнор-лист).</translation> </message> @@ -3843,15 +3843,15 @@ <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1146"/> <source>Run</source> - <translation>Выполнено</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1244"/> + <translation type="obsolete">Выполнено</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1311"/> <source>Press to restart the code style check run</source> <translation>Перезапустить проверку стиля</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1247"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1314"/> <source>Restart</source> <translation>Рестарт</translation> </message> @@ -3981,10 +3981,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1154"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1250"/> <source><b>Note:</b> Mark reviewed security issues with a "<b># secok</b>" comment.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1146"/> + <source>Progress</source> + <translation type="unfinished">Индикатор процесса</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1154"/> + <source>Shows the list of files still to be checked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1219"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="1242"/> + <source>Results</source> + <translation type="unfinished">Результаты</translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -9393,22 +9413,22 @@ <translation><p>URL <b>{0}</b> был найден в базе Safe Browsing.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="589"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="590"/> <source>Download Manager</source> <translation>Менеджер загрузки</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="501"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="502"/> <source>Downloads finished</source> <translation>Загрузки завершены</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="501"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="502"/> <source>All files have been downloaded.</source> <translation>Все файлы загружены.</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/Download/DownloadManager.py" line="623"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="624"/> <source>{0}% of %n file(s) ({1}) {2}</source> <translation> <numerusform>{0}% из %n файла ({1}) {2}</numerusform> @@ -9417,7 +9437,7 @@ </translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="630"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="631"/> <source>{0}% - Download Manager</source> <translation>{0}% - Менеджер загрузки</translation> </message> @@ -71033,27 +71053,27 @@ <context> <name>SyntaxCheckService</name> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="208"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="211"/> <source>Python 2 batch check</source> <translation>Пакетная проверка Python 2</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="224"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="227"/> <source>Python 3 batch check</source> <translation>Пакетная проверка Python 3</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="243"/> <source>JavaScript batch check</source> <translation>Пакетная проверка JavaScript</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="256"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="259"/> <source>YAML batch check</source> <translation>Пакетная проверка YAML</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py" line="275"/> <source>JSON batch check</source> <translation>Пакетная проверка JSON</translation> </message>