--- a/eric7/i18n/eric7_empty.ts Wed May 04 14:43:25 2022 +0200
+++ b/eric7/i18n/eric7_empty.ts Thu May 05 17:40:52 2022 +0200
@@ -38052,17 +38052,17 @@
<context>
<name>HgUtilities</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="128" />
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="131" />
<source>The hg process finished with the exit code {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="133" />
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" />
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="137" />
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" />
<source>Could not start the hg executable.</source>
<translation type="unfinished" />
</message>
@@ -46013,12 +46013,32 @@
<context>
<name>MercurialPage</name>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py" line="45" />
+ <source>Executable Files (*.exe);;All Files (*)</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py" line="50" />
+ <source>All Files (*)</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" />
<source><b>Configure Mercurial Interface</b></source>
<translation type="unfinished" />
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" />
+ <source>Mercurial Executable</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" />
+ <source>Enter the path of the Mercurial executable (hg or hg.exe) to override the automatism.</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" />
<source>Global Options</source>
<translation type="unfinished" />
</message>
@@ -46516,52 +46536,52 @@
<context>
<name>MicroPythonDevice</name>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="212" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="238" />
<source>RP2040 based</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="221" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="247" />
<source>Generic Board</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="325" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="351" />
<source>Unknown Device</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="450" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="476" />
<source>Unsupported Device</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="460" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="486" />
<source>REPL is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="479" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="505" />
<source>Plotter is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="498" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="524" />
<source>Running scripts is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="518" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="544" />
<source>File Manager is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="563" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="589" />
<source>Select Device Directory</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="564" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="590" />
<source>Select the directory for the connected device:</source>
<translation type="unfinished" />
</message>
@@ -78717,122 +78737,122 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="472" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="490" />
<source><h3>CircuitPython Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Switch your device to 'bootloader' mode by double-pressing the reset button.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>(If this does not happen, then try shorter or longer pauses between presses.)</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="531" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="498" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="549" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="516" />
<source><h3>Pi Pico (RP2040) Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Enter 'bootloader' mode (board <b>without</b> RESET button):<ul><li>Plug in your board while holding the BOOTSEL button.</li></ul>Enter 'bootloader' mode (board <b>with</b> RESET button):<ul><li>hold down RESET</li><li>hold down BOOTSEL</li><li>release RESET</li><li>release BOOTSEL</li></ul></li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="606" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="624" />
<source>'{0}' Board</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="637" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="655" />
<source>MicroPython/CircuitPython Files (*.uf2);;All Files (*)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="709" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="696" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="684" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="727" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="714" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="702" />
<source>Manual Select</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="814" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="778" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="752" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="832" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="796" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="770" />
<source>Reset Instructions:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="754" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="772" />
<source><h4>No known devices detected.</h4><p>Follow the appropriate instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="781" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="799" />
<source><h4>Flash {0} Firmware</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p><hr/>{1}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="791" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="809" />
<source><h4>Potentially UF2 capable devices found</h4><p>Found these potentially UF2 capable devices:</p><ul><li>{0}</li></ul><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="816" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="834" />
<source><h4>No known devices detected.</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="828" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="846" />
<source>Flash Instructions:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="830" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="848" />
<source><h4>Flash method 'manual' selected.</h4><p>Follow the instructions below to flash a device by entering the data manually.</p><ol><li>Change the device to 'bootloader' mode.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it) and select its path.</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="855" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="873" />
<source>Boot Volume not found:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="857" />
- <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="863" />
- <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished" />
- </message>
- <message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="868" />
- <source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source>
- <translation type="unfinished" />
- </message>
- <message>
<location filename="../MicroPython/UF2FlashDialog.py" line="875" />
+ <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="881" />
+ <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="886" />
+ <source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../MicroPython/UF2FlashDialog.py" line="893" />
<source><h4>Reset Instructions</h4><p>Follow the instructions below to set the board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="894" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="912" />
<source>Multiple Boot Volumes found:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="896" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="914" />
<source><h4>Multiple Boot Volumes were found</h4><p>These volume paths were found.</p><ul><li>{0}</li></ul><p>Please ensure that only one device of a type is ready for flashing. Press <b>Refresh</b> when ready.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="915" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="933" />
<source>Flashing Firmware</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="916" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="934" />
<source><p>Flashing the selected firmware to the device. Please wait until the device resets automatically.</p></source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="923" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="941" />
<source>Flashing {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="924" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="942" />
<source><p>Flashing the {0} firmware to the device. Please wait until the device resets automatically.</p></source>
<translation type="unfinished" />
</message>
