--- a/eric6/i18n/eric6_en.ts Sat May 09 12:56:17 2020 +0200 +++ b/eric6/i18n/eric6_en.ts Mon May 11 18:30:25 2020 +0200 @@ -10290,12 +10290,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> @@ -37386,6 +37386,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"/> @@ -43176,27 +43184,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -43754,7 +43762,7 @@ <translation type="unfinished"></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 type="unfinished"></translation> </message> @@ -43782,32 +43790,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="449"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="452"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="495"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></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. @@ -43816,212 +43824,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="522"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="912"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="957"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="980"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1024"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1053"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1104"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1155"/> - <source>Show Version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1158"/> - <source>Show Implementation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1269"/> - <source>Synchronize Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> - <source>Show Device Time</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> + <source>Show Version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> + <source>Show Implementation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> + <source>Synchronize Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> + <source>Show Device Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1480"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1500"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1218"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1245"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1326"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1393"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1470"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> @@ -44036,58 +44044,68 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1037"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1117"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1193"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1189"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> - <source>Date and Time</source> - <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -49326,17 +49344,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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1672"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation type="unfinished"></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 type="unfinished"></translation> </message>