--- a/eric7/i18n/eric7_zh_CN.ts Sun Jul 11 15:17:16 2021 +0200
+++ b/eric7/i18n/eric7_zh_CN.ts Sun Jul 11 16:29:12 2021 +0200
@@ -29282,8 +29282,8 @@
<context>
<name>HelpDocsInstaller</name>
<message>
- <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="242" />
- <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="178" />
+ <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="243" />
+ <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="179" />
<source><p>The file <b>{0}</b> could not be registered. <br/>Reason: {1}</p></source>
<translation type="unfinished" />
</message>
@@ -48978,6 +48978,16 @@
<source>Edit configuration file</source>
<translation>编辑配置文件</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" />
+ <source>Press to install Mercurial alongside eric7</source>
+ <translation type="unfinished" />
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" />
+ <source>Install Mercurial</source>
+ <translation type="unfinished" />
+ </message>
</context>
<context>
<name>MessageBoxWizard</name>
@@ -49299,52 +49309,52 @@
<context>
<name>MicroPythonDevice</name>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="144" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="166" />
<source>RP2040 based</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="153" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="175" />
<source>Generic Board</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="256" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="278" />
<source>Unknown Device</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="381" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="403" />
<source>Unsupported Device</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="391" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="413" />
<source>REPL is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="410" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="432" />
<source>Plotter is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="429" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="451" />
<source>Running scripts is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="449" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="471" />
<source>File Manager is not supported by this device.</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="494" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="516" />
<source>Select Device Directory</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/MicroPythonDevices.py" line="495" />
+ <location filename="../MicroPython/MicroPythonDevices.py" line="517" />
<source>Select the directory for the connected device:</source>
<translation type="unfinished" />
</message>
@@ -58339,9 +58349,9 @@
<translation>版本控制系统状态</translation>
</message>
<message>
- <location filename="../Project/ProjectBrowserModel.py" line="797" />
- <location filename="../Project/ProjectBrowserModel.py" line="779" />
- <location filename="../Project/ProjectBrowserModel.py" line="744" />
+ <location filename="../Project/ProjectBrowserModel.py" line="799" />
+ <location filename="../Project/ProjectBrowserModel.py" line="781" />
+ <location filename="../Project/ProjectBrowserModel.py" line="746" />
<location filename="../Project/ProjectBrowserModel.py" line="469" />
<location filename="../Project/ProjectBrowserModel.py" line="395" />
<source>local</source>
@@ -82081,14 +82091,14 @@
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="436" />
- <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="418" />
- <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="167" />
+ <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="437" />
+ <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="419" />
+ <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="168" />
<source>Translation Error</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="419" />
+ <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py" line="420" />
<source>The selected translation service does not support the Text-to-Speech function.</source>
<translation type="unfinished" />
</message>
@@ -82387,122 +82397,122 @@
<translation type="unfinished">刷新</translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="358" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="402" />
<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="417" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="384" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="461" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="428" />
<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="492" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="536" />
<source>'{0}' Board</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="523" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="567" />
<source>MicroPython/CircuitPython Files (*.uf2);;All Files (*)</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="593" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="580" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="568" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="637" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="624" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="612" />
<source>Manual Select</source>
<translation type="unfinished">手动选择</translation>
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="698" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="662" />
- <location filename="../MicroPython/UF2FlashDialog.py" line="636" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="742" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="706" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="680" />
<source>Reset Instructions:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="638" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="682" />
<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="665" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="709" />
<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="675" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="719" />
<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="700" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="744" />
<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="712" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="756" />
<source>Flash Instructions:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="714" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="758" />
<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="739" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="783" />
<source>Boot Volume not found:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="741" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="785" />
<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="747" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="791" />
<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="752" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="796" />
<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="759" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="803" />
<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="778" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="822" />
<source>Multiple Boot Volumes found:</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="780" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="824" />
<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="799" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="843" />
<source>Flashing Firmware</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="800" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="844" />
<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="807" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="851" />
<source>Flashing {0}</source>
<translation type="unfinished" />
</message>
<message>
- <location filename="../MicroPython/UF2FlashDialog.py" line="808" />
+ <location filename="../MicroPython/UF2FlashDialog.py" line="852" />
<source><p>Flashing the {0} firmware to the device. Please wait until the device resets automatically.</p></source>
<translation type="unfinished" />
</message>
