--- a/eric6/i18n/eric6_en.ts Sun Jan 31 17:47:01 2021 +0100
+++ b/eric6/i18n/eric6_en.ts Sun Jan 31 17:47:55 2021 +0100
@@ -9403,6 +9403,19 @@
</message>
</context>
<context>
+ <name>E5ComboSelectionDialog</name>
+ <message>
+ <location filename="../E5Gui/E5ComboSelectionDialog.ui" line="14"/>
+ <source>Select from List</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../E5Gui/E5ComboSelectionDialog.ui" line="23"/>
+ <source>Select from the list below:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>E5ErrorMessageFilterDialog</name>
<message>
<location filename="../E5Gui/E5ErrorMessageFilterDialog.ui" line="14"/>
@@ -43613,27 +43626,27 @@
<context>
<name>MicroPythonDevice</name>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="249"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="264"/>
<source>Unsupported Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="259"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="274"/>
<source>REPL is not supported by this device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="278"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="293"/>
<source>Plotter is not supported by this device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="297"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="312"/>
<source>Running scripts is not supported by this device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="317"/>
+ <location filename="../MicroPython/MicroPythonDevices.py" line="332"/>
<source>File Manager is not supported by this device.</source>
<translation type="unfinished"></translation>
</message>
@@ -44015,7 +44028,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="334"/>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="348"/>
<source>Enter the URL for the BBC micro:bit MicroPython documentation</source>
<translation type="unfinished"></translation>
</message>
@@ -44045,11 +44058,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="320"/>
- <source>Enter the URL for the BBC micro:bit Firmware</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="140"/>
<source>Chart Pane</source>
<translation type="unfinished"></translation>
@@ -44110,17 +44118,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="344"/>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="358"/>
<source>Calliope mini:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="357"/>
- <source>Enter the URL for the Callope mini Firmware</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="371"/>
+ <source>Enter the URL for the Callope mini Firmware</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="385"/>
<source>Enter the URL for the Calliope mini MicroPython documentation</source>
<translation type="unfinished"></translation>
</message>
@@ -44130,12 +44138,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="350"/>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="364"/>
<source>Firmware:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="364"/>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="378"/>
<source>Documentation:</source>
<translation type="unfinished"></translation>
</message>
@@ -44149,6 +44157,21 @@
<source>BBC micro:bit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="320"/>
+ <source>Enter the URL for the BBC micro:bit DAPLink Firmware</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="327"/>
+ <source>MicroPython:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/MicroPythonPage.ui" line="334"/>
+ <source>Enter the URL for the BBC micro:bit MicroPython Firmware</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MicroPythonProgressInfoDialog</name>
@@ -44191,7 +44214,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="492"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="495"/>
<source>Press to connect the selected device</source>
<translation type="unfinished"></translation>
</message>
@@ -44219,32 +44242,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="462"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="465"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="464"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="467"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="465"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="468"/>
<source>Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="487"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="490"/>
<source>Press to disconnect the current device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="508"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="511"/>
<source>No device attached</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="508"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="511"/>
<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.
@@ -44253,212 +44276,212 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="535"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="538"/>
<source>Start REPL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="535"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="538"/>
<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="925"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="928"/>
<source>Serial Device Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="925"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="928"/>
<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="970"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="973"/>
<source>Run Script</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="953"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="956"/>
<source>There is no editor open. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="961"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="964"/>
<source>The current editor does not contain a script. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="970"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="973"/>
<source><p>Cannot run script.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="993"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="996"/>
<source>Open Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="993"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="996"/>
<source>Python3 Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1037"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1040"/>
<source>Start Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1037"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1040"/>
<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="1066"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1069"/>
<source>Unsaved Chart Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1066"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1069"/>
<source>The chart contains unsaved data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1117"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1120"/>
<source>Start File Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1117"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1120"/>
<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="1168"/>
- <source>Show Version</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1171"/>
+ <source>Show Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/>
<source>Show Implementation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1285"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1288"/>
<source>Synchronize Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1179"/>
- <source>Show Device Time</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../MicroPython/MicroPythonWidget.py" line="1182"/>
+ <source>Show Device Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1185"/>
<source>Show Local Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1496"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1499"/>
<source>Compile Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1516"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1519"/>
<source>Compile Current Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1223"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/>
<source><h3>Device Version Information</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1232"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/>
<source>No version information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1234"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1237"/>
<source>Device Version Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1257"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1260"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1261"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1264"/>
<source>Device Implementation Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1261"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1264"/>
<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="1285"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1288"/>
<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="1307"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1310"/>
<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="1315"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1318"/>
<source><h3>Device Date and Time</h3><p>{0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1332"/>
<source>Device Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1342"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1345"/>
<source>Local Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1342"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1345"/>
<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="1409"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1412"/>
<source>Error handling device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1409"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1412"/>
<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="1448"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/>
<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="1466"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1469"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1476"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1479"/>
<source>The Python file <b>{0}</b> does not exist. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1486"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1489"/>
<source>'mpy-cross' Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1509"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1512"/>
<source>The current editor does not contain a Python file. Aborting...</source>
<translation type="unfinished"></translation>
</message>
@@ -44473,47 +44496,47 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1050"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1053"/>
<source>µPy Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1130"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1133"/>
<source>µPy Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1206"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1209"/>
<source>Show Documentation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1213"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/>
<source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1185"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/>
<source>Show Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1202"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1205"/>
<source>Download Firmware</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1385"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1388"/>
<source>Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1368"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1371"/>
<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="1385"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1388"/>
<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>
@@ -44533,7 +44556,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1210"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1213"/>
<source>Ignored Serial Devices</source>
<translation type="unfinished"></translation>
</message>
@@ -44642,6 +44665,26 @@
<source>MicroPython/Firmware Files (*.hex);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../MicroPython/MicrobitDevices.py" line="410"/>
+ <source>MicroPython</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicrobitDevices.py" line="410"/>
+ <source>DAPLink</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicrobitDevices.py" line="410"/>
+ <source>Firmware Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../MicroPython/MicrobitDevices.py" line="410"/>
+ <source>Select the firmware type to download from the list below:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MicrosoftEngine</name>
@@ -49913,17 +49956,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1630"/>
+ <location filename="../Preferences/__init__.py" line="1637"/>
<source>Export Preferences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1658"/>
+ <location filename="../Preferences/__init__.py" line="1665"/>
<source>Import Preferences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1658"/>
+ <location filename="../Preferences/__init__.py" line="1665"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
