Mercurial Repositories > eric / changeset
changeset
Mercurial: added a button to the configuration page to install Mercurial into the eric7 environment.
Sun, 11 Jul 2021 16:29:12 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 11 Jul 2021 16:29:12 +0200
- branch
- eric7
- changeset 8465
- 59bb8fdeef1b
- parent 8464
- 9058a129177e
- child 8466
- bb21fd901f49
Mercurial: added a button to the configuration page to install Mercurial into the eric7 environment.
--- a/eric7/APIs/Python3/eric7.api Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/APIs/Python3/eric7.api Sun Jul 11 16:29:12 2021 +0200 @@ -1888,7 +1888,7 @@ eric7.Globals.desktopName?4() eric7.Globals.getConfigDir?4() eric7.Globals.getInstallInfoFilePath?4() -eric7.Globals.getPyQt5ModulesDirectory?4() +eric7.Globals.getPyQt6ModulesDirectory?4() eric7.Globals.getPyQtToolsPath?4(version=5) eric7.Globals.getPythonLibraryDirectory?4() eric7.Globals.getQtBinariesPath?4() @@ -4964,6 +4964,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.Closehead?1(vcs) eric7.Plugins.VcsPlugins.vcsMercurial.Config.ConfigHgSchemes?7 eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_installButton_clicked?4() eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage?1(plugin) eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.getData?4()
--- a/eric7/Documentation/Help/source.qhp Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Documentation/Help/source.qhp Sun Jul 11 16:29:12 2021 +0200 @@ -9791,7 +9791,9 @@ <keyword name="MercurialPage" id="MercurialPage" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage" /> <keyword name="MercurialPage (Constructor)" id="MercurialPage (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.__init__" /> <keyword name="MercurialPage (Module)" id="MercurialPage (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> + <keyword name="MercurialPage.__mercurialInstalled" id="MercurialPage.__mercurialInstalled" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.__mercurialInstalled" /> <keyword name="MercurialPage.on_configButton_clicked" id="MercurialPage.on_configButton_clicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.on_configButton_clicked" /> + <keyword name="MercurialPage.on_installButton_clicked" id="MercurialPage.on_installButton_clicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.on_installButton_clicked" /> <keyword name="MercurialPage.save" id="MercurialPage.save" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.save" /> <keyword name="MermaidExtension" id="MermaidExtension" ref="eric7.UI.Previewers.MarkdownExtensions.html#MermaidExtension" /> <keyword name="MermaidExtension.extendMarkdown" id="MermaidExtension.extendMarkdown" ref="eric7.UI.Previewers.MarkdownExtensions.html#MermaidExtension.extendMarkdown" /> @@ -17996,7 +17998,7 @@ <keyword name="getProjectBrowserColour" id="getProjectBrowserColour" ref="eric7.Preferences.__init__.html#getProjectBrowserColour" /> <keyword name="getProjectBrowserFlags" id="getProjectBrowserFlags" ref="eric7.Preferences.__init__.html#getProjectBrowserFlags" /> <keyword name="getProtobuf" id="getProtobuf" ref="eric7.Preferences.__init__.html#getProtobuf" /> - <keyword name="getPyQt5ModulesDirectory" id="getPyQt5ModulesDirectory" ref="eric7.Globals.__init__.html#getPyQt5ModulesDirectory" /> + <keyword name="getPyQt6ModulesDirectory" id="getPyQt6ModulesDirectory" ref="eric7.Globals.__init__.html#getPyQt6ModulesDirectory" /> <keyword name="getPyQtToolsPath" id="getPyQtToolsPath" ref="eric7.Globals.__init__.html#getPyQtToolsPath" /> <keyword name="getPython" id="getPython" ref="eric7.Preferences.__init__.html#getPython" /> <keyword name="getPythonLibPath" id="getPythonLibPath" ref="eric7.Utilities.__init__.html#getPythonLibPath" />
--- a/eric7/Documentation/Source/eric7.Globals.__init__.html Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Documentation/Source/eric7.Globals.__init__.html Sun Jul 11 16:29:12 2021 +0200 @@ -56,8 +56,8 @@ <td>Public method to get the path name of the install info file.</td> </tr> <tr> -<td><a href="#getPyQt5ModulesDirectory">getPyQt5ModulesDirectory</a></td> -<td>Function to determine the path to PyQt5 modules directory.</td> +<td><a href="#getPyQt6ModulesDirectory">getPyQt6ModulesDirectory</a></td> +<td>Function to determine the path to PyQt6 modules directory.</td> </tr> <tr> <td><a href="#getPyQtToolsPath">getPyQtToolsPath</a></td> @@ -232,17 +232,17 @@ <div align="right"><a href="#top">Up</a></div> <hr /> <hr /> -<a NAME="getPyQt5ModulesDirectory" ID="getPyQt5ModulesDirectory"></a> -<h2>getPyQt5ModulesDirectory</h2> -<b>getPyQt5ModulesDirectory</b>(<i></i>) +<a NAME="getPyQt6ModulesDirectory" ID="getPyQt6ModulesDirectory"></a> +<h2>getPyQt6ModulesDirectory</h2> +<b>getPyQt6ModulesDirectory</b>(<i></i>) <p> - Function to determine the path to PyQt5 modules directory. + Function to determine the path to PyQt6 modules directory. </p> <dl> <dt>Return:</dt> <dd> -path to the PyQt5 modules directory (string) +path to the PyQt6 modules directory (string) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric7/Documentation/Source/eric7.Plugins.PluginWizardQFileDialog.html Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Documentation/Source/eric7.Plugins.PluginWizardQFileDialog.html Sun Jul 11 16:29:12 2021 +0200 @@ -141,7 +141,7 @@ <dt><i>variant</i> (int)</dt> <dd> variant of code to be generated - (-1 = EricFileDialog, 0 = unknown, 5 = PyQt5) + (-1 = EricFileDialog, 0 = unknown, 5 = PyQt5, 6 = PyQt6) </dd> </dl> <dl>
--- a/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html Sun Jul 11 16:29:12 2021 +0200 @@ -73,10 +73,18 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#MercurialPage.__mercurialInstalled">__mercurialInstalled</a></td> +<td>Private method to check, if mercurial is installed alongside eric7.</td> +</tr> +<tr> <td><a href="#MercurialPage.on_configButton_clicked">on_configButton_clicked</a></td> <td>Private slot to edit the (per user) Mercurial configuration file.</td> </tr> <tr> +<td><a href="#MercurialPage.on_installButton_clicked">on_installButton_clicked</a></td> +<td>Private slot to install Mercurial alongside eric7.</td> +</tr> +<tr> <td><a href="#MercurialPage.save">save</a></td> <td>Public slot to save the Mercurial configuration.</td> </tr> @@ -101,6 +109,13 @@ reference to the plugin object </dd> </dl> +<a NAME="MercurialPage.__mercurialInstalled" ID="MercurialPage.__mercurialInstalled"></a> +<h4>MercurialPage.__mercurialInstalled</h4> +<b>__mercurialInstalled</b>(<i></i>) + +<p> + Private method to check, if mercurial is installed alongside eric7. +</p> <a NAME="MercurialPage.on_configButton_clicked" ID="MercurialPage.on_configButton_clicked"></a> <h4>MercurialPage.on_configButton_clicked</h4> <b>on_configButton_clicked</b>(<i></i>) @@ -108,6 +123,13 @@ <p> Private slot to edit the (per user) Mercurial configuration file. </p> +<a NAME="MercurialPage.on_installButton_clicked" ID="MercurialPage.on_installButton_clicked"></a> +<h4>MercurialPage.on_installButton_clicked</h4> +<b>on_installButton_clicked</b>(<i></i>) + +<p> + Private slot to install Mercurial alongside eric7. +</p> <a NAME="MercurialPage.save" ID="MercurialPage.save"></a> <h4>MercurialPage.save</h4> <b>save</b>(<i></i>)
--- a/eric7/Documentation/Source/eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Documentation/Source/eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html Sun Jul 11 16:29:12 2021 +0200 @@ -131,7 +131,7 @@ <dt><i>dialogVariant</i> (int)</dt> <dd> variant of the file dialog to be generated - (-1 = EricFileDialog, 0 = unknown, 5 = PyQt5) + (-1 = EricFileDialog, 0 = unknown, 5 = PyQt5, 6 = PyQt6) </dd> <dt><i>parent</i> (QWidget)</dt> <dd>
--- a/eric7/Documentation/Source/eric7.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog.html Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Documentation/Source/eric7.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog.html Sun Jul 11 16:29:12 2021 +0200 @@ -190,11 +190,11 @@ </tr> <tr> <td><a href="#QRegularExpressionWizardWidget.__receiveResponse">__receiveResponse</a></td> -<td>Private method to receive a response from the PyQt5 server.</td> +<td>Private method to receive a response from the server.</td> </tr> <tr> <td><a href="#QRegularExpressionWizardWidget.__sendCommand">__sendCommand</a></td> -<td>Private method to send a command to the PyQt5 server.</td> +<td>Private method to send a command to the server.</td> </tr> <tr> <td><a href="#QRegularExpressionWizardWidget.getCode">getCode</a></td> @@ -314,7 +314,7 @@ </tr> <tr> <td><a href="#QRegularExpressionWizardWidget.shutdown">shutdown</a></td> -<td>Public method to shut down the PyQt5 server part.</td> +<td>Public method to shut down the server part.</td> </tr> </table> <h3>Static Methods</h3> @@ -366,7 +366,7 @@ <b>__receiveResponse</b>(<i></i>) <p> - Private method to receive a response from the PyQt5 server. + Private method to receive a response from the server. </p> <dl> <dt>Return:</dt> @@ -379,7 +379,7 @@ <b>__sendCommand</b>(<i>command, **kw</i>) <p> - Private method to send a command to the PyQt5 server. + Private method to send a command to the server. </p> <dl> @@ -646,7 +646,7 @@ <b>shutdown</b>(<i></i>) <p> - Public method to shut down the PyQt5 server part. + Public method to shut down the server part. </p> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jul 11 16:29:12 2021 +0200 @@ -7,12 +7,18 @@ Module implementing the Mercurial configuration page. """ +import os +import sys + from PyQt6.QtCore import pyqtSlot +from EricWidgets.EricApplication import ericApp + from Preferences.ConfigurationPages.ConfigurationPageBase import ( ConfigurationPageBase ) from .Ui_MercurialPage import Ui_MercurialPage +from .. import HgUtilities from Utilities import supportedCodecs @@ -36,6 +42,8 @@ self.encodingComboBox.addItems(sorted(supportedCodecs)) self.encodingModeComboBox.addItems(["strict", "ignore", "replace"]) + self.installButton.setEnabled(not self.__mercurialInstalled()) + # set initial values # global options index = self.encodingComboBox.findText( @@ -121,3 +129,20 @@ dlg = HgUserConfigDialog(version=hgVersion(self.__plugin)[1]) dlg.exec() + + @pyqtSlot() + def on_installButton_clicked(self): + """ + Private slot to install Mercurial alongside eric7. + """ + pip = ericApp().getObject("Pip") + pip.installPackages(["mercurial"], interpreter=sys.executable) + self.installButton.setEnabled(not self.__mercurialInstalled()) + + def __mercurialInstalled(self): + """ + Private method to check, if mercurial is installed alongside eric7. + """ + hg = HgUtilities.getHgExecutable() + # assume local installation, if the path is absolute + return os.path.isabs(hg)
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Sun Jul 11 16:29:12 2021 +0200 @@ -10,7 +10,7 @@ <height>911</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -349,6 +349,29 @@ </widget> </item> <item> + <widget class="Line" name="line15_2"> + <property name="frameShape"> + <enum>QFrame::HLine</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="installButton"> + <property name="toolTip"> + <string>Press to install Mercurial alongside eric7</string> + </property> + <property name="text"> + <string>Install Mercurial</string> + </property> + </widget> + </item> + <item> <spacer> <property name="orientation"> <enum>Qt::Vertical</enum>
--- a/eric7/i18n/eric7_cs.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_cs.ts Sun Jul 11 16:29:12 2021 +0200 @@ -28714,8 +28714,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> @@ -47896,6 +47896,16 @@ <source>Edit configuration file</source> <translation type="unfinished" /> </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> @@ -48217,52 +48227,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> @@ -57148,9 +57158,9 @@ <translation>VCS Status</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> @@ -80482,14 +80492,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> @@ -80776,122 +80786,122 @@ <translation type="unfinished">Obnovit</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" /> </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>
--- a/eric7/i18n/eric7_de.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_de.ts Sun Jul 11 16:29:12 2021 +0200 @@ -27395,8 +27395,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><p>Die Datei <b>{0}</b> konnte nicht registriert werden.<br/>Ursache: {1}</p></translation> </message> @@ -44769,6 +44769,16 @@ <source>Edit configuration file</source> <translation>Konfigurationsdatei editieren</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" /> + <source>Press to install Mercurial alongside eric7</source> + <translation>Drücken, um Mercurial zusammen mit eric7 zu installieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="0" /> + <source>Install Mercurial</source> + <translation>Mercurial installieren</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -45086,52 +45096,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>RP2040 basiert</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="153" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="175" /> <source>Generic Board</source> <translation>Generisches Board</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="256" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="278" /> <source>Unknown Device</source> <translation>Unbekanntes Gerät</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="381" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="403" /> <source>Unsupported Device</source> <translation>Nicht unterstütztes Gerät</translation> </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>REPL wird von diesem Gerät nicht unterstützt.</translation> </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>Der Plotter wird von diesem Gerät nicht unterstützt.</translation> </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>Die Ausführung von Skripten wird von diesem Gerät nicht unterstützt.</translation> </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>Der Dateimanager wird von diesem Gerät nicht unterstützt.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="494" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="516" /> <source>Select Device Directory</source> <translation>Auswahl des Geräteverzeichnis</translation> </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>Wähle das Verzeichnis für das verbundene Gerät:</translation> </message> @@ -53773,9 +53783,9 @@ <translation>VCS-Status</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> @@ -76396,14 +76406,14 @@ <translation>Drücken, um die Textfelder zu löschen</translation> </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>Übersetzungsfehler</translation> </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>Der ausgewählte Übersetzungsdienst unterstützt die Vorlesefunktion nicht.</translation> </message> @@ -76678,122 +76688,122 @@ <translation>Aktualisieren</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><h3>CircuitPython Gerät</h3><p>Um das Gerät zum Flashen vorzubereiten, folgen sie den folgenden Schritten:</p><ol><li>Aktiviere den 'Bootloader' Modus durch zweimaliges Drücken des Reset Knopfes.</li><li>Warten sie, bis das Gerät den 'Bootloader' Modus eingenommen hat.</li><li>(Falls dies nicht erfolgt, versuchen sie es mit einer kürzeren oder längeren Pause zwischen den Drücken.)</li><li>Stellen sie sicher, dass der Boot Datenträger verfügbar ist (evtl. ist er zu mounten).</li><li>Wählen sie die zu flashende Firmwaredatei und klicken sie den Flash Knopf.</li></ol></translation> </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><h3>Pi Pico (RP2040) Gerät</h3><p>Um das Gerät zum Flashen vorzubereiten, folgen sie den folgenden Schritten:</p><ol><li>'Bootloader' Modus aktivieren (Gerät <b>ohne</b> RESET Knopf):<ul><li>Verbinden sie das Gerät während der BOOTSEL Knopf gedrückt gehalten wird.</li></ul>'Bootloader' Modus aktivieren (Gerät <b>mit</b> RESET Knopf):<ul><li>RESET drücken und halten</li><li>BOOTSEL drücken und halten</li><li>RESET loslassen</li><li>BOOTSEL loslassen</li></ul></li><li>Warten sie, bis das Gerät den 'Bootloader' Modus eingenommen hat.</li><li>Stellen sie sicher, dass der Boot Datenträger verfügbar ist (evtl. ist er zu mounten).</li><li>Wählen sie die zu flashende Firmwaredatei und klicken sie den Flash Knopf.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="492" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="536" /> <source>'{0}' Board</source> <translation>'{0}' Board</translation> </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>MicroPython/CircuitPython Dateien (*.uf2);;Alle Dateien (*)</translation> </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>Manuelle Auswahl</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>Reset Instruktionen:</translation> </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><h4>Kein bekanntes Gerät erkannt.</h4><p>Folgen sie den entsprechenden Anweisungen, um <b>ein</b> Gerät in den 'Bootloader' Modus zu versetzen. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </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><h4>{0} Firmware flashen</h4><p>Folgen sie den Anweisungen, um <b>ein</b> Gerät in den 'Bootloader' Modus zu versetzen. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p><hr/>{1}</translation> </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><h4>Potentiell UF2 fähige Geräte gefunden</h4><p>Es wurde folgende potentiell UF2 fähige Geräte gefunden:</p><ul><li>{0}</li></ul><p>Folgen sie den Anweisungen, um <b>ein</b> Gerät in den 'Bootloader' Modus zu versetzen. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </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><h4>Keine bekannten Geräte erkannt.</h4><p>Folgen sie den Anweisungen, um <b>ein</b> Gerät in den 'Bootloader' Modus zu versetzen. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="712" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="756" /> <source>Flash Instructions:</source> <translation>Flash Instruktionen:</translation> </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><h4>Flash Method 'manuell' ausgewählt.</h4>Folgen sie den Anweisungen, um ein Gerät mit manueller Eingabe der Parameter zu flashen.</p><ol><li>Bringen sie das Gerät in den 'Bootloader' Modus.</li><li>Warten sie, bis das Gerät den 'Bootloader' Modus eingenommen hat.</li><li>Stellen sie sicher, dass der Boot Datenträger verfügbar ist (evtl. ist er zu mounten).</li><li>Wählen sie die zu flashende Firmwaredatei und klicken sie den Flash Knopf.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="739" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="783" /> <source>Boot Volume not found:</source> <translation>Boot Datenträger nicht gefunden:</translation> </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><h4>Es wurde kein Boot Datenträger gefunden.</h4><p>Bitte stellen sie sicher, dass der Boot Datenträger für das zu flashende Gerät verfügbar ist. </translation> </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>Dieser Datenträger sollte die Bezeichnung <b>{0}</b> haben. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </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>Dieser Datenträger sollte eine dieser Bezeichnungen haben.</p><ul><li>{0}</li></ul><p>Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </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><h4>Reset Instruktionen</h4><p>Folgen sie den Anweisungen, um das Gerät in den 'Bootloader' Modus zu versetzen. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="778" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="822" /> <source>Multiple Boot Volumes found:</source> <translation>Mehrere Boot Datenträger erkannt:</translation> </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><h4>Mehrere Boot Datenträger wurden erkannt</h4><p>Diese Datenträgerpfade wurden erkannt.</p><ul><li>{0}</li></ul><p>Bitte stellen sie sicher, dass nur ein Gerät zum Flashen bereit ist. Drücken sie <b>Aktualisieren</b>, wenn sie bereit sind.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="799" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="843" /> <source>Flashing Firmware</source> <translation>Flashe Firmware</translation> </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><p>Flashe die ausgewählte Firmware auf das Gerät. Bitte warten Sie bis sich das Gerät automatisch resettet.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="807" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="851" /> <source>Flashing {0}</source> <translation>Flashe {0}</translation> </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><p>Flashe die {0} Firmware auf das Gerät. Bitte warten sie, bis sich das Gerät automatisch resettet.</p></translation> </message>
--- a/eric7/i18n/eric7_empty.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_empty.ts Sun Jul 11 16:29:12 2021 +0200 @@ -27238,8 +27238,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> @@ -44548,6 +44548,16 @@ <source>Edit configuration file</source> <translation type="unfinished" /> </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> @@ -44865,52 +44875,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> @@ -53528,9 +53538,9 @@ <translation type="unfinished" /> </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> @@ -75848,14 +75858,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> @@ -76130,122 +76140,122 @@ <translation type="unfinished" /> </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" /> </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>
--- a/eric7/i18n/eric7_en.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_en.ts Sun Jul 11 16:29:12 2021 +0200 @@ -27255,8 +27255,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> @@ -44582,6 +44582,16 @@ <source>Edit configuration file</source> <translation type="unfinished" /> </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> @@ -44899,52 +44909,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> @@ -53568,9 +53578,9 @@ <translation type="unfinished" /> </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> @@ -75890,14 +75900,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> @@ -76172,122 +76182,122 @@ <translation type="unfinished" /> </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" /> </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>
--- a/eric7/i18n/eric7_es.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_es.ts Sun Jul 11 16:29:12 2021 +0200 @@ -27397,8 +27397,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><p>El archivo <b>{0}</b> no ha podido ser registrado.<br />Causa: {1}</p></translation> </message> @@ -44772,6 +44772,16 @@ <source>Edit configuration file</source> <translation>Editar archivo de configuración</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> @@ -45089,52 +45099,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>Basada en RP2040</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="153" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="175" /> <source>Generic Board</source> <translation>Placa Genérica</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="256" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="278" /> <source>Unknown Device</source> <translation>Dispositivo Desconocido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="381" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="403" /> <source>Unsupported Device</source> <translation>Dispositivo no soportado</translation> </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>REPL no soportado por este dispositivo.</translation> </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>Plotter no soportado por este dispositivo.</translation> </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>La ejecución de scripts no está soportada por este dispositivo.</translation> </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>El Gestor de Archovos no está soportado por este dispositivo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="494" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="516" /> <source>Select Device Directory</source> <translation>Seleccionar Directorio para Dispositivo</translation> </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>Seleccionar el directorio para el dispositivo conectado:</translation> </message> @@ -53775,9 +53785,9 @@ <translation>Estatus de VCS</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> @@ -76384,14 +76394,14 @@ <translation>Pulsar para borrar los campos de texto</translation> </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>Error de Traducción</translation> </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>El servicio de traducción seleccionado no soporta la función de Text-to-Speech.</translation> </message> @@ -76666,122 +76676,122 @@ <translation>Actualizar</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><h3>Placa CircuitPython</h3><p>Para preparar la placa para flashear seguir estos pasos:</p><ol><li>Cambiar el dispositivo a modo 'bootloader' pulsando dos veces el botón de reset.</li><li>Esperar hasta que el dispositivo entre en modo 'bootloader'.</li><li>(Si esto no ocurre, intentar pausas entre pulsado más largas o más cortas.)</li><li>Asegurar que el volumen de arranque está disponible (esto puede requerir de su montaje).</li><li>Seleccionar el archivo de firmware a flashear y hacer click en el botón de flash.</li></ol></translation> </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><h3>Placa Pi Pico (RP2040)</h3><p>Para preparar la placa para flashing seguir estos pasos:</p><ol><li>Entrar en modo 'bootloader' (placa <b>sin</b> botón RESET):<ul><li>Conectar la placa mientras se mantiene pulsado el botón BOOTSEL.</li></ul>Entrar en modo 'bootloader' (placa <b>con</b> botón RESET):<ul><li>mantener pulsado RESET</li><li>mantener pulsado BOOTSEL</li><li>soltar RESET</li><li>soltar BOOTSEL</li></ul></li><li>Esperar hasta que el dispositivo haya entrado en modo 'bootloader'.</li><li>Asegurar que el volumen de arranque está disponible (esto puedo requerir su montaje).</li><li>Seleccionar el archivo de firmware a flashear y hacer click en el botón de flash.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="492" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="536" /> <source>'{0}' Board</source> <translation>Placa '{0}'</translation> </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>Archivos MicroPython/CircuitPython(*.uf2);;Todos los Archivos (*)</translation> </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>Selección Manual</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>Instrucciones de Reset:</translation> </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><h4>No se han detectado dispositivos conocidos.</h4><p>Seguir las instrucciones apropiadas debajo para establecer <b>una</b> placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </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><h4>Flashear {0} Firmware</h4><p>Seguir las instrucciones de bajo para establecer <b>una</b> placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p><hr/>{1}</translation> </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><h4>Encontrados dispositivos con capacidad potencial UF2</h4><p>Encontrados estos dispositivos con capacidad potencial UF2:</p><ul><li>{0}</li></ul><p>Seguir las instrucciones debajo para establecer <b>una</b> placa en modo 'bootloader' mode. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </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><h4>No se han detectado dispositivos conocidos.</h4><p>Seguir las instrucciones apropiadas debajo para establecer <b>una</b> placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="712" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="756" /> <source>Flash Instructions:</source> <translation>Instrucciones de Flash:</translation> </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><h4>Seleccionado método 'manual' de Flash.</h4><p>Seguir las instrucciones debajo para flashear un dispositivo introduciendo manualmente los datos.</p><ol><li>Cambiar el dispositivo a modo 'bootloader'.</li><li>Esperar hasta que el dispositivo haya entrado en modo 'bootloader'.</li><li>Asegurar que el volumen de arranque está disponible (esto puede requerir de su montaje) y seleccionar su ruta.</li><li>Seleccionar el archivo de firmware a flashear y hacer click en el botón de flashear.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="739" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="783" /> <source>Boot Volume not found:</source> <translation>Volumen de Arranque no encontrado:</translation> </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><h4>No se ha encontrado un Volumen de Arranque.</h4><p>Por favor, asegurar que el volumen de arranque del dispositivo a flashear está disponible. </translation> </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>Este volumen se debería llamar <b>{0}</b>. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </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>Este volumen debería tener uno de los siguientes nombres.</p><ul><li>{0}</li></ul><p>Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </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><h4>Instrucciones para Restablecer</h4><p>Seguir las instrucciones de debajo para establecer la placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="778" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="822" /> <source>Multiple Boot Volumes found:</source> <translation>Múltiples Volúmenes de Arranque encontrados:</translation> </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><h4>Se han encontrado múltiples Volúmes de Arranque</h4><p>Esas rutas de volumen se han encontrado.</p><ul><li>{0}</li></ul><p>Por favor, asegurar que solamente un dispositivo de cada tipo está listo para flashear. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="799" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="843" /> <source>Flashing Firmware</source> <translation>Flasheando Firmware</translation> </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><p>Flasheando el firmware seleccionado al dispositivo. Por favor, esperar hasta que el dispositivo haga reset automáticamente.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="807" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="851" /> <source>Flashing {0}</source> <translation>Flasheando {0}</translation> </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><p>Flasheando el firmware {0} al dispositivo. Por favor, esperar hasta que el dispositivo haga reset automáticamente.</p></translation> </message>
--- a/eric7/i18n/eric7_fr.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_fr.ts Sun Jul 11 16:29:12 2021 +0200 @@ -29192,8 +29192,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> @@ -47962,6 +47962,16 @@ <source>Edit configuration file</source> <translation>Modifier le fichier de configuration</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> @@ -48283,52 +48293,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>Matériel non supporté</translation> </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>REPL n'est pas supporté pour ce matériel.</translation> </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>Le gestionnaire de fichier n'est pas supporté pour ce matériel.</translation> </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> @@ -57278,9 +57288,9 @@ <translation>VCS Status</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> @@ -80777,14 +80787,14 @@ <translation>Cliquer pour effacer les champs textes</translation> </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>Erreur de traduction</translation> </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> @@ -81087,122 +81097,122 @@ <translation type="unfinished">Rafraichir</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">Sélection Manuelle</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>
--- a/eric7/i18n/eric7_it.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_it.ts Sun Jul 11 16:29:12 2021 +0200 @@ -29962,8 +29962,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><p>Il file <b>{0}</b> non può essere registrato.<br />Motivo: {1}</p></translation> </message> @@ -49850,6 +49850,16 @@ <source>Edit configuration file</source> <translation type="unfinished" /> </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> @@ -50171,52 +50181,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> @@ -59223,9 +59233,9 @@ <translation>Stato VCS</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> @@ -82993,14 +83003,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> @@ -83295,122 +83305,122 @@ <translation type="unfinished" /> </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" /> </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>
--- a/eric7/i18n/eric7_pt.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_pt.ts Sun Jul 11 16:29:12 2021 +0200 @@ -29810,8 +29810,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><p>O ficheiro <b>{0}</b> não se pôde registar. <br/>Motivo: {1}</p></translation> </message> @@ -49409,6 +49409,16 @@ <source>Edit configuration file</source> <translation>Editar ficheiro de configuração</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> @@ -49730,52 +49740,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> @@ -58727,9 +58737,9 @@ <translation>Estado VCS</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> @@ -81615,14 +81625,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>Erro de Tradução</translation> </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>O serviço de tradução selecionado não suporta a função Text-to-Speech.</translation> </message> @@ -81909,122 +81919,122 @@ <translation type="unfinished">Atualizar</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" /> </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>
--- a/eric7/i18n/eric7_ru.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_ru.ts Sun Jul 11 16:29:12 2021 +0200 @@ -27437,8 +27437,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><p>Невозможно зарегистрировать файл <b>{0}</b>.<br>Причина: {1}</p></translation> </message> @@ -44829,6 +44829,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> @@ -45147,52 +45157,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>На базе RP2040</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="153" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="175" /> <source>Generic Board</source> <translation>Универсальная плата</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="256" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="278" /> <source>Unknown Device</source> <translation>Неизвестное устройство</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="381" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="403" /> <source>Unsupported Device</source> <translation>Неподдерживаемое устройство</translation> </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>REPL не поддерживается этим устройством.</translation> </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>Плоттер не поддерживается этим устройством.</translation> </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>Выполнение скриптов не поддерживается этим устройством.</translation> </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>Менеджер файлов не поддерживается этим устройством.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="494" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="516" /> <source>Select Device Directory</source> <translation>Выберите директорию устройства</translation> </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>Выберите директорию для подсоединенного устройства:</translation> </message> @@ -53869,9 +53879,9 @@ <translation>Статус VCS</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> @@ -76544,14 +76554,14 @@ <translation>Очистить текстовые поля</translation> </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>Ошибка перевода</translation> </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>Выбранный сервис перевода не поддерживает функцию Text-to-Speech.</translation> </message> @@ -76826,122 +76836,122 @@ <translation>Освежить</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><h3>Плата CircuitPython</h3><p>Для подготовки платы к прошивке выполните следующие действия:</p><ol><li>Переключите устройство в режим 'bootloader' двойным нажатием кнопки RESET.</li><li>Подождите, пока устройство не перейдет в режим 'bootloader'.</li><li>(Если этого не произошло, попробуйте сделать паузы между нажатиями короче или длинее.)</li><li>Убедитесь, что загрузочный том доступен (для этого может потребоваться его установка).</li><li>Выберите файл микрокода для прошивки и нажмите кнопку прошивки.</li></ol></translation> </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><h3>Плата Pi Pico (RP2040)</h3><p>Для подготовки платы к прошивке выполните следующие действия:</p><ol><li>Установите режим 'bootloader' (плата <b>без</b> кнопки RESET):<ul><li>Подключите плату удерживая кнопку BOOTSEL.</li></ul>Установите режим 'bootloader' (плата <b>с</b> кнопкой RESET):<ul><li>удерживайте кнопку RESET</li><li>удерживайте кнопку BOOTSEL</li><li>отпустите RESET</li><li>отпустите BOOTSEL</li></ul></li><li>Подождите, пока устройство не перейдет в режим 'bootloader'.</li><li>Убедитесь, что загрузочный том доступен (может потребоваться его установка).</li><li>Выберите файл микрокода для прошивки и нажмите кнопку прошивки.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="492" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="536" /> <source>'{0}' Board</source> <translation>Плата '{0}'</translation> </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>Файлы MicroPython/CircuitPython (*.uf2);;Все файлы (*)</translation> </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>Ручной выбор</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>Инструкции по перезагрузке:</translation> </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><h4>Известные устройства не обнаружены.</h4><p>Следуйте указанным ниже инструкциям для установки <b>одной</b> платы в режим 'bootloader'. По готовности нажмите <b>Освежить</b>.</p></translation> </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><h4>Загрузить прошивку {0}</h4><p>Следуйте указанным ниже инструкциям для установки <b>одной</b> платы в режим 'bootloader'. По готовности нажмите кнопку <b>Освежить</b>.</p><hr/>{1}</translation> </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><h4>Обнаружены устройства, потенциально поддерживающие UF2</h4><p>Найдены следующие устройства, возможно поддерживающие UF2:</p><ul><li>{0}</li></ul><p>Следуйте приведенным ниже инструкциям для установки <b>одной</b> платы в режим 'bootloader'. По готовности нажмите кнопку <b>Освежить</b>.</p></translation> </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><h4>Известные устройства не обнаружены.</h4><p>Следуйте указанным ниже инструкциям для установки <b>одной</b> платы в режим 'bootloader'. По готовности нажмите <b>Освежить</b>.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="712" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="756" /> <source>Flash Instructions:</source> <translation>Инструкции для прошивки:</translation> </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><h4>Выбран метод прошивки 'ручной'.</h4><p>Чтобы прошить устройство путем ввода данных вручную следуйте приведенным ниже инструкциям .</p><ol><li>Переведите устройство в режим 'bootloader'.</li><li>Подождите, пока устройство не перейдет в режим 'bootloader'.</li><li>Убедитесь, что загрузочный том доступен (для этого может потребоваться его установка), и выберите путь к нему.</li><li>Выберите файл микрокода для прошивки и нажмите кнопку прошивки.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="739" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="783" /> <source>Boot Volume not found:</source> <translation>Загрузочный том не найден:</translation> </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><h4>Не обнаружен загрузочный том.</h4><p>Пожалуйста убедитесь, что загрузочный том устройства доступен для прошивки. </translation> </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>Этот том должен иметь имя <b>{0}</b>. По готовности нажмите <b>Освежить</b>.</p></translation> </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>Этот том должен иметь одно из этих имен.</p><ul><li>{0}</li></ul><p>По готовности нажмите <b>Освежить</b>.</p></translation> </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><h4>Инструкции по сбросу</h4><p>Следуйте указанным ниже инструкциям для установки платы в режим 'bootloader'. По готовности нажмите <b>Освежить</b>.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="778" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="822" /> <source>Multiple Boot Volumes found:</source> <translation>Обнаружены несколько загрузочных томов:</translation> </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><h4>Обнаружены несколько загрузочных томов</h4><p>Были найдены пути к этим томам.</p><ul><li>{0}</li></ul><p>Убедитесь, что только одно устройство определенного типа готово для прошивки. По готовности нажмите <b>Освежить</b>.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="799" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="843" /> <source>Flashing Firmware</source> <translation>Прошивка микрокода</translation> </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><p>Прошивка выбранного микрокода на устройство. Подождите, пока устройство не перезагрузится автоматически.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="807" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="851" /> <source>Flashing {0}</source> <translation>Прошивка {0}</translation> </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><p>Прошивка микрокода {0} на устройство. Подождите, пока устройство не перезагрузится автоматически.</p></translation> </message>
--- a/eric7/i18n/eric7_tr.ts Sun Jul 11 15:17:16 2021 +0200 +++ b/eric7/i18n/eric7_tr.ts Sun Jul 11 16:29:12 2021 +0200 @@ -28823,8 +28823,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> @@ -48216,6 +48216,16 @@ <source>Edit configuration file</source> <translation type="unfinished" /> </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> @@ -48537,52 +48547,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> @@ -57443,9 +57453,9 @@ <translation>VCS Durumu</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> @@ -80447,14 +80457,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> @@ -80749,122 +80759,122 @@ <translation type="unfinished">Tazele</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" /> </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>
--- 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>
