--- a/eric6/i18n/eric6_ru.ts Sat May 09 12:56:17 2020 +0200
+++ b/eric6/i18n/eric6_ru.ts Mon May 11 18:30:25 2020 +0200
@@ -10412,12 +10412,12 @@
<translation>У&далить всё</translation>
</message>
<message>
- <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/>
+ <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/>
<source>Add Entry</source>
<translation>Добавить запись</translation>
</message>
<message>
- <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/>
+ <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/>
<source>Enter the entry to add to the list:</source>
<translation>Введите строку для добавления в список:</translation>
</message>
@@ -37631,6 +37631,14 @@
</message>
</context>
<context>
+ <name>IgnoredDevicesDialog</name>
+ <message>
+ <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/>
+ <source>Ignored Serial Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ImageMarkupDialog</name>
<message>
<location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/>
@@ -43432,27 +43440,27 @@
<context>
<name>MicroPythonDevice</name>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="222"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="223"/>
<source>Unsupported Device</source>
<translation>Неподдерживаемое устройство</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="232"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="233"/>
<source>REPL is not supported by this device.</source>
<translation>REPL не поддерживается этим устройством.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="251"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="252"/>
<source>Plotter is not supported by this device.</source>
<translation>Плоттер не поддерживается этим устройством.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="270"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="271"/>
<source>Running scripts is not supported by this device.</source>
<translation>Выполнение скриптов не поддерживается этим устройством.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="290"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="291"/>
<source>File Manager is not supported by this device.</source>
<translation>Менеджер файлов не поддерживается этим устройством.</translation>
</message>
@@ -44010,7 +44018,7 @@
<translation>Открыть окно для отображения данных, полученных с выбранного устройства</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="479"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="493"/>
<source>Press to connect the selected device</source>
<translation>Подключить выбранное устройство</translation>
</message>
@@ -44039,32 +44047,32 @@
<translation>Поддерживаемые устройства не обнаружены.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="449"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="463"/>
<source>Clear</source>
<translation>Очистить</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="451"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="465"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="452"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="466"/>
<source>Paste</source>
<translation>Вставить</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="474"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="488"/>
<source>Press to disconnect the current device</source>
<translation>Отключить выбранное устройство</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="495"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="509"/>
<source>No device attached</source>
<translation>Устройство не подключено</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="495"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="509"/>
<source>Please ensure the device is plugged into your computer and selected.
It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work.
@@ -44077,212 +44085,212 @@
И наконец, нажмите кнопку сброса устройства и подождите несколько секунд, прежде чем повторить попытку.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="522"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="536"/>
<source>Start REPL</source>
<translation>Запустить REPL</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="522"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="536"/>
<source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source>
<translation><p>Неудается запустить REPL.</p><p>Причина:</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="912"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="926"/>
<source>Serial Device Connect</source>
<translation>Подсоединение последовательного устройства</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="912"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="926"/>
<source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source>
<translation><p>Не удается соединиться с устройством через последовательный порт <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="957"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="971"/>
<source>Run Script</source>
<translation>Выполнить скрипт</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="940"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="954"/>
<source>There is no editor open. Abort...</source>
<translation>Редактор не открыт. Прервать...</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="948"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="962"/>
<source>The current editor does not contain a script. Abort...</source>
<translation>Текущий редактор не содержит скрипт. Прервать...</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="957"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="971"/>
<source><p>Cannot run script.</p><p>Reason: {0}</p></source>
<translation><p>Не удается выполнить скрипт.</p><p>Причина: {0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="980"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
<source>Open Python File</source>
<translation>Открыть файл Python</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="980"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
<source>Python3 Files (*.py);;All Files (*)</source>
<translation>Файлы Python3 (*.py);;Все файлы (*)</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1024"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/>
<source>Start Chart</source>
<translation>Построить диаграмму</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1024"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/>
<source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source>
<translation><p>Не удается построить диаграмму.</p><p>Причина: {0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1053"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/>
<source>Unsaved Chart Data</source>
<translation>Несохраненные данные диаграммы</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1053"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/>
<source>The chart contains unsaved data.</source>
<translation>Диаграмма содержит несохраненные данные.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1104"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/>
<source>Start File Manager</source>
<translation>Запустить менеджер файлов</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1104"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/>
<source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source>
<translation><p>Не удается запустить менеджер файлов.</p><p>Причина: {0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1155"/>
- <source>Show Version</source>
- <translation>Показать версию</translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1158"/>
- <source>Show Implementation</source>
- <translation>Показать исполнение</translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1269"/>
- <source>Synchronize Time</source>
- <translation>Синхронизировать время</translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/>
- <source>Show Device Time</source>
- <translation>Показать время устройства</translation>
- </message>
- <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1169"/>
+ <source>Show Version</source>
+ <translation>Показать версию</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/>
+ <source>Show Implementation</source>
+ <translation>Показать исполнение</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/>
+ <source>Synchronize Time</source>
+ <translation>Синхронизировать время</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/>
+ <source>Show Device Time</source>
+ <translation>Показать время устройства</translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/>
<source>Show Local Time</source>
<translation>Показать локальное время</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1480"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/>
<source>Compile Python File</source>
<translation>Компилировать файл Python</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1500"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/>
<source>Compile Current Editor</source>
<translation>Компилировать текущий редактор</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/>
<source><h3>Device Version Information</h3></source>
<translation><h3>Информация о версии устройства</h3></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/>
<source>No version information available.</source>
<translation>Информация о версии недоступна.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1218"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/>
<source>Device Version Information</source>
<translation>Информация о версии устройства</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/>
<source>unknown</source>
<translation>unknown</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1245"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/>
<source>Device Implementation Information</source>
<translation>Информация о исполнении устройства</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1245"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/>
<source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source>
<translation><h3>Информация о исполнении устройства</h3><p>Это устройство содержит <b>{0} {1}</b>.</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1269"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/>
<source><p>The time of the connected device was synchronized with the local time.</p></source>
<translation><p>Время подключенного устройства было синхронизировано с локальным временем.</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/>
<source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation><h3>Дата и время устройства</h3><table><tr><td><b>Дата</b></td><td>{0}</td></tr><tr><td><b>Время</b></td><td>{1}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1299"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/>
<source><h3>Device Date and Time</h3><p>{0}</p></source>
<translation><h3>Дата и время устройства</h3><p>{0}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/>
<source>Device Date and Time</source>
<translation>Дата и время устройства</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1326"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/>
<source>Local Date and Time</source>
<translation>Локальные дата и время</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1326"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/>
<source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation><h3>Локальные дата и время</h3><table><tr><td><b>Дата</b></td><td>{0}</td></tr><tr><td><b>Время</b></td><td>{1}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1393"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/>
<source>Error handling device</source>
<translation>Ошибка обработки устройства</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1393"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/>
<source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source>
<translation><p>Произошла ошибка связи с подключенным устройством.</p><p>Метод: {0}</p><p>Сообщение: {1}</p></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1432"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/>
<source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
<translation>Кросс-компилятор MicroPython <b>mpy-cross</b> не найден. Убедитесь, что он находится в пути поиска, или настройте его на странице конфигурации MicroPython.</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1450"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation>Файлы Python (*.py);;Все файлы (*)</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1460"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/>
<source>The Python file <b>{0}</b> does not exist. Aborting...</source>
<translation>Файл Python <b>{0}</b> не существует. Отмена...</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1470"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/>
<source>'mpy-cross' Output</source>
<translation>Вывод команды 'mpy-cross'</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1493"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/>
<source>The current editor does not contain a Python file. Aborting...</source>
<translation>Текущий редактор не содержит файл Python. Отмена...</translation>
</message>
@@ -44297,58 +44305,68 @@
<translation>Открыть менеджер файлов на выбранном устройстве</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1037"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/>
<source>µPy Chart</source>
<translation>µPy диаграммы</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1117"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/>
<source>µPy Files</source>
<translation>µPy файлы</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1193"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/>
<source>Show Documentation</source>
<translation>Обзор документации</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/>
<source>Configure</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/>
<source>Show Time</source>
<translation>Показать время</translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1189"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/>
<source>Download Firmware</source>
<translation>Загрузить прошивку</translation>
</message>
<message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/>
+ <source>Date and Time</source>
+ <translation>Дата и время</translation>
+ </message>
+ <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1369"/>
- <source>Date and Time</source>
- <translation>Дата и время</translation>
- </message>
- <message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/>
<source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source>
<translation><table><tr><th></th><th>Дата и время локальные</th><th>Дата и время устройства</th></tr><tr><td><b>Дата</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Время</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/>
<source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source>
<translation><table><tr><th>Дата и время локальные</th><th>Дата и время устройства</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="330"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="336"/>
<source>Unknown MicroPython Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="330"/>
- <source><p>Detected these unknown MicroPython devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org">the eric bug reporting address.</a></p></source>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="336"/>
+ <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="336"/>
+ <source>{0} ({1:04x}/{2:04x})</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/>
+ <source>Ignored Serial Devices</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -49621,17 +49639,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1644"/>
+ <location filename="../Preferences/__init__.py" line="1645"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1672"/>
+ <location filename="../Preferences/__init__.py" line="1673"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1672"/>
+ <location filename="../Preferences/__init__.py" line="1673"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation>
</message>
