Mercurial Repositories > eric / changeset
changeset
Merged with default branch to prepare new release.
Sun, 31 May 2020 17:26:14 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 31 May 2020 17:26:14 +0200
- branch
- maintenance
- changeset 7607
- dd1054be15aa
- parent 7569
- 707442ffadc3 (current diff)
- parent 7606
- a3a4760b59ec (diff)
- child 7608
- f7cb83647621
Merged with default branch to prepare new release.
--- a/docs/changelog Sat May 02 14:04:18 2020 +0200 +++ b/docs/changelog Sun May 31 17:26:14 2020 +0200 @@ -1,5 +1,11 @@ Change Log ---------- +Version 20.6: +- bug fixes +- Web Browser: + -- added a configurable URL entry color to indicate sites with certificate + issues + -- added code to ask for the title of a new bookmark folder Version 20.5: - bug fixes - MicroPython
--- a/eric6.e4p Sat May 02 14:04:18 2020 +0200 +++ b/eric6.e4p Sun May 31 17:26:14 2020 +0200 @@ -258,6 +258,7 @@ <Source>eric6/MicroPython/EspBackupRestoreFirmwareDialog.py</Source> <Source>eric6/MicroPython/EspDevices.py</Source> <Source>eric6/MicroPython/EspFirmwareSelectionDialog.py</Source> + <Source>eric6/MicroPython/IgnoredDevicesDialog.py</Source> <Source>eric6/MicroPython/MicroPythonCommandsInterface.py</Source> <Source>eric6/MicroPython/MicroPythonDevices.py</Source> <Source>eric6/MicroPython/MicroPythonFileManager.py</Source> @@ -1620,6 +1621,7 @@ <Form>eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.ui</Form> <Form>eric6/MicroPython/EspBackupRestoreFirmwareDialog.ui</Form> <Form>eric6/MicroPython/EspFirmwareSelectionDialog.ui</Form> + <Form>eric6/MicroPython/IgnoredDevicesDialog.ui</Form> <Form>eric6/MicroPython/MicroPythonFileManagerWidget.ui</Form> <Form>eric6/MicroPython/MicroPythonProgressInfoDialog.ui</Form> <Form>eric6/MicroPython/MicroPythonWidget.ui</Form>
--- a/eric6/APIs/Python3/eric6.api Sat May 02 14:04:18 2020 +0200 +++ b/eric6/APIs/Python3/eric6.api Sun May 31 17:26:14 2020 +0200 @@ -1375,6 +1375,7 @@ eric6.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath?1(parent=None) eric6.E5Gui.E5StringListEditWidget.E5StringListEditWidget.getList?4() eric6.E5Gui.E5StringListEditWidget.E5StringListEditWidget.on_addButton_clicked?4() +eric6.E5Gui.E5StringListEditWidget.E5StringListEditWidget.setAddVisible?4(visible) eric6.E5Gui.E5StringListEditWidget.E5StringListEditWidget.setDefaultVisible?4(visible) eric6.E5Gui.E5StringListEditWidget.E5StringListEditWidget.setList?4(stringList) eric6.E5Gui.E5StringListEditWidget.E5StringListEditWidget.setListWhatsThis?4(txt) @@ -2274,10 +2275,13 @@ eric6.MicroPython.EspDevices.EspDevice.runScript?4(script) eric6.MicroPython.EspDevices.EspDevice.setButtons?4() eric6.MicroPython.EspDevices.EspDevice?1(microPythonWidget, parent=None) +eric6.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.FlashModes?7 eric6.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.getData?4() eric6.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.on_espComboBox_currentTextChanged?4(chip) eric6.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.on_firmwarePicker_textChanged?4(firmware) eric6.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog?1(addon=False, parent=None) +eric6.MicroPython.IgnoredDevicesDialog.IgnoredDevicesDialog.getDevices?4() +eric6.MicroPython.IgnoredDevicesDialog.IgnoredDevicesDialog?1(deviceList, parent=None) eric6.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.cd?4(dirname) eric6.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.connectToDevice?4(port) eric6.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.dataReceived?7 @@ -9345,7 +9349,7 @@ eric6.Utilities.parseEnvironmentString?4(s) eric6.Utilities.parseOptionString?4(s) eric6.Utilities.parseString?4(s, rx) -eric6.Utilities.prepareQtMacBundle?4(toolname, version, args) +eric6.Utilities.prepareQtMacBundle?4(toolname, args) eric6.Utilities.readEncodedFile?4(filename) eric6.Utilities.readEncodedFileWithEncoding?4(filename, encoding) eric6.Utilities.readEncodedFileWithHash?4(filename) @@ -10570,6 +10574,7 @@ eric6.WebBrowser.Network.NetworkManager.NetworkManager.clearSslExceptions?4() eric6.WebBrowser.Network.NetworkManager.NetworkManager.createRequest?4(op, request, data) eric6.WebBrowser.Network.NetworkManager.NetworkManager.installUrlInterceptor?4(interceptor) +eric6.WebBrowser.Network.NetworkManager.NetworkManager.isInsecureHost?4(host) eric6.WebBrowser.Network.NetworkManager.NetworkManager.languagesChanged?4() eric6.WebBrowser.Network.NetworkManager.NetworkManager.preferencesChanged?4() eric6.WebBrowser.Network.NetworkManager.NetworkManager.proxyAuthentication?4(requestUrl, auth, proxyHost) @@ -10969,9 +10974,8 @@ eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.resizeEvent?4(evt) eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.showEvent?4(evt) eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog?1(parent=None) -eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.nokStyle?7 -eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.okStyle?7 eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.on_imagesTree_currentItemChanged?4(current, previous) +eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.securityStyleFormat?7 eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog?1(browser, parent=None) eric6.WebBrowser.SiteInfo.SiteInfoWidget.SiteInfoWidget.accept?4() eric6.WebBrowser.SiteInfo.SiteInfoWidget.SiteInfoWidget.showAt?4(pos)
--- a/eric6/APIs/Python3/eric6.bas Sat May 02 14:04:18 2020 +0200 +++ b/eric6/APIs/Python3/eric6.bas Sun May 31 17:26:14 2020 +0200 @@ -503,6 +503,7 @@ IconsPreviewDialog QDialog Ui_IconsPreviewDialog IdlCompilerDefineNameDialog QDialog Ui_IdlCompilerDefineNameDialog IdlCompilerOptionsDialog QDialog Ui_IdlCompilerOptionsDialog +IgnoredDevicesDialog QDialog Ui_IgnoredDevicesDialog ImageMarkupDialog QDialog Ui_ImageMarkupDialog ImageSearchEngine QObject ImagesIcon StatusBarIcon
--- a/eric6/DebugClients/Python/DebugClientBase.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/DebugClients/Python/DebugClientBase.py Sun May 31 17:26:14 2020 +0200 @@ -68,7 +68,7 @@ This function works with the split debugger. - @param prompt prompt to be shown + @param prompt prompt to be shown @type str @return result of the input() call @rtype str @@ -1817,7 +1817,7 @@ if ConfigVarTypeStrings.index(valtype) in filterList: continue except ValueError: - if valtype == "sip.enumtype": + if valtype in ("sip.enumtype", "sip.wrappertype"): if ConfigVarTypeStrings.index('class') in filterList: continue elif (valtype == "sip.methoddescriptor" or
--- a/eric6/DebugClients/Python/DebugVariables.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/DebugClients/Python/DebugVariables.py Sun May 31 17:26:14 2020 +0200 @@ -704,8 +704,10 @@ typeStr = str(typeObject).split(' ', 1)[-1] typeStr = typeStr[1:-2] - if (typeStr.startswith(ConfigQtNames) and - typeStr.endswith(ConfigKnownQtTypes)): + if ( + typeStr.startswith(ConfigQtNames) and + typeStr.endswith(ConfigKnownQtTypes) + ): resolver = None else: if _TypeMap is None:
--- a/eric6/Documentation/Help/source.qhp Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Help/source.qhp Sun May 31 17:26:14 2020 +0200 @@ -232,6 +232,7 @@ <section title="eric6.MicroPython.EspBackupRestoreFirmwareDialog" ref="eric6.MicroPython.EspBackupRestoreFirmwareDialog.html" /> <section title="eric6.MicroPython.EspDevices" ref="eric6.MicroPython.EspDevices.html" /> <section title="eric6.MicroPython.EspFirmwareSelectionDialog" ref="eric6.MicroPython.EspFirmwareSelectionDialog.html" /> + <section title="eric6.MicroPython.IgnoredDevicesDialog" ref="eric6.MicroPython.IgnoredDevicesDialog.html" /> <section title="eric6.MicroPython.MicroPythonCommandsInterface" ref="eric6.MicroPython.MicroPythonCommandsInterface.html" /> <section title="eric6.MicroPython.MicroPythonDevices" ref="eric6.MicroPython.MicroPythonDevices.html" /> <section title="eric6.MicroPython.MicroPythonFileManager" ref="eric6.MicroPython.MicroPythonFileManager.html" /> @@ -2527,6 +2528,7 @@ <keyword name="CodeStyleCheckerDialog.on_loadDefaultButton_clicked" id="CodeStyleCheckerDialog.on_loadDefaultButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_loadDefaultButton_clicked" /> <keyword name="CodeStyleCheckerDialog.on_noFixIssuesSelectButton_clicked" id="CodeStyleCheckerDialog.on_noFixIssuesSelectButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_noFixIssuesSelectButton_clicked" /> <keyword name="CodeStyleCheckerDialog.on_resetDefaultButton_clicked" id="CodeStyleCheckerDialog.on_resetDefaultButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_resetDefaultButton_clicked" /> + <keyword name="CodeStyleCheckerDialog.on_restartButton_clicked" id="CodeStyleCheckerDialog.on_restartButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_restartButton_clicked" /> <keyword name="CodeStyleCheckerDialog.on_resultList_itemActivated" id="CodeStyleCheckerDialog.on_resultList_itemActivated" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_resultList_itemActivated" /> <keyword name="CodeStyleCheckerDialog.on_resultList_itemSelectionChanged" id="CodeStyleCheckerDialog.on_resultList_itemSelectionChanged" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_resultList_itemSelectionChanged" /> <keyword name="CodeStyleCheckerDialog.on_showButton_clicked" id="CodeStyleCheckerDialog.on_showButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_showButton_clicked" /> @@ -4385,6 +4387,7 @@ <keyword name="E5StringListEditWidget (Module)" id="E5StringListEditWidget (Module)" ref="eric6.E5Gui.E5StringListEditWidget.html" /> <keyword name="E5StringListEditWidget.getList" id="E5StringListEditWidget.getList" ref="eric6.E5Gui.E5StringListEditWidget.html#E5StringListEditWidget.getList" /> <keyword name="E5StringListEditWidget.on_addButton_clicked" id="E5StringListEditWidget.on_addButton_clicked" ref="eric6.E5Gui.E5StringListEditWidget.html#E5StringListEditWidget.on_addButton_clicked" /> + <keyword name="E5StringListEditWidget.setAddVisible" id="E5StringListEditWidget.setAddVisible" ref="eric6.E5Gui.E5StringListEditWidget.html#E5StringListEditWidget.setAddVisible" /> <keyword name="E5StringListEditWidget.setDefaultVisible" id="E5StringListEditWidget.setDefaultVisible" ref="eric6.E5Gui.E5StringListEditWidget.html#E5StringListEditWidget.setDefaultVisible" /> <keyword name="E5StringListEditWidget.setList" id="E5StringListEditWidget.setList" ref="eric6.E5Gui.E5StringListEditWidget.html#E5StringListEditWidget.setList" /> <keyword name="E5StringListEditWidget.setListWhatsThis" id="E5StringListEditWidget.setListWhatsThis" ref="eric6.E5Gui.E5StringListEditWidget.html#E5StringListEditWidget.setListWhatsThis" /> @@ -8536,6 +8539,10 @@ <keyword name="IdlCompilerOptionsDialog.on_unDeleteButton_clicked" id="IdlCompilerOptionsDialog.on_unDeleteButton_clicked" ref="eric6.Project.IdlCompilerOptionsDialog.html#IdlCompilerOptionsDialog.on_unDeleteButton_clicked" /> <keyword name="IdlCompilerOptionsDialog.on_unEditButton_clicked" id="IdlCompilerOptionsDialog.on_unEditButton_clicked" ref="eric6.Project.IdlCompilerOptionsDialog.html#IdlCompilerOptionsDialog.on_unEditButton_clicked" /> <keyword name="IdlCompilerOptionsDialog.on_unList_itemSelectionChanged" id="IdlCompilerOptionsDialog.on_unList_itemSelectionChanged" ref="eric6.Project.IdlCompilerOptionsDialog.html#IdlCompilerOptionsDialog.on_unList_itemSelectionChanged" /> + <keyword name="IgnoredDevicesDialog" id="IgnoredDevicesDialog" ref="eric6.MicroPython.IgnoredDevicesDialog.html#IgnoredDevicesDialog" /> + <keyword name="IgnoredDevicesDialog (Constructor)" id="IgnoredDevicesDialog (Constructor)" ref="eric6.MicroPython.IgnoredDevicesDialog.html#IgnoredDevicesDialog.__init__" /> + <keyword name="IgnoredDevicesDialog (Module)" id="IgnoredDevicesDialog (Module)" ref="eric6.MicroPython.IgnoredDevicesDialog.html" /> + <keyword name="IgnoredDevicesDialog.getDevices" id="IgnoredDevicesDialog.getDevices" ref="eric6.MicroPython.IgnoredDevicesDialog.html#IgnoredDevicesDialog.getDevices" /> <keyword name="ImageMarkupDialog" id="ImageMarkupDialog" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog" /> <keyword name="ImageMarkupDialog (Constructor)" id="ImageMarkupDialog (Constructor)" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.__init__" /> <keyword name="ImageMarkupDialog (Module)" id="ImageMarkupDialog (Module)" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html" /> @@ -9725,6 +9732,7 @@ <keyword name="MicroPythonWidget.__downloadFirmware" id="MicroPythonWidget.__downloadFirmware" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__downloadFirmware" /> <keyword name="MicroPythonWidget.__getDeviceTime" id="MicroPythonWidget.__getDeviceTime" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__getDeviceTime" /> <keyword name="MicroPythonWidget.__handlePreferencesChanged" id="MicroPythonWidget.__handlePreferencesChanged" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__handlePreferencesChanged" /> + <keyword name="MicroPythonWidget.__manageIgnored" id="MicroPythonWidget.__manageIgnored" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__manageIgnored" /> <keyword name="MicroPythonWidget.__mpyCrossAvailable" id="MicroPythonWidget.__mpyCrossAvailable" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__mpyCrossAvailable" /> <keyword name="MicroPythonWidget.__paste" id="MicroPythonWidget.__paste" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__paste" /> <keyword name="MicroPythonWidget.__populateDeviceTypeComboBox" id="MicroPythonWidget.__populateDeviceTypeComboBox" ref="eric6.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__populateDeviceTypeComboBox" /> @@ -10156,11 +10164,13 @@ <keyword name="NetworkManager.__load" id="NetworkManager.__load" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.__load" /> <keyword name="NetworkManager.__save" id="NetworkManager.__save" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.__save" /> <keyword name="NetworkManager.__showAuthenticationErrorPage" id="NetworkManager.__showAuthenticationErrorPage" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.__showAuthenticationErrorPage" /> + <keyword name="NetworkManager.__sslErrorHandlingSlot" id="NetworkManager.__sslErrorHandlingSlot" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.__sslErrorHandlingSlot" /> <keyword name="NetworkManager.authentication" id="NetworkManager.authentication" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.authentication" /> <keyword name="NetworkManager.certificateError" id="NetworkManager.certificateError" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.certificateError" /> <keyword name="NetworkManager.clearSslExceptions" id="NetworkManager.clearSslExceptions" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.clearSslExceptions" /> <keyword name="NetworkManager.createRequest" id="NetworkManager.createRequest" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.createRequest" /> <keyword name="NetworkManager.installUrlInterceptor" id="NetworkManager.installUrlInterceptor" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.installUrlInterceptor" /> + <keyword name="NetworkManager.isInsecureHost" id="NetworkManager.isInsecureHost" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.isInsecureHost" /> <keyword name="NetworkManager.languagesChanged" id="NetworkManager.languagesChanged" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.languagesChanged" /> <keyword name="NetworkManager.preferencesChanged" id="NetworkManager.preferencesChanged" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.preferencesChanged" /> <keyword name="NetworkManager.proxyAuthentication" id="NetworkManager.proxyAuthentication" ref="eric6.WebBrowser.Network.NetworkManager.html#NetworkManager.proxyAuthentication" /> @@ -15222,7 +15232,6 @@ <keyword name="UserInterface.__activateViewProfile" id="UserInterface.__activateViewProfile" ref="eric6.UI.UserInterface.html#UserInterface.__activateViewProfile" /> <keyword name="UserInterface.__activateViewmanager" id="UserInterface.__activateViewmanager" ref="eric6.UI.UserInterface.html#UserInterface.__activateViewmanager" /> <keyword name="UserInterface.__assistant" id="UserInterface.__assistant" ref="eric6.UI.UserInterface.html#UserInterface.__assistant" /> - <keyword name="UserInterface.__assistant4" id="UserInterface.__assistant4" ref="eric6.UI.UserInterface.html#UserInterface.__assistant4" /> <keyword name="UserInterface.__checkActions" id="UserInterface.__checkActions" ref="eric6.UI.UserInterface.html#UserInterface.__checkActions" /> <keyword name="UserInterface.__chmViewer" id="UserInterface.__chmViewer" ref="eric6.UI.UserInterface.html#UserInterface.__chmViewer" /> <keyword name="UserInterface.__clearPrivateData" id="UserInterface.__clearPrivateData" ref="eric6.UI.UserInterface.html#UserInterface.__clearPrivateData" /> @@ -15243,7 +15252,6 @@ <keyword name="UserInterface.__deinstallPlugin" id="UserInterface.__deinstallPlugin" ref="eric6.UI.UserInterface.html#UserInterface.__deinstallPlugin" /> <keyword name="UserInterface.__deleteCrashSession" id="UserInterface.__deleteCrashSession" ref="eric6.UI.UserInterface.html#UserInterface.__deleteCrashSession" /> <keyword name="UserInterface.__designer" id="UserInterface.__designer" ref="eric6.UI.UserInterface.html#UserInterface.__designer" /> - <keyword name="UserInterface.__designer4" id="UserInterface.__designer4" ref="eric6.UI.UserInterface.html#UserInterface.__designer4" /> <keyword name="UserInterface.__editPixmap" id="UserInterface.__editPixmap" ref="eric6.UI.UserInterface.html#UserInterface.__editPixmap" /> <keyword name="UserInterface.__editorOpened" id="UserInterface.__editorOpened" ref="eric6.UI.UserInterface.html#UserInterface.__editorOpened" /> <keyword name="UserInterface.__exportPreferences" id="UserInterface.__exportPreferences" ref="eric6.UI.UserInterface.html#UserInterface.__exportPreferences" /> @@ -15269,7 +15277,6 @@ <keyword name="UserInterface.__lastEditorClosed" id="UserInterface.__lastEditorClosed" ref="eric6.UI.UserInterface.html#UserInterface.__lastEditorClosed" /> <keyword name="UserInterface.__launchExternalWebBrowser" id="UserInterface.__launchExternalWebBrowser" ref="eric6.UI.UserInterface.html#UserInterface.__launchExternalWebBrowser" /> <keyword name="UserInterface.__linguist" id="UserInterface.__linguist" ref="eric6.UI.UserInterface.html#UserInterface.__linguist" /> - <keyword name="UserInterface.__linguist4" id="UserInterface.__linguist4" ref="eric6.UI.UserInterface.html#UserInterface.__linguist4" /> <keyword name="UserInterface.__loadSessionFromFile" id="UserInterface.__loadSessionFromFile" ref="eric6.UI.UserInterface.html#UserInterface.__loadSessionFromFile" /> <keyword name="UserInterface.__masterPasswordChanged" id="UserInterface.__masterPasswordChanged" ref="eric6.UI.UserInterface.html#UserInterface.__masterPasswordChanged" /> <keyword name="UserInterface.__newProject" id="UserInterface.__newProject" ref="eric6.UI.UserInterface.html#UserInterface.__newProject" /> @@ -16299,7 +16306,7 @@ <keyword name="WebBrowserTabWidget.__initTabContextMenu" id="WebBrowserTabWidget.__initTabContextMenu" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__initTabContextMenu" /> <keyword name="WebBrowserTabWidget.__lineEditReturnPressed" id="WebBrowserTabWidget.__lineEditReturnPressed" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__lineEditReturnPressed" /> <keyword name="WebBrowserTabWidget.__loadFinished" id="WebBrowserTabWidget.__loadFinished" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__loadFinished" /> - <keyword name="WebBrowserTabWidget.__loadStarted" id="WebBrowserTabWidget.__loadStarted" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__loadStarted" /> + <keyword name="WebBrowserTabWidget.__loadProgress" id="WebBrowserTabWidget.__loadProgress" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__loadProgress" /> <keyword name="WebBrowserTabWidget.__navigationMenuTriggered" id="WebBrowserTabWidget.__navigationMenuTriggered" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__navigationMenuTriggered" /> <keyword name="WebBrowserTabWidget.__newBrowser" id="WebBrowserTabWidget.__newBrowser" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__newBrowser" /> <keyword name="WebBrowserTabWidget.__pathSelected" id="WebBrowserTabWidget.__pathSelected" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.__pathSelected" /> @@ -18011,6 +18018,7 @@ <file>eric6.MicroPython.EspBackupRestoreFirmwareDialog.html</file> <file>eric6.MicroPython.EspDevices.html</file> <file>eric6.MicroPython.EspFirmwareSelectionDialog.html</file> + <file>eric6.MicroPython.IgnoredDevicesDialog.html</file> <file>eric6.MicroPython.MicroPythonCommandsInterface.html</file> <file>eric6.MicroPython.MicroPythonDevices.html</file> <file>eric6.MicroPython.MicroPythonFileManager.html</file>
--- a/eric6/Documentation/Source/eric6.E5Gui.E5StringListEditWidget.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Gui.E5StringListEditWidget.html Sun May 31 17:26:14 2020 +0200 @@ -89,6 +89,10 @@ <td>Private slot to add an entry to the list.</td> </tr> <tr> +<td><a href="#E5StringListEditWidget.setAddVisible">setAddVisible</a></td> +<td>Public method to show or hide the add button.</td> +</tr> +<tr> <td><a href="#E5StringListEditWidget.setDefaultVisible">setDefaultVisible</a></td> <td>Public method to show or hide the default button.</td> </tr> @@ -141,6 +145,20 @@ <p> Private slot to add an entry to the list. </p> +<a NAME="E5StringListEditWidget.setAddVisible" ID="E5StringListEditWidget.setAddVisible"></a> +<h4>E5StringListEditWidget.setAddVisible</h4> +<b>setAddVisible</b>(<i>visible</i>) + +<p> + Public method to show or hide the add button. +</p> +<dl> + +<dt><i>visible</i> (bool)</dt> +<dd> +flag indicating the visibility of the add button +</dd> +</dl> <a NAME="E5StringListEditWidget.setDefaultVisible" ID="E5StringListEditWidget.setDefaultVisible"></a> <h4>E5StringListEditWidget.setDefaultVisible</h4> <b>setDefaultVisible</b>(<i>visible</i>)
--- a/eric6/Documentation/Source/eric6.MicroPython.EspFirmwareSelectionDialog.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.EspFirmwareSelectionDialog.html Sun May 31 17:26:14 2020 +0200 @@ -59,7 +59,7 @@ <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>FlashModes</td></tr> </table> <h3>Class Methods</h3> @@ -133,13 +133,13 @@ <dt>Returns:</dt> <dd> tuple containing the selected chip type, the path of the - firmware file and the flash address + firmware file, the flash mode and the flash address </dd> </dl> <dl> <dt>Return Type:</dt> <dd> -tuple of (str, str, str) +tuple of (str, str, str, str) </dd> </dl> <a NAME="EspFirmwareSelectionDialog.on_espComboBox_currentTextChanged" ID="EspFirmwareSelectionDialog.on_espComboBox_currentTextChanged"></a>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/eric6.MicroPython.IgnoredDevicesDialog.html Sun May 31 17:26:14 2020 +0200 @@ -0,0 +1,126 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.MicroPython.IgnoredDevicesDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric6.MicroPython.IgnoredDevicesDialog</h1> + +<p> +Module implementing a dialog to manage the list of ignored serial devices. +</p> +<h3>Global Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> + +<table> + +<tr> +<td><a href="#IgnoredDevicesDialog">IgnoredDevicesDialog</a></td> +<td>Class implementing a dialog to manage the list of ignored serial devices.</td> +</tr> +</table> +<h3>Functions</h3> + +<table> +<tr><td>None</td></tr> +</table> +<hr /> +<hr /> +<a NAME="IgnoredDevicesDialog" ID="IgnoredDevicesDialog"></a> +<h2>IgnoredDevicesDialog</h2> + +<p> + Class implementing a dialog to manage the list of ignored serial devices. +</p> +<h3>Derived from</h3> +QDialog, Ui_IgnoredDevicesDialog +<h3>Class Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> + +<table> + +<tr> +<td><a href="#IgnoredDevicesDialog.__init__">IgnoredDevicesDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#IgnoredDevicesDialog.getDevices">getDevices</a></td> +<td>Public method to get the list of ignored serial devices.</td> +</tr> +</table> +<h3>Static Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> + +<a NAME="IgnoredDevicesDialog.__init__" ID="IgnoredDevicesDialog.__init__"></a> +<h4>IgnoredDevicesDialog (Constructor)</h4> +<b>IgnoredDevicesDialog</b>(<i>deviceList, parent=None</i>) + +<p> + Constructor +</p> +<dl> + +<dt><i>deviceList</i> (list of tuple of (int, int))</dt> +<dd> +list of ignored serial devices given by VID and PID +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl> +<a NAME="IgnoredDevicesDialog.getDevices" ID="IgnoredDevicesDialog.getDevices"></a> +<h4>IgnoredDevicesDialog.getDevices</h4> +<b>getDevices</b>(<i></i>) + +<p> + Public method to get the list of ignored serial devices. +</p> +<dl> +<dt>Returns:</dt> +<dd> +list of tuples containing the VID, PID and a description + of each ignored device +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +list of tuple of (int, int, str) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.MicroPython.MicroPythonDevices.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonDevices.html Sun May 31 17:26:14 2020 +0200 @@ -633,14 +633,17 @@ <dl> <dt>Returns:</dt> <dd> -set of tuples with the board type, a description and the serial - port it is connected at +tuple containing a list of tuples with the board type, a + description and the serial port it is connected at for known device + types and a list of tuples with VID, PID and description for unknown + devices </dd> </dl> <dl> <dt>Return Type:</dt> <dd> -set of tuples of (str, str, str) +tuple of (list of tuples of (str, str, str), list of tuples of + (int, int, str) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.MicroPython.MicroPythonWidget.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonWidget.html Sun May 31 17:26:14 2020 +0200 @@ -130,6 +130,10 @@ <td>Private slot to handle a change in preferences.</td> </tr> <tr> +<td><a href="#MicroPythonWidget.__manageIgnored">__manageIgnored</a></td> +<td>Private slot to manage the list of ignored serial devices.</td> +</tr> +<tr> <td><a href="#MicroPythonWidget.__mpyCrossAvailable">__mpyCrossAvailable</a></td> <td>Private method to check the availability of mpy-cross.</td> </tr> @@ -397,6 +401,13 @@ <p> Private slot to handle a change in preferences. </p> +<a NAME="MicroPythonWidget.__manageIgnored" ID="MicroPythonWidget.__manageIgnored"></a> +<h4>MicroPythonWidget.__manageIgnored</h4> +<b>__manageIgnored</b>(<i></i>) + +<p> + Private slot to manage the list of ignored serial devices. +</p> <a NAME="MicroPythonWidget.__mpyCrossAvailable" ID="MicroPythonWidget.__mpyCrossAvailable"></a> <h4>MicroPythonWidget.__mpyCrossAvailable</h4> <b>__mpyCrossAvailable</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html Sun May 31 17:26:14 2020 +0200 @@ -209,6 +209,10 @@ <td>Private slot to reset the configuration values to their default values.</td> </tr> <tr> +<td><a href="#CodeStyleCheckerDialog.on_restartButton_clicked">on_restartButton_clicked</a></td> +<td>Private slot to restart a code style check run.</td> +</tr> +<tr> <td><a href="#CodeStyleCheckerDialog.on_resultList_itemActivated">on_resultList_itemActivated</a></td> <td>Private slot to handle the activation of an item.</td> </tr> @@ -763,6 +767,13 @@ <p> Private slot to reset the configuration values to their default values. </p> +<a NAME="CodeStyleCheckerDialog.on_restartButton_clicked" ID="CodeStyleCheckerDialog.on_restartButton_clicked"></a> +<h4>CodeStyleCheckerDialog.on_restartButton_clicked</h4> +<b>on_restartButton_clicked</b>(<i></i>) + +<p> + Private slot to restart a code style check run. +</p> <a NAME="CodeStyleCheckerDialog.on_resultList_itemActivated" ID="CodeStyleCheckerDialog.on_resultList_itemActivated"></a> <h4>CodeStyleCheckerDialog.on_resultList_itemActivated</h4> <b>on_resultList_itemActivated</b>(<i>item, column</i>)
--- a/eric6/Documentation/Source/eric6.UI.UserInterface.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.UI.UserInterface.html Sun May 31 17:26:14 2020 +0200 @@ -323,10 +323,6 @@ <td>Private slot to start the Qt-Assistant executable.</td> </tr> <tr> -<td><a href="#UserInterface.__assistant4">__assistant4</a></td> -<td>Private slot to start the Qt-Assistant 4/5 executable.</td> -</tr> -<tr> <td><a href="#UserInterface.__checkActions">__checkActions</a></td> <td>Private slot to check some actions for their enable/disable status.</td> </tr> @@ -407,10 +403,6 @@ <td>Private slot to start the Qt-Designer executable.</td> </tr> <tr> -<td><a href="#UserInterface.__designer4">__designer4</a></td> -<td>Private slot to start the Qt-Designer 4/5 executable.</td> -</tr> -<tr> <td><a href="#UserInterface.__editPixmap">__editPixmap</a></td> <td>Private slot to show a pixmap in a dialog.</td> </tr> @@ -511,10 +503,6 @@ <td>Private slot to start the Qt-Linguist executable.</td> </tr> <tr> -<td><a href="#UserInterface.__linguist4">__linguist4</a></td> -<td>Private slot to start the Qt-Linguist 4/5 executable.</td> -</tr> -<tr> <td><a href="#UserInterface.__loadSessionFromFile">__loadSessionFromFile</a></td> <td>Private slot to load a session from disk.</td> </tr> @@ -1372,7 +1360,7 @@ </p> <a NAME="UserInterface.__assistant" ID="UserInterface.__assistant"></a> <h4>UserInterface.__assistant</h4> -<b>__assistant</b>(<i>home=None, version=0</i>) +<b>__assistant</b>(<i>home=None</i>) <p> Private slot to start the Qt-Assistant executable. @@ -1383,18 +1371,7 @@ <dd> full pathname of a file to display </dd> -<dt><i>version</i> (int)</dt> -<dd> -indication for the requested version (4 = Qt 4/5) -</dd> </dl> -<a NAME="UserInterface.__assistant4" ID="UserInterface.__assistant4"></a> -<h4>UserInterface.__assistant4</h4> -<b>__assistant4</b>(<i></i>) - -<p> - Private slot to start the Qt-Assistant 4/5 executable. -</p> <a NAME="UserInterface.__checkActions" ID="UserInterface.__checkActions"></a> <h4>UserInterface.__checkActions</h4> <b>__checkActions</b>(<i>editor</i>) @@ -1612,7 +1589,7 @@ </p> <a NAME="UserInterface.__designer" ID="UserInterface.__designer"></a> <h4>UserInterface.__designer</h4> -<b>__designer</b>(<i>fn=None, version=0</i>) +<b>__designer</b>(<i>fn=None</i>) <p> Private slot to start the Qt-Designer executable. @@ -1623,18 +1600,7 @@ <dd> filename of the form to be opened </dd> -<dt><i>version</i> (int)</dt> -<dd> -indication for the requested version (4 = Qt 4/5) -</dd> </dl> -<a NAME="UserInterface.__designer4" ID="UserInterface.__designer4"></a> -<h4>UserInterface.__designer4</h4> -<b>__designer4</b>(<i></i>) - -<p> - Private slot to start the Qt-Designer 4/5 executable. -</p> <a NAME="UserInterface.__editPixmap" ID="UserInterface.__editPixmap"></a> <h4>UserInterface.__editPixmap</h4> <b>__editPixmap</b>(<i>fn=""</i>) @@ -1879,7 +1845,7 @@ </dl> <a NAME="UserInterface.__linguist" ID="UserInterface.__linguist"></a> <h4>UserInterface.__linguist</h4> -<b>__linguist</b>(<i>fn=None, version=0</i>) +<b>__linguist</b>(<i>fn=None</i>) <p> Private slot to start the Qt-Linguist executable. @@ -1890,24 +1856,6 @@ <dd> filename of the translation file to be opened </dd> -<dt><i>version</i> (int)</dt> -<dd> -indication for the requested version (4 = Qt 4/5) -</dd> -</dl> -<a NAME="UserInterface.__linguist4" ID="UserInterface.__linguist4"></a> -<h4>UserInterface.__linguist4</h4> -<b>__linguist4</b>(<i>fn=None</i>) - -<p> - Private slot to start the Qt-Linguist 4/5 executable. -</p> -<dl> - -<dt><i>fn</i></dt> -<dd> -filename of the translation file to be opened -</dd> </dl> <a NAME="UserInterface.__loadSessionFromFile" ID="UserInterface.__loadSessionFromFile"></a> <h4>UserInterface.__loadSessionFromFile</h4>
--- a/eric6/Documentation/Source/eric6.Utilities.__init__.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Utilities.__init__.html Sun May 31 17:26:14 2020 +0200 @@ -491,9 +491,9 @@ </dl> <dl> -<dt>Raises <b>SyntaxError</b>:</dt> +<dt>Raises <b>err</b>:</dt> <dd> - +exception of type SyntaxError </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -2065,30 +2065,32 @@ <hr /> <a NAME="prepareQtMacBundle" ID="prepareQtMacBundle"></a> <h2>prepareQtMacBundle</h2> -<b>prepareQtMacBundle</b>(<i>toolname, version, args</i>) +<b>prepareQtMacBundle</b>(<i>toolname, args</i>) <p> Module function for starting Qt tools that are Mac OS X bundles. </p> <dl> -<dt><i>toolname</i></dt> -<dd> -plain name of the tool (e.g. "designer") (string) -</dd> -<dt><i>version</i></dt> +<dt><i>toolname</i> (str)</dt> <dd> -indication for the requested version (Qt 4) (integer) +plain name of the tool (e.g. "designer") </dd> -<dt><i>args</i></dt> +<dt><i>args</i> (list of str)</dt> <dd> -name of input file for tool, if any (list of strings) +name of input file for tool, if any </dd> </dl> <dl> <dt>Returns:</dt> <dd> -command-name and args for QProcess (tuple) +command-name and args for QProcess +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, list of str) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.WebBrowser.Network.NetworkManager.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.Network.NetworkManager.html Sun May 31 17:26:14 2020 +0200 @@ -93,6 +93,10 @@ <td>Private method to show an authentication error page.</td> </tr> <tr> +<td><a href="#NetworkManager.__sslErrorHandlingSlot">__sslErrorHandlingSlot</a></td> +<td>Private slot to handle SSL errors for a network reply.</td> +</tr> +<tr> <td><a href="#NetworkManager.authentication">authentication</a></td> <td>Public slot to handle an authentication request.</td> </tr> @@ -113,6 +117,10 @@ <td>Public method to install an URL interceptor.</td> </tr> <tr> +<td><a href="#NetworkManager.isInsecureHost">isInsecureHost</a></td> +<td>Public method to check a host against the list of insecure hosts.</td> +</tr> +<tr> <td><a href="#NetworkManager.languagesChanged">languagesChanged</a></td> <td>Public slot to (re-)load the list of accepted languages.</td> </tr> @@ -193,6 +201,24 @@ reference to the URL requesting authentication </dd> </dl> +<a NAME="NetworkManager.__sslErrorHandlingSlot" ID="NetworkManager.__sslErrorHandlingSlot"></a> +<h4>NetworkManager.__sslErrorHandlingSlot</h4> +<b>__sslErrorHandlingSlot</b>(<i>reply, errors</i>) + +<p> + Private slot to handle SSL errors for a network reply. +</p> +<dl> + +<dt><i>reply</i> (QNetworkReply)</dt> +<dd> +reference to the reply object +</dd> +<dt><i>errors</i> (list of QSslError)</dt> +<dd> +list of SSL errors +</dd> +</dl> <a NAME="NetworkManager.authentication" ID="NetworkManager.authentication"></a> <h4>NetworkManager.authentication</h4> <b>authentication</b>(<i>url, auth, page=None</i>) @@ -300,6 +326,32 @@ URL interceptor to be installed </dd> </dl> +<a NAME="NetworkManager.isInsecureHost" ID="NetworkManager.isInsecureHost"></a> +<h4>NetworkManager.isInsecureHost</h4> +<b>isInsecureHost</b>(<i>host</i>) + +<p> + Public method to check a host against the list of insecure hosts. +</p> +<dl> + +<dt><i>host</i> (str)</dt> +<dd> +name of the host to be checked +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +flag indicating an insecure host +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> <a NAME="NetworkManager.languagesChanged" ID="NetworkManager.languagesChanged"></a> <h4>NetworkManager.languagesChanged</h4> <b>languagesChanged</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.WebBrowser.SiteInfo.SiteInfoDialog.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.SiteInfo.SiteInfoDialog.html Sun May 31 17:26:14 2020 +0200 @@ -57,7 +57,7 @@ <h3>Class Attributes</h3> <table> -<tr><td>nokStyle</td></tr><tr><td>okStyle</td></tr> +<tr><td>securityStyleFormat</td></tr> </table> <h3>Class Methods</h3>
--- a/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebIconLoader.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebIconLoader.html Sun May 31 17:26:14 2020 +0200 @@ -57,7 +57,7 @@ <dt>iconLoaded(icon)</dt> <dd> -emitted when the con has been loaded +emitted when the icon has been loaded </dd> </dl> <h3>Derived from</h3>
--- a/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebIconProvider.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebIconProvider.html Sun May 31 17:26:14 2020 +0200 @@ -106,11 +106,11 @@ </tr> <tr> <td><a href="#WebIconProvider.load">load</a></td> -<td>Public method to load the bookmarks.</td> +<td>Public method to load the web site icons.</td> </tr> <tr> <td><a href="#WebIconProvider.save">save</a></td> -<td>Public method to save the zoom values.</td> +<td>Public method to save the web site icons.</td> </tr> <tr> <td><a href="#WebIconProvider.saveIcon">saveIcon</a></td> @@ -235,14 +235,14 @@ <b>load</b>(<i></i>) <p> - Public method to load the bookmarks. + Public method to load the web site icons. </p> <a NAME="WebIconProvider.save" ID="WebIconProvider.save"></a> <h4>WebIconProvider.save</h4> <b>save</b>(<i></i>) <p> - Public method to save the zoom values. + Public method to save the web site icons. </p> <a NAME="WebIconProvider.saveIcon" ID="WebIconProvider.saveIcon"></a> <h4>WebIconProvider.saveIcon</h4>
--- a/eric6/Documentation/Source/eric6.WebBrowser.WebBrowserTabWidget.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.WebBrowserTabWidget.html Sun May 31 17:26:14 2020 +0200 @@ -150,8 +150,8 @@ <td>Private method to handle the loadFinished signal.</td> </tr> <tr> -<td><a href="#WebBrowserTabWidget.__loadStarted">__loadStarted</a></td> -<td>Private method to handle the loadStarted signal.</td> +<td><a href="#WebBrowserTabWidget.__loadProgress">__loadProgress</a></td> +<td>Private method to handle the loadProgress signal.</td> </tr> <tr> <td><a href="#WebBrowserTabWidget.__navigationMenuTriggered">__navigationMenuTriggered</a></td> @@ -494,15 +494,23 @@ reference to the web browser </dd> </dl> -<a NAME="WebBrowserTabWidget.__loadStarted" ID="WebBrowserTabWidget.__loadStarted"></a> -<h4>WebBrowserTabWidget.__loadStarted</h4> -<b>__loadStarted</b>(<i>browser</i>) +<a NAME="WebBrowserTabWidget.__loadProgress" ID="WebBrowserTabWidget.__loadProgress"></a> +<h4>WebBrowserTabWidget.__loadProgress</h4> +<b>__loadProgress</b>(<i>progress, browser</i>) <p> - Private method to handle the loadStarted signal. + Private method to handle the loadProgress signal. +</p> +<p> + Note: This works around wegengine not sending a loadFinished + signal for navigation on the same page. </p> <dl> +<dt><i>progress</i> (int)</dt> +<dd> +load progress in percent +</dd> <dt><i>browser</i> (WebBrowserView)</dt> <dd> reference to the web browser
--- a/eric6/Documentation/Source/index-eric6.MicroPython.html Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.MicroPython.html Sun May 31 17:26:14 2020 +0200 @@ -50,6 +50,10 @@ <td>Module implementing a dialog to select the ESP chip type and the firmware to be flashed.</td> </tr> <tr> +<td><a href="eric6.MicroPython.IgnoredDevicesDialog.html">IgnoredDevicesDialog</a></td> +<td>Module implementing a dialog to manage the list of ignored serial devices.</td> +</tr> +<tr> <td><a href="eric6.MicroPython.MicroPythonCommandsInterface.html">MicroPythonCommandsInterface</a></td> <td>Module implementing some file system commands for MicroPython.</td> </tr>
--- a/eric6/E5Gui/E5Application.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/E5Gui/E5Application.py Sun May 31 17:26:14 2020 +0200 @@ -12,6 +12,17 @@ from PyQt5.QtGui import QPalette from PyQt5.QtWidgets import QApplication +try: + QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling) + # __IGNORE_EXCEPTION__ +except AttributeError: + pass +try: + QCoreApplication.setAttribute(Qt.AA_ShareOpenGLContexts) + # __IGNORE_EXCEPTION__ +except AttributeError: + pass + class E5Application(QApplication): """ @@ -24,17 +35,6 @@ @param argv command line arguments @type list """ - try: - QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling) - # __IGNORE_EXCEPTION__ - except AttributeError: - pass - try: - QCoreApplication.setAttribute(Qt.AA_ShareOpenGLContexts) - # __IGNORE_EXCEPTION__ - except AttributeError: - pass - super(E5Application, self).__init__(argv) QCoreApplication.setAttribute(Qt.AA_DontCreateNativeWidgetSiblings)
--- a/eric6/E5Gui/E5StringListEditWidget.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/E5Gui/E5StringListEditWidget.py Sun May 31 17:26:14 2020 +0200 @@ -82,6 +82,16 @@ """ self.defaultButton.setVisible(visible) + def setAddVisible(self, visible): + """ + Public method to show or hide the add button. + + @param visible flag indicating the visibility of the add button + @type bool + """ + self.addButton.setVisible(visible) + self.addLine.setVisible(visible) + @pyqtSlot() def on_addButton_clicked(self): """
--- a/eric6/E5Gui/E5StringListEditWidget.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/E5Gui/E5StringListEditWidget.ui Sun May 31 17:26:14 2020 +0200 @@ -91,7 +91,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="Line" name="line_3"> + <widget class="Line" name="addLine"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property>
--- a/eric6/IconEditor/cursors/cursors_rc.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/IconEditor/cursors/cursors_rc.py Sun May 31 17:26:14 2020 +0200 @@ -2,81 +2,13 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.12.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x01\x07\ -\x3c\ -\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x52\x43\x43\x3e\x0a\x3c\x52\ -\x43\x43\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x30\x22\ -\x3e\x0a\x3c\x71\x72\x65\x73\x6f\x75\x72\x63\x65\x3e\x0a\x20\x20\ -\x3c\x66\x69\x6c\x65\x3e\x61\x69\x6d\x2d\x63\x75\x72\x73\x6f\x72\ -\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\x3c\x66\ -\x69\x6c\x65\x3e\x63\x6f\x6c\x6f\x72\x70\x69\x63\x6b\x65\x72\x2d\ -\x63\x75\x72\x73\x6f\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\ -\x3e\x0a\x20\x20\x3c\x66\x69\x6c\x65\x3e\x63\x75\x72\x73\x6f\x72\ -\x73\x2e\x71\x72\x63\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\x3c\ -\x66\x69\x6c\x65\x3e\x65\x72\x61\x73\x65\x72\x2d\x63\x75\x72\x73\ -\x6f\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\ -\x3c\x66\x69\x6c\x65\x3e\x66\x69\x6c\x6c\x2d\x63\x75\x72\x73\x6f\ -\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\x3c\ -\x66\x69\x6c\x65\x3e\x70\x61\x69\x6e\x74\x62\x72\x75\x73\x68\x2d\ -\x63\x75\x72\x73\x6f\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\ -\x3e\x0a\x3c\x2f\x71\x72\x65\x73\x6f\x75\x72\x63\x65\x3e\x0a\x3c\ -\x2f\x52\x43\x43\x3e\x0a\ -\x00\x00\x02\xe1\ -\x2f\ -\x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ -\x63\x68\x61\x72\x20\x2a\x65\x72\x61\x73\x65\x72\x5b\x5d\x3d\x7b\ -\x0a\x22\x32\x32\x20\x32\x32\x20\x38\x20\x31\x22\x2c\x0a\x22\x2e\ -\x20\x63\x20\x4e\x6f\x6e\x65\x22\x2c\x0a\x22\x63\x20\x63\x20\x23\ -\x31\x34\x31\x34\x31\x34\x22\x2c\x0a\x22\x66\x20\x63\x20\x23\x32\ -\x63\x32\x63\x32\x63\x22\x2c\x0a\x22\x65\x20\x63\x20\x23\x34\x32\ -\x34\x32\x34\x32\x22\x2c\x0a\x22\x62\x20\x63\x20\x23\x39\x33\x39\ -\x33\x39\x33\x22\x2c\x0a\x22\x61\x20\x63\x20\x23\x63\x39\x63\x39\ -\x63\x39\x22\x2c\x0a\x22\x64\x20\x63\x20\x23\x64\x35\x64\x35\x64\ -\x35\x22\x2c\x0a\x22\x23\x20\x63\x20\x23\x66\x66\x66\x66\x66\x66\ -\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\ -\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x23\x2e\x2e\x22\x2c\ -\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\ -\x62\x62\x62\x62\x62\x62\x23\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\ -\x62\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x23\x22\x2c\x0a\x22\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\ -\x62\x62\x62\x62\x63\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x63\x23\x2e\ -\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\ -\x62\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ -\x2e\x2e\x2e\x2e\x23\x64\x61\x61\x62\x62\x62\x62\x62\x62\x62\x63\ -\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x23\x64\x65\ -\x65\x61\x61\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x2e\x2e\x22\x2c\ -\x0a\x22\x2e\x2e\x2e\x2e\x23\x64\x65\x65\x65\x65\x61\x61\x62\x62\ -\x62\x63\x23\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ -\x64\x65\x65\x65\x65\x65\x65\x61\x61\x62\x63\x23\x2e\x2e\x2e\x2e\ -\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x23\x64\x65\x65\x65\x65\x65\x65\ -\x65\x65\x61\x63\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\ -\x2e\x23\x64\x65\x65\x65\x65\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\x65\x65\x65\x65\ -\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x22\x2c\x0a\x22\x23\x64\x64\x65\x65\x65\x65\x65\x65\x65\x66\x23\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\ -\x64\x64\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x23\x64\x64\x64\x65\x65\x65\ -\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\ -\x0a\x22\x2e\x2e\x23\x64\x64\x64\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ -\x64\x64\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x7d\x3b\x0a\ -\ \x00\x00\x03\x14\ \x2f\ \x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ @@ -129,16 +61,25 @@ \x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x69\x23\x2e\x2e\x2e\x2e\ \x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\ \x7d\x3b\x0a\ -\x00\x00\x00\x7d\ -\x00\ -\x00\x02\x93\x78\x9c\xd3\xd7\x52\x88\x08\xf0\x55\xd0\xd2\xe7\x2a\ -\x2e\x49\x2c\xc9\x4c\x56\x48\xce\x48\x2c\x52\xd0\x4a\xcc\xcc\x8d\ -\x8e\xb5\xad\xe6\x52\x32\x32\x52\x00\x22\x63\x05\x43\x25\x1d\x2e\ -\x25\x3d\x85\x64\x05\xbf\xfc\xbc\x54\x10\x3b\x11\xc8\x56\x36\x00\ -\x03\x10\x57\x19\xc4\x4d\x03\x03\xb0\x4a\xac\x00\x55\x46\x19\x97\ -\x8c\x72\xa2\xf2\x50\x92\x51\x86\x00\x3d\x64\x16\x58\x46\x39\x11\ -\x02\x80\x7c\x28\x4b\x99\xa0\x1e\x38\x48\x1c\x8a\xa1\x83\x3b\x4e\ -\x51\x00\x1e\x99\x5a\x6b\x2e\x00\x12\x9a\x79\xb2\ +\x00\x00\x01\x07\ +\x3c\ +\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x52\x43\x43\x3e\x0a\x3c\x52\ +\x43\x43\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x30\x22\ +\x3e\x0a\x3c\x71\x72\x65\x73\x6f\x75\x72\x63\x65\x3e\x0a\x20\x20\ +\x3c\x66\x69\x6c\x65\x3e\x61\x69\x6d\x2d\x63\x75\x72\x73\x6f\x72\ +\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\x3c\x66\ +\x69\x6c\x65\x3e\x63\x6f\x6c\x6f\x72\x70\x69\x63\x6b\x65\x72\x2d\ +\x63\x75\x72\x73\x6f\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\ +\x3e\x0a\x20\x20\x3c\x66\x69\x6c\x65\x3e\x63\x75\x72\x73\x6f\x72\ +\x73\x2e\x71\x72\x63\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\x3c\ +\x66\x69\x6c\x65\x3e\x65\x72\x61\x73\x65\x72\x2d\x63\x75\x72\x73\ +\x6f\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\ +\x3c\x66\x69\x6c\x65\x3e\x66\x69\x6c\x6c\x2d\x63\x75\x72\x73\x6f\ +\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\x3e\x0a\x20\x20\x3c\ +\x66\x69\x6c\x65\x3e\x70\x61\x69\x6e\x74\x62\x72\x75\x73\x68\x2d\ +\x63\x75\x72\x73\x6f\x72\x2e\x78\x70\x6d\x3c\x2f\x66\x69\x6c\x65\ +\x3e\x0a\x3c\x2f\x71\x72\x65\x73\x6f\x75\x72\x63\x65\x3e\x0a\x3c\ +\x2f\x52\x43\x43\x3e\x0a\ \x00\x00\x03\x0d\ \x2f\ \x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ @@ -242,27 +183,77 @@ \x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ \x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x7d\ \x3b\x0a\ +\x00\x00\x00\x7d\ +\x00\ +\x00\x02\x93\x78\x9c\xd3\xd7\x52\x88\x08\xf0\x55\xd0\xd2\xe7\x2a\ +\x2e\x49\x2c\xc9\x4c\x56\x48\xce\x48\x2c\x52\xd0\x4a\xcc\xcc\x8d\ +\x8e\xb5\xad\xe6\x52\x32\x32\x52\x00\x22\x63\x05\x43\x25\x1d\x2e\ +\x25\x3d\x85\x64\x05\xbf\xfc\xbc\x54\x10\x3b\x11\xc8\x56\x36\x00\ +\x03\x10\x57\x19\xc4\x4d\x03\x03\xb0\x4a\xac\x00\x55\x46\x19\x97\ +\x8c\x72\xa2\xf2\x50\x92\x51\x86\x00\x3d\x64\x16\x58\x46\x39\x11\ +\x02\x80\x7c\x28\x4b\x99\xa0\x1e\x38\x48\x1c\x8a\xa1\x83\x3b\x4e\ +\x51\x00\x1e\x99\x5a\x6b\x2e\x00\x12\x9a\x79\xb2\ +\x00\x00\x02\xe1\ +\x2f\ +\x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ +\x63\x68\x61\x72\x20\x2a\x65\x72\x61\x73\x65\x72\x5b\x5d\x3d\x7b\ +\x0a\x22\x32\x32\x20\x32\x32\x20\x38\x20\x31\x22\x2c\x0a\x22\x2e\ +\x20\x63\x20\x4e\x6f\x6e\x65\x22\x2c\x0a\x22\x63\x20\x63\x20\x23\ +\x31\x34\x31\x34\x31\x34\x22\x2c\x0a\x22\x66\x20\x63\x20\x23\x32\ +\x63\x32\x63\x32\x63\x22\x2c\x0a\x22\x65\x20\x63\x20\x23\x34\x32\ +\x34\x32\x34\x32\x22\x2c\x0a\x22\x62\x20\x63\x20\x23\x39\x33\x39\ +\x33\x39\x33\x22\x2c\x0a\x22\x61\x20\x63\x20\x23\x63\x39\x63\x39\ +\x63\x39\x22\x2c\x0a\x22\x64\x20\x63\x20\x23\x64\x35\x64\x35\x64\ +\x35\x22\x2c\x0a\x22\x23\x20\x63\x20\x23\x66\x66\x66\x66\x66\x66\ +\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\ +\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x23\x2e\x2e\x22\x2c\ +\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\ +\x62\x62\x62\x62\x62\x62\x23\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\ +\x62\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x23\x22\x2c\x0a\x22\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\ +\x62\x62\x62\x62\x63\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x63\x23\x2e\ +\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\ +\x62\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ +\x2e\x2e\x2e\x2e\x23\x64\x61\x61\x62\x62\x62\x62\x62\x62\x62\x63\ +\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x23\x64\x65\ +\x65\x61\x61\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x2e\x2e\x22\x2c\ +\x0a\x22\x2e\x2e\x2e\x2e\x23\x64\x65\x65\x65\x65\x61\x61\x62\x62\ +\x62\x63\x23\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ +\x64\x65\x65\x65\x65\x65\x65\x61\x61\x62\x63\x23\x2e\x2e\x2e\x2e\ +\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x23\x64\x65\x65\x65\x65\x65\x65\ +\x65\x65\x61\x63\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\ +\x2e\x23\x64\x65\x65\x65\x65\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\x65\x65\x65\x65\ +\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x22\x2c\x0a\x22\x23\x64\x64\x65\x65\x65\x65\x65\x65\x65\x66\x23\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\ +\x64\x64\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x23\x64\x64\x64\x65\x65\x65\ +\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\ +\x0a\x22\x2e\x2e\x23\x64\x64\x64\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ +\x64\x64\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x7d\x3b\x0a\ +\ " qt_resource_name = b"\ -\x00\x0b\ -\x06\x43\xcb\xc3\ -\x00\x63\ -\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x73\x00\x2e\x00\x71\x00\x72\x00\x63\ -\x00\x11\ -\x03\x70\x24\x2d\ -\x00\x65\ -\x00\x72\x00\x61\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ -\ \x00\x16\ \x0c\xac\xdf\x8d\ \x00\x63\ \x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x70\x00\x69\x00\x63\x00\x6b\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\ \x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ -\x00\x0e\ -\x0a\x62\x1c\x4d\ -\x00\x61\ -\x00\x69\x00\x6d\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ +\x00\x0b\ +\x06\x43\xcb\xc3\ +\x00\x63\ +\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x73\x00\x2e\x00\x71\x00\x72\x00\x63\ \x00\x0f\ \x0f\x83\xb2\x4d\ \x00\x66\ @@ -272,33 +263,42 @@ \x00\x70\ \x00\x61\x00\x69\x00\x6e\x00\x74\x00\x62\x00\x72\x00\x75\x00\x73\x00\x68\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\ \x00\x2e\x00\x78\x00\x70\x00\x6d\ +\x00\x0e\ +\x0a\x62\x1c\x4d\ +\x00\x61\ +\x00\x69\x00\x6d\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ +\x00\x11\ +\x03\x70\x24\x2d\ +\x00\x65\ +\x00\x72\x00\x61\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ +\ " qt_resource_struct_v1 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\ -\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x01\x00\x00\x01\x0b\ +\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xcc\ +\x00\x00\x00\x32\x00\x00\x00\x00\x00\x01\x00\x00\x03\x18\ +\x00\x00\x00\xa2\x00\x01\x00\x00\x00\x01\x00\x00\x0a\x4b\ +\x00\x00\x00\x72\x00\x00\x00\x00\x00\x01\x00\x00\x07\x34\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x76\x00\x01\x00\x00\x00\x01\x00\x00\x07\x08\ -\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x9a\ -\x00\x00\x00\x44\x00\x00\x00\x00\x00\x01\x00\x00\x03\xf0\ -\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x07\x89\ +\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x04\x23\ " qt_resource_struct_v2 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x01\x00\x00\x01\x0b\ -\x00\x00\x01\x6a\x36\x3b\x50\x01\ +\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xcc\ +\x00\x00\x01\x71\xda\xe0\x03\x7f\ +\x00\x00\x00\x32\x00\x00\x00\x00\x00\x01\x00\x00\x03\x18\ +\x00\x00\x01\x71\xda\xe0\x03\x83\ +\x00\x00\x00\xa2\x00\x01\x00\x00\x00\x01\x00\x00\x0a\x4b\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x00\x72\x00\x00\x00\x00\x00\x01\x00\x00\x07\x34\ +\x00\x00\x01\x71\xda\xe0\x03\x7b\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x6a\x36\x3b\x50\x36\ -\x00\x00\x00\x76\x00\x01\x00\x00\x00\x01\x00\x00\x07\x08\ -\x00\x00\x01\x6a\x36\x3b\x4f\xf9\ -\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x9a\ -\x00\x00\x01\x6a\x36\x3b\x4f\xf4\ -\x00\x00\x00\x44\x00\x00\x00\x00\x00\x01\x00\x00\x03\xf0\ -\x00\x00\x01\x6a\x36\x3b\x50\xb1\ -\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x07\x89\ -\x00\x00\x01\x6a\x36\x3b\x4f\xa4\ +\x00\x00\x01\x71\xda\xe0\x03\x93\ +\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x04\x23\ +\x00\x00\x01\x71\xda\xe0\x03\x7b\ " qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/eric6/MicroPython/CircuitPythonDevices.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/CircuitPythonDevices.py Sun May 31 17:26:14 2020 +0200 @@ -190,7 +190,7 @@ """ Private slot to flash a CircuitPython firmware to the device. """ - ok = E5MessageBox.information( + button = E5MessageBox.information( self.microPython, self.tr("Flash CircuitPython Firmware"), self.tr("Please reset the device to bootloader mode and confirm" @@ -198,7 +198,7 @@ E5MessageBox.StandardButtons( E5MessageBox.Abort | E5MessageBox.Ok)) - if ok: + if button == E5MessageBox.Ok: from .CircuitPythonFirmwareSelectionDialog import ( CircuitPythonFirmwareSelectionDialog) dlg = CircuitPythonFirmwareSelectionDialog()
--- a/eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py Sun May 31 17:26:14 2020 +0200 @@ -48,22 +48,49 @@ self.bootPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode) + self.__manualMarker = "<manual>" boards = ( ("", ""), # indicator for no selection + # Adafruit boards + ("--- Adafruit ---", ""), + ("CLUE nRF52840 Express", "CLUEBOOT"), + ("Circuit Playground Bluefruit", "CPLAYBTBOOT"), ("Circuit Playground Express", "CPLAYBOOT"), + ("Feather Bluefruit Sense", "FTHR840BOOT"), + ("Feather M0 Adalogger", "FEATHERBOOT"), + ("Feather M0 Basic", "FEATHERBOOT"), ("Feather M0 Express", "FEATHERBOOT"), + ("Feather M0 RFM69", "FEATHERBOOT"), + ("Feather M0 RFM9x", "FEATHERBOOT"), ("Feather M4 Express", "FEATHERBOOT"), + ("Feather nRF52840 Express", "FTHR840BOOT"), ("Gemma M0", "GEMMABOOT"), ("Grand Central M4 Express", "GCM4BOOT"), + ("Hallowing M4 Express", "HALLOM4BOOT"), ("ItsyBitsy M0 Express", "ITSYBOOT"), ("ItsyBitsy M4 Express", "ITSYM4BOOT"), + ("ItsyBitsy nRF52840 Express", " ITSY840BOOT"), ("Metro M0 Express", "METROBOOT"), ("Metro M4 Express", "METROM4BOOT"), + ("Metro M4 Express AirLift", "METROM4BOOT"), ("NeoTrelis M4 Express", "TRELM4BOOT"), + ("PyBadge", "BADGEBOOT"), + ("PyGamer", "PYGAMERBOOT"), + ("PyPortal", "PORTALBOOT"), + ("PyPortal Pynt", "PORTALBOOT"), + ("PyPortal Titano", "PORTALBOOT"), + ("PyRuler", "TRINKETBOOT"), ("Trinket M0", "TRINKETBOOT"), - ("Manual Select", "<manual>"), + # SparkFun boards + ("--- SparkFun ---", ""), + ("Qwiic Micro", "QwiicMicro"), + ("SAMD51 Thing Plus", "51THINGBOOT"), + ("RedBoard Turbo", "TURBOBOOT"), + ("Pro nRF52840 Mini", "NRF52BOOT"), + + (self.tr("Manual Select"), self.__manualMarker), ) for boardName, bootVolume in boards: self.boardComboBox.addItem(boardName, bootVolume) @@ -84,7 +111,7 @@ enable = False else: volumeName = self.boardComboBox.currentData() - if volumeName and volumeName != "<manual>": + if volumeName and volumeName != self.__manualMarker: # check if the user selected a board and the board is in # bootloader mode deviceDirectory = Utilities.findVolume(volumeName) @@ -104,7 +131,7 @@ .format(volumeName) ) - elif volumeName == "<manual>": + elif volumeName == self.__manualMarker: # select the device path manually deviceDirectory = self.bootPicker.text() enable = (bool(deviceDirectory) and @@ -134,7 +161,7 @@ @param index index of the selected board type @type int """ - if self.boardComboBox.itemData(index) == "<manual>": + if self.boardComboBox.itemData(index) == self.__manualMarker: self.bootPicker.clear() self.bootPicker.setEnabled(True) else:
--- a/eric6/MicroPython/EspBackupRestoreFirmwareDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/EspBackupRestoreFirmwareDialog.py Sun May 31 17:26:14 2020 +0200 @@ -26,7 +26,12 @@ Class implementing a dialog to select the ESP chip type and the backup and restore parameters. """ - FlashModes = ["qio", "qout", "dio", "dout"] + FlashModes = [ + ("Quad I/O", "qio"), + ("Quad Output", "qout"), + ("Dual I/O", "dio"), + ("Dual Output", "dout"), + ] FlashSizes = { "ESP32": [ (" 1 MB", "0x100000"), @@ -72,7 +77,8 @@ self.setWindowTitle(self.tr("Backup Firmware")) else: self.firmwarePicker.setMode(E5PathPickerModes.OpenFileMode) - self.modeComboBox.addItems(self.FlashModes) + for text, mode in self.FlashModes: + self.modeComboBox.addItem(text, mode) self.setWindowTitle(self.tr("Restore Firmware")) msh = self.minimumSizeHint() @@ -131,6 +137,6 @@ return ( self.espComboBox.currentText().lower(), self.sizeComboBox.currentData(), - self.modeComboBox.currentText(), + self.modeComboBox.currentData(), self.firmwarePicker.text(), )
--- a/eric6/MicroPython/EspDevices.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/EspDevices.py Sun May 31 17:26:14 2020 +0200 @@ -191,7 +191,7 @@ from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog dlg = EspFirmwareSelectionDialog() if dlg.exec_() == QDialog.Accepted: - chip, firmware, _ = dlg.getData() + chip, firmware, flashMode, _ = dlg.getData() if chip == "esp8266": flashAddress = "0x0000" elif chip == "esp32": @@ -205,9 +205,15 @@ "--chip", chip, "--port", self.microPython.getCurrentPort(), "write_flash", + ] + if flashMode: + flashArgs.extend([ + "--flash_mode", flashMode + ]) + flashArgs.extend([ flashAddress, firmware, - ] + ]) dlg = E5ProcessDialog(self.tr("'esptool write_flash' Output"), self.tr("Flash MicroPython Firmware"), showProgress=True) @@ -223,16 +229,22 @@ from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog dlg = EspFirmwareSelectionDialog(addon=True) if dlg.exec_() == QDialog.Accepted: - chip, firmware, flashAddress = dlg.getData() + chip, firmware, flashMode, flashAddress = dlg.getData() flashArgs = [ "-u", "-m", "esptool", "--chip", chip, "--port", self.microPython.getCurrentPort(), "write_flash", + ] + if flashMode: + flashArgs.extend([ + "--flash_mode", flashMode + ]) + flashArgs.extend([ flashAddress.lower(), firmware, - ] + ]) dlg = E5ProcessDialog(self.tr("'esptool write_flash' Output"), self.tr("Flash Additional Firmware"), showProgress=True)
--- a/eric6/MicroPython/EspFirmwareSelectionDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/EspFirmwareSelectionDialog.py Sun May 31 17:26:14 2020 +0200 @@ -25,6 +25,14 @@ Class implementing a dialog to select the ESP chip type and the firmware to be flashed. """ + FlashModes = ( + ("", ""), + ("Quad I/O", "qio"), + ("Quad Output", "qout"), + ("Dual I/O", "dio"), + ("Dual Output", "dout"), + ) + def __init__(self, addon=False, parent=None): """ Constructor @@ -45,6 +53,9 @@ self.espComboBox.addItems(["", "ESP32", "ESP8266"]) + for text, mode in self.FlashModes: + self.modeComboBox.addItem(text, mode) + if addon: self.__validator = QRegularExpressionValidator( QRegularExpression(r"[0-9a-fA-F]{0,4}") @@ -93,8 +104,8 @@ Public method to get the entered data. @return tuple containing the selected chip type, the path of the - firmware file and the flash address - @rtype tuple of (str, str, str) + firmware file, the flash mode and the flash address + @rtype tuple of (str, str, str, str) """ if self.__addon: address = self.addressEdit.text() @@ -104,5 +115,6 @@ return ( self.espComboBox.currentText().lower(), self.firmwarePicker.text(), + self.modeComboBox.currentData(), address, )
--- a/eric6/MicroPython/EspFirmwareSelectionDialog.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/EspFirmwareSelectionDialog.ui Sun May 31 17:26:14 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>500</width> - <height>114</height> + <height>140</height> </rect> </property> <property name="windowTitle"> @@ -43,7 +43,7 @@ </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>318</width> <height>20</height> </size> </property> @@ -67,13 +67,37 @@ </widget> </item> <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Flash Mode:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="modeComboBox"> + <property name="toolTip"> + <string>Select the flash mode</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Leave empty to use the default mode.</string> + </property> + </widget> + </item> + <item row="3" column="0"> <widget class="QLabel" name="addressLabel"> <property name="text"> <string>Address:</string> </property> </widget> </item> - <item row="2" column="1" colspan="2"> + <item row="3" column="1" colspan="2"> <widget class="E5ClearableLineEdit" name="addressEdit"> <property name="toolTip"> <string>Enter the flash addres in the hexadecimal form</string> @@ -113,6 +137,7 @@ <tabstops> <tabstop>espComboBox</tabstop> <tabstop>firmwarePicker</tabstop> + <tabstop>modeComboBox</tabstop> <tabstop>addressEdit</tabstop> </tabstops> <resources/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/MicroPython/IgnoredDevicesDialog.py Sun May 31 17:26:14 2020 +0200 @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2020 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to manage the list of ignored serial devices. +""" + +from PyQt5.QtWidgets import QDialog + +from .Ui_IgnoredDevicesDialog import Ui_IgnoredDevicesDialog + + +class IgnoredDevicesDialog(QDialog, Ui_IgnoredDevicesDialog): + """ + Class implementing a dialog to manage the list of ignored serial devices. + """ + def __init__(self, deviceList, parent=None): + """ + Constructor + + @param deviceList list of ignored serial devices given by VID and PID + @type list of tuple of (int, int) + @param parent reference to the parent widget + @type QWidget + """ + super(IgnoredDevicesDialog, self).__init__(parent) + self.setupUi(self) + + self.devicesEditWidget.setList([ + "{0} ({1:04x}/{2:04x})".format(description, vid, pid) + for vid, pid, description in deviceList + ]) + + self.devicesEditWidget.setDefaultVisible(False) + self.devicesEditWidget.setAddVisible(False) + + def getDevices(self): + """ + Public method to get the list of ignored serial devices. + + @return list of tuples containing the VID, PID and a description + of each ignored device + @rtype list of tuple of (int, int, str) + """ + deviceList = [] + textList = self.devicesEditWidget.getList() + for entry in textList: + description, vid_pid = entry.rsplit(None, 1) + vid, pid = vid_pid[1:-1].split("/", 1) + deviceList.append((int(vid, 16), int(pid, 16), description)) + + return deviceList
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/MicroPython/IgnoredDevicesDialog.ui Sun May 31 17:26:14 2020 +0200 @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>IgnoredDevicesDialog</class> + <widget class="QDialog" name="IgnoredDevicesDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>350</height> + </rect> + </property> + <property name="windowTitle"> + <string>Ignored Serial Devices</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="E5StringListEditWidget" name="devicesEditWidget" native="true"/> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>E5StringListEditWidget</class> + <extends>QWidget</extends> + <header>E5Gui/E5StringListEditWidget.h</header> + <container>1</container> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>IgnoredDevicesDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>227</x> + <y>329</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>IgnoredDevicesDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>295</x> + <y>335</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/eric6/MicroPython/MicroPythonDevices.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/MicroPythonDevices.py Sun May 31 17:26:14 2020 +0200 @@ -43,7 +43,7 @@ (0x1209, 0x2017), # Mini SAM M4 (0x1209, 0x7102), # Mini SAM M0 ], - "description": "CircuitPython Boards", + "description": "CircuitPython Board", "icon": "circuitPythonDevice", }, @@ -93,16 +93,21 @@ """ Function to check the serial ports for supported MicroPython devices. - @return set of tuples with the board type, a description and the serial - port it is connected at - @rtype set of tuples of (str, str, str) + @return tuple containing a list of tuples with the board type, a + description and the serial port it is connected at for known device + types and a list of tuples with VID, PID and description for unknown + devices + @rtype tuple of (list of tuples of (str, str, str), list of tuples of + (int, int, str) """ from PyQt5.QtSerialPort import QSerialPortInfo foundDevices = [] + unknownDevices = [] availablePorts = QSerialPortInfo.availablePorts() for port in availablePorts: + supported = False vid = port.vendorIdentifier() pid = port.productIdentifier() for board in SupportedBoards: @@ -111,10 +116,14 @@ foundDevices.append( (board, SupportedBoards[board]["description"], port.portName())) - else: - logging.debug("Unknown device: (0x%04x:0x%04x)", vid, pid) + supported = True + if not supported: + if vid and pid: + unknownDevices.append((vid, pid, port.description())) + logging.debug("Unknown device: (0x%04x:0x%04x %s)", + vid, pid, port.description()) - return foundDevices + return foundDevices, unknownDevices def getDeviceIcon(boardName, iconFormat=True):
--- a/eric6/MicroPython/MicroPythonWidget.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/MicroPythonWidget.py Sun May 31 17:26:14 2020 +0200 @@ -16,7 +16,7 @@ from PyQt5.QtGui import QColor, QKeySequence, QTextCursor, QBrush from PyQt5.QtWidgets import ( QWidget, QMenu, QApplication, QHBoxLayout, QSpacerItem, QSizePolicy, - QTextEdit, QToolButton + QTextEdit, QToolButton, QDialog ) from E5Gui.E5ZoomWidget import E5ZoomWidget @@ -295,7 +295,7 @@ self.deviceInfoLabel.clear() self.deviceTypeComboBox.addItem("", "") - devices = MicroPythonDevices.getFoundDevices() + devices, unknownDevices = MicroPythonDevices.getFoundDevices() if devices: self.deviceInfoLabel.setText( self.tr("%n supported device(s) detected.", "", len(devices))) @@ -325,6 +325,39 @@ self.on_deviceTypeComboBox_activated(index) self.deviceTypeComboBox.setCurrentIndex(index) + + if unknownDevices: + ignoredUnknown = { + tuple(d) + for d in Preferences.getMicroPython("IgnoredUnknownDevices") + } + newUnknownDevices = set(unknownDevices) - ignoredUnknown + if newUnknownDevices: + button = E5MessageBox.information( + self, + self.tr("Unknown MicroPython Device"), + self.tr( + '<p>Detected these unknown serial devices</p>' + '<ul>' + '<li>{0}</li>' + '</ul>' + '<p>Please report them together with the board name' + ' and a short description to <a href="mailto:' + 'eric-bugs@eric-ide.python-projects.org"> the eric' + ' bug reporting address</a> if it is a MicroPython' + ' board.</p>' + ).format("</li><li>".join([ + self.tr("{0} ({1:04x}/{2:04x})").format(desc, vid, pid) + for vid, pid, desc in newUnknownDevices])), + E5MessageBox.StandardButtons( + E5MessageBox.Ignore | + E5MessageBox.Ok + ) + ) + if button == E5MessageBox.Ignore: + ignoredUnknown = list(ignoredUnknown | newUnknownDevices) + Preferences.setMicroPython("IgnoredUnknownDevices", + ignoredUnknown) def __handlePreferencesChanged(self): """ @@ -1175,6 +1208,9 @@ self.tr("Show Documentation"), self.__showDocumentation) act.setEnabled(self.__device.hasDocumentationUrl()) self.__superMenu.addSeparator() + self.__superMenu.addAction(self.tr("Ignored Serial Devices"), + self.__manageIgnored) + self.__superMenu.addSeparator() self.__superMenu.addAction(self.tr("Configure"), self.__configure) @pyqtSlot() @@ -1508,6 +1544,22 @@ e5App().getObject("UserInterface").launchHelpViewer(url) @pyqtSlot() + def __manageIgnored(self): + """ + Private slot to manage the list of ignored serial devices. + """ + # TODO: implement this + from .IgnoredDevicesDialog import IgnoredDevicesDialog + + dlg = IgnoredDevicesDialog( + Preferences.getMicroPython("IgnoredUnknownDevices"), + self) + if dlg.exec_() == QDialog.Accepted: + ignoredDevices = dlg.getDevices() + Preferences.setMicroPython("IgnoredUnknownDevices", + ignoredDevices) + + @pyqtSlot() def __configure(self): """ Private slot to open the MicroPython configuration page.
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun May 31 17:26:14 2020 +0200 @@ -48,7 +48,8 @@ availableFutures = [ 'division', 'absolute_import', 'with_statement', - 'print_function', 'unicode_literals', 'generator_stop'] + 'print_function', 'unicode_literals', 'generator_stop', + 'annotations'] noResults = 0 noFiles = 1 @@ -104,6 +105,9 @@ self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus")) self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.restartButton.setEnabled(False) + self.fixButton.setEnabled(False) + self.checkProgress.setVisible(False) self.checkProgressLabel.setVisible(False) self.checkProgressLabel.setMaximumWidth(600) @@ -130,6 +134,9 @@ self.__noFixCodesList = [] self.on_loadDefaultButton_clicked() + + self.mainWidget.setCurrentWidget(self.configureTab) + self.optionsTabWidget.setCurrentWidget(self.globalOptionsTab) def __resort(self): """ @@ -411,6 +418,8 @@ if self.__project is None: self.__project = e5App().getObject("Project") + self.mainWidget.setCurrentWidget(self.runTab) + self.cancelled = False self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) @@ -419,6 +428,7 @@ self.showButton.setEnabled(False) self.fixButton.setEnabled(False) self.startButton.setEnabled(False) + self.restartButton.setEnabled(False) if repeat is not None: self.repeatCheckBox.setChecked(repeat) self.checkProgress.setVisible(True) @@ -772,6 +782,7 @@ self.statisticsButton.setEnabled(True) self.showButton.setEnabled(True) self.startButton.setEnabled(True) + self.restartButton.setEnabled(True) if self.results != CodeStyleCheckerDialog.hasResults: if self.results == CodeStyleCheckerDialog.noResults: @@ -855,8 +866,16 @@ self.resultList.clear() self.results = CodeStyleCheckerDialog.noResults self.cancelled = False + self.start(self.__fileOrFileList) + @pyqtSlot() + def on_restartButton_clicked(self): + """ + Private slot to restart a code style check run. + """ + self.on_startButton_clicked() + def __selectCodes(self, edit, showFixCodes): """ Private method to select message codes via a selection dialog.
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui Sun May 31 17:26:14 2020 +0200 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>700</width> + <width>800</width> <height>700</height> </rect> </property> @@ -21,944 +21,991 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout_7"> + <layout class="QVBoxLayout" name="verticalLayout_9"> <item> - <widget class="QFrame" name="filterFrame"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>4</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> + <widget class="QTabWidget" name="mainWidget"> + <property name="currentIndex"> + <number>0</number> </property> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QTabWidget" name="optionsTabWidget"> - <property name="currentIndex"> - <number>0</number> - </property> - <widget class="QWidget" name="tab_1"> - <attribute name="title"> - <string>Global Options</string> - </attribute> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Exclude Files:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="E5ClearableLineEdit" name="excludeFilesEdit"> - <property name="toolTip"> - <string>Enter filename patterns of files to be excluded separated by a comma</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Exclude Messages:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="E5ClearableLineEdit" name="excludeMessagesEdit"> - <property name="toolTip"> - <string>Enter message codes or categories to be excluded separated by a comma</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QToolButton" name="excludeMessagesSelectButton"> - <property name="toolTip"> - <string>Press to select the message codes from a list</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Included Messages:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="E5ClearableLineEdit" name="includeMessagesEdit"> - <property name="toolTip"> - <string>Enter message codes or categories to be included separated by a comma</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QToolButton" name="includeMessagesSelectButton"> - <property name="toolTip"> - <string>Press to select the message codes from a list</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Fix Issues:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="E5ClearableLineEdit" name="fixIssuesEdit"> - <property name="toolTip"> - <string>Enter message codes of issues to be fixed automatically (leave empty to fix all)</string> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QToolButton" name="fixIssuesSelectButton"> - <property name="toolTip"> - <string>Press to select the message codes from a list</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Don't Fix Issues:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="E5ClearableLineEdit" name="noFixIssuesEdit"> - <property name="toolTip"> - <string>Enter message codes of issues not to be fixed automatically</string> - </property> - </widget> - </item> - <item row="4" column="2"> - <widget class="QToolButton" name="noFixIssuesSelectButton"> - <property name="toolTip"> - <string>Press to select the message codes from a list</string> - </property> - </widget> - </item> - <item row="5" column="0" colspan="3"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QCheckBox" name="repeatCheckBox"> - <property name="toolTip"> - <string>Select to repeat each message type</string> - </property> - <property name="text"> - <string>Repeat messages</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="fixIssuesCheckBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Select to fix some issues</string> - </property> - <property name="text"> - <string>Fix issues automatically</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="ignoredCheckBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Select to show ignored issues</string> - </property> - <property name="text"> - <string>Show ignored</string> + <widget class="QWidget" name="configureTab"> + <attribute name="title"> + <string>Configure</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QTabWidget" name="optionsTabWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="globalOptionsTab"> + <attribute name="title"> + <string>Global Options</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Exclude Files:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="excludeFilesEdit"> + <property name="toolTip"> + <string>Enter filename patterns of files to be excluded separated by a comma</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Exclude Messages:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ClearableLineEdit" name="excludeMessagesEdit"> + <property name="toolTip"> + <string>Enter message codes or categories to be excluded separated by a comma</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="excludeMessagesSelectButton"> + <property name="toolTip"> + <string>Press to select the message codes from a list</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Included Messages:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="includeMessagesEdit"> + <property name="toolTip"> + <string>Enter message codes or categories to be included separated by a comma</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="includeMessagesSelectButton"> + <property name="toolTip"> + <string>Press to select the message codes from a list</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Fix Issues:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="E5ClearableLineEdit" name="fixIssuesEdit"> + <property name="toolTip"> + <string>Enter message codes of issues to be fixed automatically (leave empty to fix all)</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QToolButton" name="fixIssuesSelectButton"> + <property name="toolTip"> + <string>Press to select the message codes from a list</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Don't Fix Issues:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="E5ClearableLineEdit" name="noFixIssuesEdit"> + <property name="toolTip"> + <string>Enter message codes of issues not to be fixed automatically</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QToolButton" name="noFixIssuesSelectButton"> + <property name="toolTip"> + <string>Press to select the message codes from a list</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="3"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="repeatCheckBox"> + <property name="toolTip"> + <string>Select to repeat each message type</string> + </property> + <property name="text"> + <string>Repeat messages</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="fixIssuesCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to fix some issues</string> + </property> + <property name="text"> + <string>Fix issues automatically</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ignoredCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to show ignored issues</string> + </property> + <property name="text"> + <string>Show ignored</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="6" column="0" colspan="2"> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>68</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="specificOptionsTab"> + <attribute name="title"> + <string>Specific Options</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <property name="leftMargin"> + <number>1</number> + </property> + <property name="topMargin"> + <number>1</number> + </property> + <property name="rightMargin"> + <number>1</number> + </property> + <property name="bottomMargin"> + <number>1</number> + </property> + <item> + <widget class="QScrollArea" name="scrollArea"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOn</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>389</width> + <height>1102</height> + </rect> </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item row="6" column="0" colspan="2"> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>68</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_2"> - <attribute name="title"> - <string>Specific Options</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <property name="leftMargin"> - <number>1</number> - </property> - <property name="topMargin"> - <number>1</number> - </property> - <property name="rightMargin"> - <number>1</number> - </property> - <property name="bottomMargin"> - <number>1</number> - </property> - <item> - <widget class="QScrollArea" name="scrollArea"> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOn</enum> - </property> - <property name="widgetResizable"> - <bool>true</bool> - </property> - <widget class="QWidget" name="scrollAreaWidgetContents"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>543</width> - <height>887</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Source Style</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QGridLayout" name="gridLayout_5"> - <item row="0" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Max. Line Length:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="lineLengthSpinBox"> - <property name="toolTip"> - <string>Enter the maximum allowed line length (PEP-8: 79 characters)</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="minimum"> - <number>60</number> - </property> - <property name="maximum"> - <number>119</number> - </property> - <property name="value"> - <number>79</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_17"> - <property name="text"> - <string>Max. Documentation Line Length:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="docLineLengthSpinBox"> - <property name="toolTip"> - <string>Enter the maximum allowed line length (PEP-8: 79 characters)</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="minimum"> - <number>60</number> - </property> - <property name="maximum"> - <number>119</number> - </property> - <property name="value"> - <number>79</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="groupBox_8"> - <property name="title"> - <string>Blank Lines Before</string> - </property> - <layout class="QGridLayout" name="gridLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Source Style</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QGridLayout" name="gridLayout_5"> <item row="0" column="0"> - <widget class="QLabel" name="label_15"> + <widget class="QLabel" name="label_5"> <property name="text"> - <string>Top Level Classes and Functions:</string> + <string>Max. Line Length:</string> </property> </widget> </item> <item row="0" column="1"> - <widget class="QSpinBox" name="blankBeforeTopLevelSpinBox"> + <widget class="QSpinBox" name="lineLengthSpinBox"> <property name="toolTip"> - <string>Enter the number of blank lines before top level classes and functions</string> + <string>Enter the maximum allowed line length (PEP-8: 79 characters)</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> <property name="minimum"> - <number>1</number> + <number>60</number> </property> <property name="maximum"> - <number>10</number> + <number>119</number> </property> <property name="value"> - <number>2</number> + <number>79</number> </property> </widget> </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_6"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>153</width> - <height>20</height> - </size> - </property> - </spacer> - </item> <item row="1" column="0"> - <widget class="QLabel" name="label_16"> + <widget class="QLabel" name="label_17"> <property name="text"> - <string>Methods and Nested Classes and Functions:</string> + <string>Max. Documentation Line Length:</string> </property> </widget> </item> <item row="1" column="1"> - <widget class="QSpinBox" name="blankBeforeMethodSpinBox"> + <widget class="QSpinBox" name="docLineLengthSpinBox"> <property name="toolTip"> - <string>Enter the number of blank lines before methods and nested classes or functions</string> + <string>Enter the maximum allowed line length (PEP-8: 79 characters)</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> <property name="minimum"> - <number>1</number> + <number>60</number> </property> <property name="maximum"> - <number>10</number> + <number>119</number> </property> <property name="value"> - <number>1</number> + <number>79</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="groupBox_8"> + <property name="title"> + <string>Blank Lines Before</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>Top Level Classes and Functions:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="blankBeforeTopLevelSpinBox"> + <property name="toolTip"> + <string>Enter the number of blank lines before top level classes and functions</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10</number> + </property> + <property name="value"> + <number>2</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>153</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>Methods and Nested Classes and Functions:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="blankBeforeMethodSpinBox"> + <property name="toolTip"> + <string>Enter the number of blank lines before methods and nested classes or functions</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10</number> + </property> + <property name="value"> + <number>1</number> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="hangClosingCheckBox"> + <property name="toolTip"> + <string>Select to allow hanging closing brackets</string> + </property> + <property name="text"> + <string>Allow hanging closing brackets</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Documentation Style</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Docstring Type:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="docTypeComboBox"> + <property name="toolTip"> + <string>Select the rule set for docstrings</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>297</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Coding Line</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Valid Encodings:</string> + </property> + </widget> + </item> + <item> + <widget class="E5ClearableLineEdit" name="encodingsEdit"> + <property name="toolTip"> + <string>Enter valid encodings separated by a comma (leave empty to use defaults)</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Copyright</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_10"> + <property name="text"> + <string>Min. File Size:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="copyrightFileSizeSpinBox"> + <property name="toolTip"> + <string>Enter the minimum size a file must have to be checked (0 for all files)</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>4096</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>324</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Author:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="copyrightAuthorEdit"> + <property name="toolTip"> + <string>Enter a copyright author name to check for (leave empty to omit this check)</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> + <string>Future Imports</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_7"> + <item> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Expected Imports:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="futuresList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_7"> + <property name="title"> + <string>Ignore Built-ins Assignment</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_8"> + <item> + <widget class="QTreeWidget" name="builtinsAssignmentList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Left</string> + </property> + </column> + <column> + <property name="text"> + <string>Right</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item alignment="Qt::AlignHCenter"> + <widget class="QToolButton" name="addBuiltinButton"> + <property name="toolTip"> + <string>Press to add a built-in assignment to be ignored</string> + </property> + <property name="text"> + <string notr="true">+</string> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter"> + <widget class="QToolButton" name="deleteBuiltinButton"> + <property name="toolTip"> + <string>Press to delete the selected entries</string> + </property> + <property name="text"> + <string notr="true">-</string> </property> </widget> </item> + <item> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="hangClosingCheckBox"> - <property name="toolTip"> - <string>Select to allow hanging closing brackets</string> - </property> - <property name="text"> - <string>Allow hanging closing brackets</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>Documentation Style</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Docstring Type:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="docTypeComboBox"> - <property name="toolTip"> - <string>Select the rule set for docstrings</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>297</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_4"> - <property name="title"> - <string>Coding Line</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <item> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Valid Encodings:</string> - </property> - </widget> - </item> - <item> - <widget class="E5ClearableLineEdit" name="encodingsEdit"> - <property name="toolTip"> - <string>Enter valid encodings separated by a comma (leave empty to use defaults)</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_5"> - <property name="title"> - <string>Copyright</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label_10"> - <property name="text"> - <string>Min. File Size:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="copyrightFileSizeSpinBox"> - <property name="toolTip"> - <string>Enter the minimum size a file must have to be checked (0 for all files)</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="maximum"> - <number>4096</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>324</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Author:</string> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="E5ClearableLineEdit" name="copyrightAuthorEdit"> - <property name="toolTip"> - <string>Enter a copyright author name to check for (leave empty to omit this check)</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_6"> - <property name="title"> - <string>Future Imports</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>Expected Imports:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - </widget> - </item> - <item> - <widget class="QListWidget" name="futuresList"> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_7"> - <property name="title"> - <string>Ignore Built-ins Assignment</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <item> - <widget class="QTreeWidget" name="builtinsAssignmentList"> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <column> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_9"> + <property name="title"> + <string>Commented Code</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QCheckBox" name="aggressiveCheckBox"> + <property name="toolTip"> + <string>Select to search for commented code more aggressively. This may increase the number of false positives.</string> + </property> + <property name="text"> + <string>Search aggressively</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Code Complexity</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="2" rowspan="2"> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>313</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_8"> <property name="text"> - <string>Left</string> + <string>Max. McCabe Complexity:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="complexitySpinBox"> + <property name="toolTip"> + <string>Enter the maximum allowed code complexity (McCabe: 10)</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>10</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Max. Line Complexity:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="lineComplexitySpinBox"> + <property name="toolTip"> + <string>Enter the maximum complexity (number of nodes) for a line of code</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>100</number> </property> - </column> - <column> + <property name="value"> + <number>15</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_14"> <property name="text"> - <string>Right</string> + <string>Max. Line Complexity Score:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="lineComplexityScoreSpinBox"> + <property name="toolTip"> + <string>Enter the maximum allowed median for line complexity</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>10</number> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_10"> + <property name="title"> + <string>Type Annotations</string> + </property> + <layout class="QGridLayout" name="gridLayout_6"> + <item row="0" column="0"> + <widget class="QLabel" name="label_18"> + <property name="text"> + <string>Min. Coverage:</string> </property> - </column> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item alignment="Qt::AlignHCenter"> - <widget class="QToolButton" name="addBuiltinButton"> - <property name="toolTip"> - <string>Press to add a built-in assignment to be ignored</string> - </property> - <property name="text"> - <string notr="true">+</string> - </property> - </widget> - </item> - <item alignment="Qt::AlignHCenter"> - <widget class="QToolButton" name="deleteBuiltinButton"> - <property name="toolTip"> - <string>Press to delete the selected entries</string> - </property> - <property name="text"> - <string notr="true">-</string> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_9"> - <property name="title"> - <string>Commented Code</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <widget class="QCheckBox" name="aggressiveCheckBox"> - <property name="toolTip"> - <string>Select to search for commented code more aggressively. This may increase the number of false positives.</string> - </property> - <property name="text"> - <string>Search aggressively</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Code Complexity</string> - </property> - <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="2" rowspan="2"> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>313</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Max. McCabe Complexity:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="complexitySpinBox"> - <property name="toolTip"> - <string>Enter the maximum allowed code complexity (McCabe: 10)</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>10</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Max. Line Complexity:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="lineComplexitySpinBox"> - <property name="toolTip"> - <string>Enter the maximum complexity (number of nodes) for a line of code</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>15</number> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>Max. Line Complexity Score:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="lineComplexityScoreSpinBox"> - <property name="toolTip"> - <string>Enter the maximum allowed median for line complexity</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>10</number> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_10"> - <property name="title"> - <string>Type Annotations</string> - </property> - <layout class="QGridLayout" name="gridLayout_6"> - <item row="0" column="0"> - <widget class="QLabel" name="label_18"> - <property name="text"> - <string>Min. Coverage:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="minAnnotationsCoverageSpinBox"> - <property name="toolTip"> - <string>Enter the minimum percentage of type annotations</string> - </property> - <property name="specialValueText"> - <string>off</string> - </property> - <property name="suffix"> - <string>%</string> - </property> - <property name="maximum"> - <number>100</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_7"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>352</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_19"> - <property name="text"> - <string>Max. Complexity:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="maxAnnotationsComplexitySpinBox"> - <property name="toolTip"> - <string>Enter the maximum type annotation complexity</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>9</number> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="minAnnotationsCoverageSpinBox"> + <property name="toolTip"> + <string>Enter the minimum percentage of type annotations</string> + </property> + <property name="specialValueText"> + <string>off</string> + </property> + <property name="suffix"> + <string>%</string> + </property> + <property name="maximum"> + <number>100</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>352</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_19"> + <property name="text"> + <string>Max. Complexity:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="maxAnnotationsComplexitySpinBox"> + <property name="toolTip"> + <string>Enter the maximum type annotation complexity</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>9</number> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> </widget> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - <item> - <widget class="Line" name="line"> - <property name="lineWidth"> - <number>2</number> - </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QPushButton" name="startButton"> - <property name="toolTip"> - <string>Press to start the code style check run</string> - </property> - <property name="text"> - <string>&Start</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="fixButton"> - <property name="toolTip"> - <string>Press to fix the selected issues</string> - </property> - <property name="text"> - <string>&Fix Selected</string> - </property> + </item> + </layout> </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>18</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="loadDefaultButton"> - <property name="toolTip"> - <string>Press to load the default values</string> - </property> - <property name="text"> - <string>&Load Defaults</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="storeDefaultButton"> - <property name="toolTip"> - <string>Press to store the current values as defaults</string> - </property> - <property name="text"> - <string>St&ore Defaults</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="resetDefaultButton"> - <property name="toolTip"> - <string>Press to reset the default values</string> - </property> - <property name="text"> - <string>&Reset Defaults</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QTreeWidget" name="resultList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>6</verstretch> - </sizepolicy> - </property> - <property name="whatsThis"> - <string><b>Result List</b> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QPushButton" name="startButton"> + <property name="toolTip"> + <string>Press to start the code style check run</string> + </property> + <property name="text"> + <string>&Start</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="loadDefaultButton"> + <property name="toolTip"> + <string>Press to load the default values</string> + </property> + <property name="text"> + <string>&Load Defaults</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="storeDefaultButton"> + <property name="toolTip"> + <string>Press to store the current values as defaults</string> + </property> + <property name="text"> + <string>St&ore Defaults</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="resetDefaultButton"> + <property name="toolTip"> + <string>Press to reset the default values</string> + </property> + <property name="text"> + <string>&Reset Defaults</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="runTab"> + <attribute name="title"> + <string>Run</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <item> + <widget class="QTreeWidget" name="resultList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>6</verstretch> + </sizepolicy> + </property> + <property name="whatsThis"> + <string><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at the respective line and position.</p></string> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>File/Line</string> - </property> - </column> - <column> - <property name="text"> - <string>Code</string> - </property> - </column> - <column> - <property name="text"> - <string>Message</string> - </property> - </column> - </widget> - </item> - <item> - <widget class="E5SqueezeLabelPath" name="checkProgressLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QProgressBar" name="checkProgress"> - <property name="toolTip"> - <string>Shows the progress of the code style check</string> - </property> - <property name="value"> - <number>0</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="format"> - <string>%v/%m Files</string> - </property> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>File/Line</string> + </property> + </column> + <column> + <property name="text"> + <string>Code</string> + </property> + </column> + <column> + <property name="text"> + <string>Message</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="E5SqueezeLabelPath" name="checkProgressLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="checkProgress"> + <property name="toolTip"> + <string>Shows the progress of the code style check</string> + </property> + <property name="value"> + <number>0</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="format"> + <string>%v/%m Files</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="Line" name="line_2"> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_8"> + <item> + <widget class="QPushButton" name="restartButton"> + <property name="toolTip"> + <string>Press to restart the code style check run</string> + </property> + <property name="text"> + <string>Restart</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="fixButton"> + <property name="toolTip"> + <string>Press to fix the selected issues</string> + </property> + <property name="text"> + <string>&Fix Selected</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> </widget> </item> <item> @@ -987,6 +1034,7 @@ </customwidget> </customwidgets> <tabstops> + <tabstop>mainWidget</tabstop> <tabstop>optionsTabWidget</tabstop> <tabstop>excludeFilesEdit</tabstop> <tabstop>excludeMessagesEdit</tabstop> @@ -1020,12 +1068,13 @@ <tabstop>lineComplexityScoreSpinBox</tabstop> <tabstop>minAnnotationsCoverageSpinBox</tabstop> <tabstop>maxAnnotationsComplexitySpinBox</tabstop> - <tabstop>startButton</tabstop> - <tabstop>fixButton</tabstop> <tabstop>loadDefaultButton</tabstop> <tabstop>storeDefaultButton</tabstop> <tabstop>resetDefaultButton</tabstop> + <tabstop>startButton</tabstop> <tabstop>resultList</tabstop> + <tabstop>restartButton</tabstop> + <tabstop>fixButton</tabstop> </tabstops> <resources/> <connections>
--- a/eric6/Preferences/ConfigurationPages/QtPage.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/QtPage.ui Sun May 31 17:26:14 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>642</width> - <height>772</height> + <height>929</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_6"> @@ -69,12 +69,7 @@ <item> <widget class="QLabel" name="textLabel1_2_4"> <property name="text"> - <string><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></string> + <string><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</string> </property> <property name="wordWrap"> <bool>true</bool>
--- a/eric6/Preferences/ConfigurationPages/SecurityPage.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/SecurityPage.py Sun May 31 17:26:14 2020 +0200 @@ -45,6 +45,9 @@ self.__newPassword = "" self.__oldUseMasterPassword = Preferences.getUser("UseMasterPassword") + + self.alwaysRejectCheckBox.setChecked( + Preferences.getWebBrowser("AlwaysRejectFaultyCertificates")) def setMode(self, displayMode): """ @@ -63,6 +66,10 @@ ) self.__displayMode = displayMode + + self.certificateErrorsGroup.setVisible( + displayMode == ConfigurationWidget.WebBrowserMode + ) def save(self): """ @@ -80,6 +87,10 @@ self.masterPasswordCheckBox.isChecked() ): self.__configDlg.masterPasswordChanged.emit("", self.__newPassword) + + Preferences.setWebBrowser( + "AlwaysRejectFaultyCertificates", + self.alwaysRejectCheckBox.isChecked()) @pyqtSlot(bool) def on_masterPasswordCheckBox_clicked(self, checked):
--- a/eric6/Preferences/ConfigurationPages/SecurityPage.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/SecurityPage.ui Sun May 31 17:26:14 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>300</height> + <height>434</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -91,6 +91,25 @@ </widget> </item> <item> + <widget class="QGroupBox" name="certificateErrorsGroup"> + <property name="title"> + <string>Certificate Errors</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="alwaysRejectCheckBox"> + <property name="toolTip"> + <string>Select to always reject web pages with certificate issues</string> + </property> + <property name="text"> + <string>Always reject URLs with certificate errors</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum>
--- a/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py Sun May 31 17:26:14 2020 +0200 @@ -80,7 +80,17 @@ self.pictographFontLabel.setEnabled(False) self.pictographFontCombo.setEnabled(False) - self.initColour("SaveUrlColor", self.secureURLsColourButton, + self.initColour("SecureUrlColor", + self.secureURLsColourButton, + Preferences.getWebBrowser) + self.initColour("InsecureUrlColor", + self.insecureURLsColourButton, + Preferences.getWebBrowser) + self.initColour("MaliciousUrlColor", + self.maliciousURLsColourButton, + Preferences.getWebBrowser) + self.initColour("PrivateModeUrlColor", + self.privateModeURLsColourButton, Preferences.getWebBrowser) self.autoLoadImagesCheckBox.setChecked(
--- a/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui Sun May 31 17:26:14 2020 +0200 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>499</width> - <height>905</height> + <height>1256</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> + <layout class="QVBoxLayout" name="verticalLayout_6"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -278,43 +278,121 @@ <property name="title"> <string>Colors</string> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="textLabel1_3"> - <property name="text"> - <string>Background color of secure URLs:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="secureURLsColourButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QGroupBox" name="groupBox_8"> + <property name="title"> + <string>URL Entry Background</string> </property> - <property name="toolTip"> - <string>Select the background color for secure URLs.</string> - </property> - <property name="text"> - <string/> - </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1_3"> + <property name="text"> + <string>Secure URLs:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="secureURLsColourButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for secure URLs.</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>223</width> + <height>17</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="textLabel1_4"> + <property name="text"> + <string>Insecure URLs:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="insecureURLsColourButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for insecure URLs.</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="textLabel1_5"> + <property name="text"> + <string>Malicious URLs:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="maliciousURLsColourButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for malicious URLs.</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Private Mode:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QPushButton" name="privateModeURLsColourButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for URLs in private mode.</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>141</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> </item> @@ -482,6 +560,9 @@ <tabstop>minSizeSpinBox</tabstop> <tabstop>minLogicalSizeSpinBox</tabstop> <tabstop>secureURLsColourButton</tabstop> + <tabstop>insecureURLsColourButton</tabstop> + <tabstop>maliciousURLsColourButton</tabstop> + <tabstop>privateModeURLsColourButton</tabstop> <tabstop>autoLoadImagesCheckBox</tabstop> <tabstop>styleSheetPicker</tabstop> <tabstop>warnOnMultipleCloseCheckBox</tabstop>
--- a/eric6/Preferences/__init__.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Preferences/__init__.py Sun May 31 17:26:14 2020 +0200 @@ -952,6 +952,7 @@ "DiskCacheEnabled": True, "DiskCacheSize": 50, # 50 MB "SslExceptionsDB": "{}", # empty JSON dictionary + "AlwaysRejectFaultyCertificates": False, "DoNotTrack": False, "RefererSendReferer": 2, # send always "RefererDefaultPolicy": 3, # don't send a referer when downgrading @@ -960,7 +961,10 @@ "AcceptCookies": 2, # CookieJar.AcceptOnlyFromSitesNavigatedTo "KeepCookiesUntil": 0, # CookieJar.KeepUntilExpire "FilterTrackingCookies": True, - "SaveUrlColor": QColor(184, 248, 169), + "SecureUrlColor": QColor(184, 248, 169), + "InsecureUrlColor": QColor(248, 227, 169), + "MaliciousUrlColor": QColor(255, 132, 140), + "PrivateModeUrlColor": QColor(220, 220, 220), "UserAgent": "", "AcceptQuotaRequest": 2, # yes/no/ask (0, 1, 2) "AcceptProtocolHandlerRequest": 2, # yes/no/ask (0, 1, 2) @@ -1474,6 +1478,7 @@ # QChart.ChartTheme otherwise "MpyCrossCompiler": "", # path of the mpy-cross compiler "DfuUtilPath": "", # path of the dfu-util flashing tool + "IgnoredUnknownDevices": "[]", # empty list encoded as JSON # documentation URLs "MicroPythonDocuUrl": "https://docs.micropython.org/en/latest/", @@ -1482,13 +1487,13 @@ "MicrobitDocuUrl": "https://microbit-micropython.readthedocs.io/en/latest/", "CalliopeDocuUrl": - "https://github.com/calliope-mini/calliope-mini-micropython/", + "https://github.com/calliope-mini/calliope-mini-micropython/", # MicroPython firmware URLs "MicroPythonFirmwareUrl": "http://micropython.org/download/", "CircuitPythonFirmwareUrl": "https://circuitpython.org/downloads/", "MicrobitFirmwareUrl": "https://microbit.org/guide/firmware/", "CalliopeFirmwareUrl": - "https://github.com/calliope-mini/calliope-mini-micropython/", + "https://github.com/calliope-mini/calliope-mini-micropython/", } if Globals.isWindowsPlatform(): microPythonDefaults["ColorScheme"] = "Windows 10" @@ -2720,7 +2725,8 @@ f.fromString(prefClass.settings.value( "WebBrowser/" + key, prefClass.webBrowserDefaults[key])) return f - elif key in ["SaveUrlColor"]: + elif key in ["SecureUrlColor", "InsecureUrlColor", "MaliciousUrlColor", + "PrivateModeUrlColor"]: col = prefClass.settings.value("WebBrowser/" + key) if col is not None: return QColor(col) @@ -2832,7 +2838,7 @@ "WebRTCPublicInterfacesOnly", "DnsPrefetchEnabled", "FlashCookiesDeleteOnStartExit", "FlashCookieAutoRefresh", "FlashCookieNotify", "VirusTotalEnabled", "VirusTotalSecure", - "PdfViewerEnabled", + "PdfViewerEnabled", "AlwaysRejectFaultyCertificates", ]: return toBool(prefClass.settings.value( "WebBrowser/" + key, prefClass.webBrowserDefaults[key])) @@ -2867,7 +2873,8 @@ """ if key in ["StandardFont", "FixedFont"]: prefClass.settings.setValue("WebBrowser/" + key, value.toString()) - elif key == "SaveUrlColor": + elif key in ["SecureUrlColor", "InsecureUrlColor", "MaliciousUrlColor", + "PrivateModeUrlColor"]: prefClass.settings.setValue("WebBrowser/" + key, value.name()) elif key == "WebSearchKeywords": # value is list of tuples of (keyword, engine name) @@ -2962,10 +2969,6 @@ "Qt/Qt5TranslationsDir", prefClass.qtDefaults["Qt5TranslationsDir"]) if s == "": - s = os.getenv("QTTRANSLATIONSDIR", "") - if s == "": - s = os.getenv("QT5TRANSLATIONSDIR", "") - if s == "": s = QLibraryInfo.location(QLibraryInfo.TranslationsPath) if s == "" and Globals.isWindowsPlatform(): transPath = os.path.join(Globals.getPyQt5ModulesDirectory(), @@ -3570,6 +3573,14 @@ return toBool(prefClass.settings.value( "MicroPython/" + key, prefClass.microPythonDefaults[key])) + elif key in ["IgnoredUnknownDevices"]: + jsonStr = prefClass.settings.value( + "MicroPython/" + key, + prefClass.microPythonDefaults[key]) + if jsonStr: + return json.loads(jsonStr) + else: + return None else: return prefClass.settings.value( "MicroPython/" + key, @@ -3584,7 +3595,14 @@ @param value the value to be set @param prefClass preferences class used as the storage area """ - prefClass.settings.setValue("MicroPython/" + key, value) + if key in ["IgnoredUnknownDevices"]: + prefClass.settings.setValue( + "MicroPython/" + key, + json.dumps(value)) + else: + prefClass.settings.setValue( + "MicroPython/" + key, + value) def getGeometry(key, prefClass=Prefs):
--- a/eric6/QScintilla/Editor.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/QScintilla/Editor.py Sun May 31 17:26:14 2020 +0200 @@ -5144,7 +5144,8 @@ elif wLeft: txt = txt[len(wLeft):] - if txt[0] in "'\"": # New in jedi 0.16: AC of dict keys + if txt and txt[0] in "'\"": + # New in jedi 0.16: AC of dict keys txt = txt[1:] self.insert(txt) self.endUndoAction()
--- a/eric6/UI/BrowserModel.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/UI/BrowserModel.py Sun May 31 17:26:14 2020 +0200 @@ -913,7 +913,10 @@ @return row number (integer) """ - return self.parentItem.childItems.index(self) + try: + return self.parentItem.childItems.index(self) + except ValueError: + return 0 def type(self): """
--- a/eric6/UI/UserInterface.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/UI/UserInterface.py Sun May 31 17:26:14 2020 +0200 @@ -358,7 +358,7 @@ self.viewmanager.closeWindow) self.projectBrowser.prBrowser.appendStderr.connect(self.appendToStderr) - self.projectBrowser.ptBrowser.linguistFile.connect(self.__linguist4) + self.projectBrowser.ptBrowser.linguistFile.connect(self.__linguist) self.projectBrowser.ptBrowser.sourceFile.connect( self.viewmanager.openSourceFile) self.projectBrowser.ptBrowser.trpreview[list].connect( @@ -399,7 +399,7 @@ self.project.sourceFile.connect(self.viewmanager.openSourceFile) self.project.designerFile.connect(self.__designer) - self.project.linguistFile.connect(self.__linguist4) + self.project.linguistFile.connect(self.__linguist) self.project.projectOpened.connect(self.viewmanager.projectOpened) self.project.projectClosed.connect(self.viewmanager.projectClosed) self.project.projectFileRenamed.connect( @@ -497,7 +497,7 @@ self.browser.sourceFile[str, int, str].connect( self.viewmanager.openSourceFile) self.browser.designerFile.connect(self.__designer) - self.browser.linguistFile.connect(self.__linguist4) + self.browser.linguistFile.connect(self.__linguist) self.browser.projectFile.connect(self.project.openProject) self.browser.multiProjectFile.connect( self.multiProject.openMultiProject) @@ -2220,7 +2220,7 @@ """<b>Qt-Designer</b>""" """<p>Start Qt-Designer.</p>""" )) - self.designer4Act.triggered.connect(self.__designer4) + self.designer4Act.triggered.connect(self.__designer) self.actions.append(self.designer4Act) else: self.designer4Act = None @@ -2246,7 +2246,7 @@ """<b>Qt-Linguist</b>""" """<p>Start Qt-Linguist.</p>""" )) - self.linguist4Act.triggered.connect(self.__linguist4) + self.linguist4Act.triggered.connect(self.__linguist) self.actions.append(self.linguist4Act) else: self.linguist4Act = None @@ -4884,43 +4884,16 @@ """ self.__unittest() self.unittestDialog.startTests(failedOnly=True) - - def __designer(self, fn=None, version=0): + + @pyqtSlot() + @pyqtSlot(str) + def __designer(self, fn=None): """ Private slot to start the Qt-Designer executable. @param fn filename of the form to be opened @type str - @param version indication for the requested version (4 = Qt 4/5) - @type int - """ - if fn is not None and version == 0: - # determine version from file, if not specified - try: - f = open(fn, "r", encoding="utf-8") - found = False - while not found: - uiLine = f.readline() - found = uiLine.lower().startswith("<ui ") - f.close() - if uiLine.lower().find("version") == -1: - # it is an old version 3 UI file - version = 3 - else: - if uiLine.split('"')[1].startswith("4."): - version = 4 - else: - version = 3 - except IOError: - pass - - if version == 3: - E5MessageBox.information( - self, - self.tr("Qt 3 support"), - self.tr("""Qt v.3 is not supported by eric6.""")) - return - + """ args = [] if fn is not None: try: @@ -4947,47 +4920,45 @@ if Utilities.isMacPlatform(): designer, args = Utilities.prepareQtMacBundle( - "designer", version, args) + "designer", args) else: - if version == 4: - designer = os.path.join( - Utilities.getQtBinariesPath(), - Utilities.generateQtToolName("designer")) + designer = os.path.join( + Utilities.getQtBinariesPath(), + Utilities.generateQtToolName("designer")) if Utilities.isWindowsPlatform(): designer += '.exe' - proc = QProcess() - if not proc.startDetached(designer, args): + if designer: + proc = QProcess() + if not proc.startDetached(designer, args): + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + '<p>Could not start Qt-Designer.<br>' + 'Ensure that it is available as <b>{0}</b>.</p>' + ).format(designer) + ) + else: E5MessageBox.critical( self, self.tr('Process Generation Error'), self.tr( - '<p>Could not start Qt-Designer.<br>' - 'Ensure that it is available as <b>{0}</b>.</p>' - ).format(designer)) - - def __designer4(self): - """ - Private slot to start the Qt-Designer 4/5 executable. - """ - self.__designer(version=4) - - def __linguist(self, fn=None, version=0): + '<p>Could not find the Qt-Designer executable.<br>' + 'Ensure that it is installed and optionally configured on' + ' the Qt configuration page.</p>' + ) + ) + + @pyqtSlot() + @pyqtSlot(str) + def __linguist(self, fn=None): """ Private slot to start the Qt-Linguist executable. @param fn filename of the translation file to be opened @type str - @param version indication for the requested version (4 = Qt 4/5) - @type int - """ - if version < 4: - E5MessageBox.information( - self, - self.tr("Qt 3 support"), - self.tr("""Qt v.3 is not supported by eric6.""")) - return - + """ args = [] if fn is not None: fn = fn.replace('.qm', '.ts') @@ -5019,83 +4990,79 @@ if Utilities.isMacPlatform(): linguist, args = Utilities.prepareQtMacBundle( - "linguist", version, args) + "linguist", args) else: - if version == 4: - linguist = os.path.join( - Utilities.getQtBinariesPath(), - Utilities.generateQtToolName("linguist")) + linguist = os.path.join( + Utilities.getQtBinariesPath(), + Utilities.generateQtToolName("linguist")) if Utilities.isWindowsPlatform(): linguist += '.exe' - proc = QProcess() - if not proc.startDetached(linguist, args): + if linguist: + proc = QProcess() + if not proc.startDetached(linguist, args): + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + '<p>Could not start Qt-Linguist.<br>' + 'Ensure that it is available as <b>{0}</b>.</p>' + ).format(linguist) + ) + else: E5MessageBox.critical( self, self.tr('Process Generation Error'), self.tr( - '<p>Could not start Qt-Linguist.<br>' - 'Ensure that it is available as <b>{0}</b>.</p>' - ).format(linguist)) + '<p>Could not find the Qt-Linguist executable.<br>' + 'Ensure that it is installed and optionally configured on' + ' the Qt configuration page.</p>' + ) + ) - @pyqtSlot() - @pyqtSlot(str) - def __linguist4(self, fn=None): - """ - Private slot to start the Qt-Linguist 4/5 executable. - - @param fn filename of the translation file to be opened - """ - self.__linguist(fn, version=4) - - def __assistant(self, home=None, version=0): + def __assistant(self, home=None): """ Private slot to start the Qt-Assistant executable. @param home full pathname of a file to display @type str - @param version indication for the requested version (4 = Qt 4/5) - @type int - """ - if version < 4: - E5MessageBox.information( - self, - self.tr("Qt 3 support"), - self.tr("""Qt v.3 is not supported by eric6.""")) - return - + """ args = [] if home: - if version == 4: - args.append('-showUrl') + args.append('-showUrl') args.append(home) if Utilities.isMacPlatform(): assistant, args = Utilities.prepareQtMacBundle( - "assistant", version, args) + "assistant", args) else: - if version == 4: - assistant = os.path.join( - Utilities.getQtBinariesPath(), - Utilities.generateQtToolName("assistant")) + assistant = os.path.join( + Utilities.getQtBinariesPath(), + Utilities.generateQtToolName("assistant")) if Utilities.isWindowsPlatform(): assistant += '.exe' - proc = QProcess() - if not proc.startDetached(assistant, args): + if assistant: + proc = QProcess() + if not proc.startDetached(assistant, args): + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + '<p>Could not start Qt-Assistant.<br>' + 'Ensure that it is available as <b>{0}</b>.</p>' + ).format(assistant) + ) + else: E5MessageBox.critical( self, self.tr('Process Generation Error'), self.tr( - '<p>Could not start Qt-Assistant.<br>' - 'Ensure that it is available as <b>{0}</b>.</p>' - ).format(assistant)) - - def __assistant4(self): - """ - Private slot to start the Qt-Assistant 4/5 executable. - """ - self.__assistant(version=4) + '<p>Could not find the Qt-Assistant executable.<br>' + 'Ensure that it is installed and optionally configured on' + ' the Qt configuration page.</p>' + ) + ) def __startWebBrowser(self): """ @@ -5577,7 +5544,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3: @@ -5640,7 +5607,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3: @@ -5706,7 +5673,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3: @@ -5768,7 +5735,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3: @@ -5832,7 +5799,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3: @@ -5869,7 +5836,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3: @@ -5935,7 +5902,7 @@ self.launchHelpViewer(home) elif hvType == 2: if home.startswith("qthelp://"): - self.__assistant(home, version=4) + self.__assistant(home) else: self.__webBrowser(home) elif hvType == 3:
--- a/eric6/Utilities/ModuleParser.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Utilities/ModuleParser.py Sun May 31 17:26:14 2020 +0200 @@ -19,7 +19,7 @@ import sys import os -import importlib +import importlib.machinery import re import Utilities
--- a/eric6/Utilities/__init__.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/Utilities/__init__.py Sun May 31 17:26:14 2020 +0200 @@ -29,8 +29,8 @@ @param lineno line number causing the warning (integer) @param file file to write the warning message to (ignored) @param line line causing the warning (ignored) - @raise SyntaxError - """ # __IGNORE_WARNING_D252__ __IGNORE_WARNING_D253__ + @raise err exception of type SyntaxError + """ if category is SyntaxWarning: err = SyntaxError(str(message)) err.filename = filename @@ -1745,24 +1745,31 @@ qtDir, generateQtToolName(toolname.capitalize())) + ".app", os.path.join(qtDir, generateQtToolName(toolname)) + ".app", ] + if toolname == "designer": + # support the standalone Qt Designer installer from + # https://build-system.fman.io/qt-designer-download + designer = "Qt Designer.app" + bundles.extend([ + os.path.join(qtDir, 'bin', designer), + os.path.join(qtDir, designer), + ]) for bundle in bundles: if os.path.exists(bundle): return bundle return "" -def prepareQtMacBundle(toolname, version, args): +def prepareQtMacBundle(toolname, args): """ Module function for starting Qt tools that are Mac OS X bundles. - @param toolname plain name of the tool (e.g. "designer") (string) - @param version indication for the requested version (Qt 4) (integer) - @param args name of input file for tool, if any (list of strings) - @return command-name and args for QProcess (tuple) + @param toolname plain name of the tool (e.g. "designer") + @type str + @param args name of input file for tool, if any + @type list of str + @return command-name and args for QProcess + @rtype tuple of (str, list of str) """ - if version != 4: - return ("", []) - fullBundle = getQtMacBundle(toolname) if fullBundle == "": return ("", [])
--- a/eric6/WebBrowser/Bookmarks/AddBookmarkDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/AddBookmarkDialog.py Sun May 31 17:26:14 2020 +0200 @@ -196,9 +196,11 @@ if folder: self.setWindowTitle(self.tr("Add Folder")) self.addressEdit.setVisible(False) + self.addressLabel.setVisible(False) else: self.setWindowTitle(self.tr("Add Bookmark")) self.addressEdit.setVisible(True) + self.addressLabel.setVisible(True) self.resize(self.sizeHint())
--- a/eric6/WebBrowser/Bookmarks/AddBookmarkDialog.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/AddBookmarkDialog.ui Sun May 31 17:26:14 2020 +0200 @@ -44,7 +44,7 @@ </widget> </item> <item row="1" column="0"> - <widget class="QLabel" name="label_3"> + <widget class="QLabel" name="addressLabel"> <property name="text"> <string>Address:</string> </property>
--- a/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Sun May 31 17:26:14 2020 +0200 @@ -10,7 +10,9 @@ from PyQt5.QtCore import pyqtSignal, Qt, QUrl, QModelIndex from PyQt5.QtGui import QFontMetrics, QCursor -from PyQt5.QtWidgets import QDialog, QMenu, QApplication +from PyQt5.QtWidgets import ( + QDialog, QMenu, QApplication, QInputDialog, QLineEdit +) from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel @@ -175,6 +177,9 @@ menu.addSeparator() act = menu.addAction(self.tr("&Properties..."), self.__edit) act.setEnabled(idx.flags() & Qt.ItemIsEditable) + if idx.isValid() and node.type() == BookmarkNode.Folder: + menu.addSeparator() + menu.addAction(self.tr("New &Folder..."), self.__newFolder) menu.exec_(QCursor.pos()) def __activated(self, idx): @@ -327,6 +332,15 @@ idx = self.__proxyModel.mapToSource(idx) parent = self.__bookmarksModel.node(idx) - node = BookmarkNode(BookmarkNode.Folder) - node.title = self.tr("New Folder") - self.__bookmarksManager.addBookmark(parent, node, row) + title, ok = QInputDialog.getText( + self, + self.tr("New Bookmark Folder"), + self.tr("Enter title for new bookmark folder:"), + QLineEdit.Normal) + + if ok: + if not title: + title = self.tr("New Folder") + node = BookmarkNode(BookmarkNode.Folder) + node.title = title + self.__bookmarksManager.addBookmark(parent, node, row)
--- a/eric6/WebBrowser/Bookmarks/BookmarksMenu.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/BookmarksMenu.py Sun May 31 17:26:14 2020 +0200 @@ -349,17 +349,17 @@ return self.addSeparator() - act = self.addAction(self.tr("Default Home Page")) - act.setData("eric:home") - act.triggered.connect( - lambda: self.__defaultBookmarkTriggered(act)) - act = self.addAction(self.tr("Speed Dial")) - act.setData("eric:speeddial") - act.triggered.connect( - lambda: self.__defaultBookmarkTriggered(act)) + act_1 = self.addAction(self.tr("Default Home Page")) + act_1.setData("eric:home") + act_1.triggered.connect( + lambda: self.__defaultBookmarkTriggered(act_1)) + act_2 = self.addAction(self.tr("Speed Dial")) + act_2.setData("eric:speeddial") + act_2.triggered.connect( + lambda: self.__defaultBookmarkTriggered(act_2)) self.addSeparator() - act = self.addAction(self.tr("Open all in Tabs")) - act.triggered.connect(lambda: self.openAll(act)) + act_3 = self.addAction(self.tr("Open all in Tabs")) + act_3.triggered.connect(lambda: self.openAll(act_3)) def setInitialActions(self, actions): """
--- a/eric6/WebBrowser/Bookmarks/DefaultBookmarks_rc.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/DefaultBookmarks_rc.py Sun May 31 17:26:14 2020 +0200 @@ -2,7 +2,7 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.12.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) # # WARNING! All changes made in this file will be lost! @@ -63,7 +63,7 @@ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x6a\x36\x3b\x51\x76\ +\x00\x00\x01\x71\xda\xe0\x03\xcb\ " qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/eric6/WebBrowser/Navigation/NavigationBar.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Navigation/NavigationBar.py Sun May 31 17:26:14 2020 +0200 @@ -233,7 +233,7 @@ for index in range(len(backItems) - 1, -1, -1): item = backItems[index] act = QAction(self) - act.setData(-1 * (index + 1)) + act.setData(item) icon = WebBrowserWindow.icon(item.url()) act.setIcon(icon) act.setText(item.title()) @@ -260,7 +260,7 @@ for index in range(len(forwardItems)): item = forwardItems[index] act = QAction(self) - act.setData(index + 1) + act.setData(item) icon = WebBrowserWindow.icon(item.url()) act.setIcon(icon) act.setText(item.title()) @@ -281,18 +281,10 @@ @param act reference to the action selected in the navigation menu (QAction) """ - offset = act.data() - if offset is not None: + historyItem = act.data() + if historyItem is not None: history = self.__mw.currentBrowser().history() - historyCount = history.count() - if offset < 0: - # go back - history.goToItem( - history.backItems(historyCount)[-1 * offset - 1]) - else: - # go forward - history.goToItem( - history.forwardItems(historyCount)[offset - 1]) + history.goToItem(historyItem) def __goBack(self): """
--- a/eric6/WebBrowser/Network/NetworkManager.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Network/NetworkManager.py Sun May 31 17:26:14 2020 +0200 @@ -64,12 +64,14 @@ if SSL_AVAILABLE: self.__sslErrorHandler = E5SslErrorHandler(self) - self.sslErrors.connect(self.__sslErrorHandler.sslErrorsReplySlot) + self.sslErrors.connect(self.__sslErrorHandlingSlot) self.__temporarilyIgnoredSslErrors = {} self.__permanentlyIgnoredSslErrors = {} # dictionaries of permanently and temporarily ignored SSL errors + self.__insecureHosts = set() + self.__loaded = False self.__saveTimer = AutoSaver(self, self.__save) @@ -175,10 +177,15 @@ @return flag indicating to ignore this error @rtype bool """ + if Preferences.getWebBrowser("AlwaysRejectFaultyCertificates"): + return False + self.__load() host = error.url().host() + self.__insecureHosts.add(host) + if ( host in self.__temporarilyIgnoredSslErrors and error.error() in self.__temporarilyIgnoredSslErrors[host] @@ -196,11 +203,11 @@ E5MessageBox.Warning, title, self.tr("""<b>{0}</b>""" - """<p>The page you are trying to access has errors""" - """ in the SSL certificate.</p>""" - """<ul><li>{1}</li></ul>""" + """<p>The host <b>{1}</b> you are trying to access has""" + """ errors in the SSL certificate.</p>""" + """<ul><li>{2}</li></ul>""" """<p>Would you like to make an exception?</p>""") - .format(title, error.errorDescription()), + .format(title, host, error.errorDescription()), modal=True, parent=view) permButton = msgBox.addButton(self.tr("&Permanent accept"), E5MessageBox.AcceptRole) @@ -222,6 +229,40 @@ else: return False + def __sslErrorHandlingSlot(self, reply, errors): + """ + Private slot to handle SSL errors for a network reply. + + @param reply reference to the reply object + @type QNetworkReply + @param errors list of SSL errors + @type list of QSslError + """ + if Preferences.getWebBrowser("AlwaysRejectFaultyCertificates"): + return + + self.__load() + + host = reply.url().host() + if ( + host in self.__permanentlyIgnoredSslErrors or + host in self.__temporarilyIgnoredSslErrors + ): + reply.ignoreSslErrors() + else: + self.__sslErrorHandler.sslErrorsReply(reply, errors) + + def isInsecureHost(self, host): + """ + Public method to check a host against the list of insecure hosts. + + @param host name of the host to be checked + @type str + @return flag indicating an insecure host + @rtype bool + """ + return host in self.__insecureHosts + def authentication(self, url, auth, page=None): """ Public slot to handle an authentication request.
--- a/eric6/WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Sun May 31 17:26:14 2020 +0200 @@ -2,13 +2,55 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.12.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ +\x00\x00\x02\x7a\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x45\x4f\x20\x44\x65\ +\x75\x2d\x45\x6e\x67\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\ +\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x44\x65\x75\x74\x73\x63\x68\x2d\x45\x6e\x67\x6c\x69\ +\x73\x63\x68\x20\x57\xc3\xb6\x72\x74\x65\x72\x62\x75\x63\x68\x20\ +\x76\x6f\x6e\x20\x4c\x45\x4f\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ +\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ +\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ +\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\ +\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x65\x6e\x64\x65\x3f\ +\x6c\x61\x6e\x67\x3d\x64\x65\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ +\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x64\x69\ +\x63\x74\x51\x75\x65\x72\x79\x2f\x6d\x2d\x71\x75\x65\x72\x79\x2f\ +\x63\x6f\x6e\x66\x2f\x65\x6e\x64\x65\x2f\x71\x75\x65\x72\x79\x2e\ +\x63\x6f\x6e\x66\x2f\x73\x74\x72\x6c\x69\x73\x74\x2e\x6a\x73\x6f\ +\x6e\x3f\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\ +\x7d\x26\x61\x6d\x70\x3b\x73\x6f\x72\x74\x3d\x50\x4c\x61\x26\x61\ +\x6d\x70\x3b\x73\x68\x6f\x72\x74\x51\x75\x65\x72\x79\x26\x61\x6d\ +\x70\x3b\x6e\x6f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x26\ +\x61\x6d\x70\x3b\x6e\x6f\x51\x75\x65\x72\x79\x55\x52\x4c\x73\x22\ +\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ +\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\ +\x67\x2f\x69\x6d\x67\x2f\x66\x61\x76\x69\x63\x6f\x6e\x73\x2f\x65\ +\x6e\x64\x65\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ +\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ +\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x01\x95\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -151,7 +193,33 @@ \x55\x35\x45\x72\x6b\x4a\x67\x67\x67\x3d\x3d\x3c\x2f\x49\x6d\x61\ \x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ \x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x54\ +\x00\x00\x01\x79\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ +\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ +\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ +\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ +\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x85\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -160,37 +228,79 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ -\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ -\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ -\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ -\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ -\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ -\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ -\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ -\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ -\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ -\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ -\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ -\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ -\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ -\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ -\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ -\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x0a\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ +\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ +\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ +\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ +\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ +\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ +\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ +\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ +\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ +\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ +\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ +\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ +\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x0a\ +\x00\x00\x01\xad\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4d\x65\x74\x61\x47\x65\ +\x72\x20\x28\x4d\x65\x74\x61\x47\x65\x72\x32\x29\x3c\x2f\x53\x68\ +\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x4d\x65\x74\x61\x47\x65\ +\x72\x3a\x20\x53\x69\x63\x68\x65\x72\x20\x73\x75\x63\x68\x65\x6e\ +\x20\x26\x61\x6d\x70\x3b\x20\x66\x69\x6e\x64\x65\x6e\x2c\x20\x50\ +\x72\x69\x76\x61\x74\x73\x70\x68\xc3\xa4\x72\x65\x20\x73\x63\x68\ +\xc3\xbc\x74\x7a\x65\x6e\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ +\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ +\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ +\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\x3a\x2f\x2f\x6d\x65\ +\x74\x61\x67\x65\x72\x2e\x64\x65\x2f\x6d\x65\x74\x61\x2f\x6d\x65\ +\x74\x61\x2e\x67\x65\x72\x33\x3f\x65\x69\x6e\x67\x61\x62\x65\x3d\ +\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\ +\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\ +\x73\x3a\x2f\x2f\x6d\x65\x74\x61\x67\x65\x72\x2e\x64\x65\x2f\x66\ +\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\ +\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\ +\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x7e\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ +\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ +\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ +\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ +\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ +\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ +\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ +\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ +\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ +\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x1e\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -227,102 +337,6 @@ \x2f\x62\x65\x6f\x2d\x64\x65\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\ \x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ \x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x74\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x50\x79\x50\x49\x3c\x2f\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x53\x65\x61\x72\ -\x63\x68\x20\x50\x79\x50\x49\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ -\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ -\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ -\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\x3a\x2f\x2f\x70\ -\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\ -\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\ -\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ -\x74\x70\x73\x3a\x2f\x2f\x70\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\ -\x74\x61\x74\x69\x63\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x36\x61\x37\x36\x32\x37\x35\x64\x2e\x69\x63\ -\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ -\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x0a\ -\x00\x00\x01\xc9\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x69\x6e\x75\x78\x2d\ -\x4d\x61\x67\x61\x7a\x69\x6e\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\ -\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x53\x75\x63\x68\x65\x20\x61\x75\x66\x20\x77\ -\x77\x77\x2e\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\ -\x2e\x64\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x6c\x69\ -\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\x2f\x63\ -\x6f\x6e\x74\x65\x6e\x74\x2f\x73\x65\x61\x72\x63\x68\x3f\x53\x65\ -\x61\x72\x63\x68\x54\x65\x78\x74\x3d\x7b\x73\x65\x61\x72\x63\x68\ -\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ -\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ -\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\ -\x2f\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x2f\x6c\x6e\x6d\x2f\x64\ -\x65\x73\x69\x67\x6e\x2f\x6c\x69\x6e\x75\x78\x5f\x6d\x61\x67\x61\ -\x7a\x69\x6e\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\x69\x63\ -\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x46\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x47\x6f\x6f\x67\x6c\x65\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x47\x6f\ -\x6f\x67\x6c\x65\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\ -\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ -\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\x67\x6c\x65\ -\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x68\x6c\x3d\x7b\ -\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x6c\x72\ -\x3d\x6c\x61\x6e\x67\x5f\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\ -\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\ -\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\ -\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\ -\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\ -\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\ -\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\ -\x69\x65\x73\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\ -\x6f\x6d\x70\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x6f\ -\x75\x74\x70\x75\x74\x3d\x66\x69\x72\x65\x66\x6f\x78\x26\x61\x6d\ -\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\ -\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ -\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\ -\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\ -\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ -\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x64\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -373,6 +387,45 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x47\x6f\x6f\x67\x6c\x65\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x47\x6f\ +\x6f\x67\x6c\x65\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\ +\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ +\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\x67\x6c\x65\ +\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x68\x6c\x3d\x7b\ +\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x6c\x72\ +\x3d\x6c\x61\x6e\x67\x5f\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\ +\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\ +\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\ +\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\ +\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\ +\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\ +\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\ +\x69\x65\x73\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\ +\x6f\x6d\x70\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x6f\ +\x75\x74\x70\x75\x74\x3d\x66\x69\x72\x65\x66\x6f\x78\x26\x61\x6d\ +\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\ +\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ +\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\ +\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\ +\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ +\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x46\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ \x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x20\ \x28\x65\x6e\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ \x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ @@ -403,35 +456,6 @@ \x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ \x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ \x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\xad\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4d\x65\x74\x61\x47\x65\ -\x72\x20\x28\x4d\x65\x74\x61\x47\x65\x72\x32\x29\x3c\x2f\x53\x68\ -\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x4d\x65\x74\x61\x47\x65\ -\x72\x3a\x20\x53\x69\x63\x68\x65\x72\x20\x73\x75\x63\x68\x65\x6e\ -\x20\x26\x61\x6d\x70\x3b\x20\x66\x69\x6e\x64\x65\x6e\x2c\x20\x50\ -\x72\x69\x76\x61\x74\x73\x70\x68\xc3\xa4\x72\x65\x20\x73\x63\x68\ -\xc3\xbc\x74\x7a\x65\x6e\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ -\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ -\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ -\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\x3a\x2f\x2f\x6d\x65\ -\x74\x61\x67\x65\x72\x2e\x64\x65\x2f\x6d\x65\x74\x61\x2f\x6d\x65\ -\x74\x61\x2e\x67\x65\x72\x33\x3f\x65\x69\x6e\x67\x61\x62\x65\x3d\ -\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\ -\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\ -\x73\x3a\x2f\x2f\x6d\x65\x74\x61\x67\x65\x72\x2e\x64\x65\x2f\x66\ -\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\ -\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\ -\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x8d\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -511,87 +535,7 @@ \x3c\x2f\x55\x72\x6c\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\ \x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \ -\x00\x00\x02\x27\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ -\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ -\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ -\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ -\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ -\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ -\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ -\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ -\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ -\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ -\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ -\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ -\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x8d\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x53\x74\x61\x72\x74\x50\ -\x61\x67\x65\x20\x2d\x20\x45\x6e\x67\x6c\x69\x73\x68\x3c\x2f\x53\ -\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\ -\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x53\x74\x61\x72\x74\ -\x50\x61\x67\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\ -\x3a\x2f\x2f\x77\x77\x77\x2e\x73\x74\x61\x72\x74\x70\x61\x67\x65\ -\x2e\x63\x6f\x6d\x2f\x64\x6f\x2f\x64\x73\x65\x61\x72\x63\x68\x3f\ -\x71\x75\x65\x72\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x63\x61\x74\x3d\x77\x65\x62\x26\ -\x61\x6d\x70\x3b\x70\x6c\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\ -\x68\x26\x61\x6d\x70\x3b\x6c\x61\x6e\x67\x75\x61\x67\x65\x3d\x65\ -\x6e\x67\x6c\x69\x73\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\ -\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\ -\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ -\x68\x74\x74\x70\x73\x3a\x2f\x2f\x77\x77\x77\x2e\x73\x74\x61\x72\ -\x74\x70\x61\x67\x65\x2e\x63\x6f\x6d\x2f\x63\x67\x69\x2d\x62\x69\ -\x6e\x2f\x63\x73\x75\x67\x67\x65\x73\x74\x3f\x71\x75\x65\x72\x79\ -\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\ -\x6d\x70\x3b\x6c\x69\x6d\x69\x74\x3d\x31\x30\x26\x61\x6d\x70\x3b\ -\x6c\x61\x6e\x67\x3d\x65\x6e\x67\x6c\x69\x73\x68\x26\x61\x6d\x70\ -\x3b\x66\x6f\x72\x6d\x61\x74\x3d\x6a\x73\x6f\x6e\x22\x2f\x3e\x0a\ -\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x73\ -\x3a\x2f\x2f\x77\x77\x77\x2e\x73\x74\x61\x72\x74\x70\x61\x67\x65\ -\x2e\x63\x6f\x6d\x2f\x67\x72\x61\x70\x68\x69\x63\x73\x2f\x66\x61\ -\x76\x69\x63\x6f\x6e\x2f\x73\x70\x2d\x66\x61\x76\x69\x63\x6f\x6e\ -\x2d\x31\x36\x78\x31\x36\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\x67\ -\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\ -\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x85\ +\x00\x00\x01\x9b\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -600,117 +544,25 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ -\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ -\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ -\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ -\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ -\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ -\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ -\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ -\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ -\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ -\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ -\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ -\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ -\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x6f\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x52\x65\x64\x64\x69\x74\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x52\x65\ -\x64\x64\x69\x74\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\ -\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\ -\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\ -\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\ -\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\ -\x74\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x71\x3d\x7b\ -\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\ -\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\x74\x2e\x63\x6f\x6d\ -\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ -\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x7a\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x45\x4f\x20\x44\x65\ -\x75\x2d\x45\x6e\x67\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\ -\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x44\x65\x75\x74\x73\x63\x68\x2d\x45\x6e\x67\x6c\x69\ -\x73\x63\x68\x20\x57\xc3\xb6\x72\x74\x65\x72\x62\x75\x63\x68\x20\ -\x76\x6f\x6e\x20\x4c\x45\x4f\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ -\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ -\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ -\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\ -\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x65\x6e\x64\x65\x3f\ -\x6c\x61\x6e\x67\x3d\x64\x65\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ -\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x64\x69\ -\x63\x74\x51\x75\x65\x72\x79\x2f\x6d\x2d\x71\x75\x65\x72\x79\x2f\ -\x63\x6f\x6e\x66\x2f\x65\x6e\x64\x65\x2f\x71\x75\x65\x72\x79\x2e\ -\x63\x6f\x6e\x66\x2f\x73\x74\x72\x6c\x69\x73\x74\x2e\x6a\x73\x6f\ -\x6e\x3f\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\ -\x7d\x26\x61\x6d\x70\x3b\x73\x6f\x72\x74\x3d\x50\x4c\x61\x26\x61\ -\x6d\x70\x3b\x73\x68\x6f\x72\x74\x51\x75\x65\x72\x79\x26\x61\x6d\ -\x70\x3b\x6e\x6f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x26\ -\x61\x6d\x70\x3b\x6e\x6f\x51\x75\x65\x72\x79\x55\x52\x4c\x73\x22\ -\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ -\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\ -\x67\x2f\x69\x6d\x67\x2f\x66\x61\x76\x69\x63\x6f\x6e\x73\x2f\x65\ -\x6e\x64\x65\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ -\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ -\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x7e\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ -\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ -\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ -\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ -\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ -\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ -\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ -\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ -\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ -\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ +\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ +\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ +\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ +\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ +\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ +\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ +\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ +\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ +\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ +\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x1b\x4f\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -1150,7 +1002,70 @@ \x52\x55\x35\x45\x72\x6b\x4a\x67\x67\x67\x3d\x3d\x3c\x2f\x49\x6d\ \x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ \x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x9b\ +\x00\x00\x01\x74\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x50\x79\x50\x49\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x53\x65\x61\x72\ +\x63\x68\x20\x50\x79\x50\x49\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ +\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ +\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ +\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\x3a\x2f\x2f\x70\ +\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\ +\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\ +\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ +\x74\x70\x73\x3a\x2f\x2f\x70\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\ +\x74\x61\x74\x69\x63\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x36\x61\x37\x36\x32\x37\x35\x64\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ +\x00\x00\x02\x27\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ +\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ +\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ +\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ +\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ +\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ +\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ +\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ +\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ +\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ +\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ +\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ +\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\xc9\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -1159,26 +1074,29 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ -\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ -\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ -\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ -\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ -\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ -\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ -\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ -\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ -\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ -\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x79\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x69\x6e\x75\x78\x2d\ +\x4d\x61\x67\x61\x7a\x69\x6e\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\ +\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x53\x75\x63\x68\x65\x20\x61\x75\x66\x20\x77\ +\x77\x77\x2e\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\ +\x2e\x64\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x6c\x69\ +\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\x2f\x63\ +\x6f\x6e\x74\x65\x6e\x74\x2f\x73\x65\x61\x72\x63\x68\x3f\x53\x65\ +\x61\x72\x63\x68\x54\x65\x78\x74\x3d\x7b\x73\x65\x61\x72\x63\x68\ +\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ +\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ +\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\ +\x2f\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x2f\x6c\x6e\x6d\x2f\x64\ +\x65\x73\x69\x67\x6e\x2f\x6c\x69\x6e\x75\x78\x5f\x6d\x61\x67\x61\ +\x7a\x69\x6e\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\x69\x63\ +\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x8d\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -1187,23 +1105,105 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ -\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x53\x74\x61\x72\x74\x50\ +\x61\x67\x65\x20\x2d\x20\x45\x6e\x67\x6c\x69\x73\x68\x3c\x2f\x53\ +\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\ +\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x53\x74\x61\x72\x74\ +\x50\x61\x67\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ \x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ \x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ \x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ -\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ -\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ -\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\ +\x3a\x2f\x2f\x77\x77\x77\x2e\x73\x74\x61\x72\x74\x70\x61\x67\x65\ +\x2e\x63\x6f\x6d\x2f\x64\x6f\x2f\x64\x73\x65\x61\x72\x63\x68\x3f\ +\x71\x75\x65\x72\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x63\x61\x74\x3d\x77\x65\x62\x26\ +\x61\x6d\x70\x3b\x70\x6c\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\ +\x68\x26\x61\x6d\x70\x3b\x6c\x61\x6e\x67\x75\x61\x67\x65\x3d\x65\ +\x6e\x67\x6c\x69\x73\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\ +\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\ +\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ +\x68\x74\x74\x70\x73\x3a\x2f\x2f\x77\x77\x77\x2e\x73\x74\x61\x72\ +\x74\x70\x61\x67\x65\x2e\x63\x6f\x6d\x2f\x63\x67\x69\x2d\x62\x69\ +\x6e\x2f\x63\x73\x75\x67\x67\x65\x73\x74\x3f\x71\x75\x65\x72\x79\ +\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\ +\x6d\x70\x3b\x6c\x69\x6d\x69\x74\x3d\x31\x30\x26\x61\x6d\x70\x3b\ +\x6c\x61\x6e\x67\x3d\x65\x6e\x67\x6c\x69\x73\x68\x26\x61\x6d\x70\ +\x3b\x66\x6f\x72\x6d\x61\x74\x3d\x6a\x73\x6f\x6e\x22\x2f\x3e\x0a\ +\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x73\ +\x3a\x2f\x2f\x77\x77\x77\x2e\x73\x74\x61\x72\x74\x70\x61\x67\x65\ +\x2e\x63\x6f\x6d\x2f\x67\x72\x61\x70\x68\x69\x63\x73\x2f\x66\x61\ +\x76\x69\x63\x6f\x6e\x2f\x73\x70\x2d\x66\x61\x76\x69\x63\x6f\x6e\ +\x2d\x31\x36\x78\x31\x36\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\x67\ +\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\ +\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x6f\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x52\x65\x64\x64\x69\x74\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x52\x65\ +\x64\x64\x69\x74\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\ +\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\ +\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\ +\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\ +\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\ +\x74\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x71\x3d\x7b\ +\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\ +\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\x74\x2e\x63\x6f\x6d\ +\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ +\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x54\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ +\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ +\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ +\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ +\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ +\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ +\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ +\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ +\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ +\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ +\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ +\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ +\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ +\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ +\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ \x00\x00\x02\x5b\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -1247,6 +1247,10 @@ " qt_resource_name = b"\ +\x00\x0e\ +\x00\xf1\x12\x1c\ +\x00\x4c\ +\x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0d\ \x0a\x2e\x72\x9c\ \x00\x41\ @@ -1255,41 +1259,41 @@ \x09\x21\x3a\xfc\ \x00\x44\ \x00\x75\x00\x63\x00\x6b\x00\x44\x00\x75\x00\x63\x00\x6b\x00\x47\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x09\ -\x01\xf4\xe3\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x08\ +\x00\x4a\x56\x1c\ +\x00\x42\ +\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0b\ +\x0b\x48\x8a\x5c\ +\x00\x59\ +\x00\x6f\x00\x75\x00\x54\x00\x75\x00\x62\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x14\ +\x06\xbb\x4c\x7c\ +\x00\x4d\ +\x00\x65\x00\x74\x00\x61\x00\x47\x00\x65\x00\x72\x00\x5f\x00\x4d\x00\x65\x00\x74\x00\x61\x00\x47\x00\x65\x00\x72\x00\x32\x00\x2e\ +\x00\x78\x00\x6d\x00\x6c\ +\x00\x0c\ +\x0f\xd5\x68\x1c\ +\x00\x46\ +\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x12\ \x0a\xf9\x0f\x7c\ \x00\x44\ \x00\x65\x00\x45\x00\x6e\x00\x5f\x00\x42\x00\x65\x00\x6f\x00\x6c\x00\x69\x00\x6e\x00\x67\x00\x75\x00\x73\x00\x2e\x00\x78\x00\x6d\ \x00\x6c\ -\x00\x08\ -\x0e\x4c\x55\xdc\ -\x00\x50\ -\x00\x79\x00\x50\x00\x49\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x10\ -\x09\x73\x65\x7c\ -\x00\x4c\ -\x00\x69\x00\x6e\x00\x75\x00\x78\x00\x4d\x00\x61\x00\x67\x00\x61\x00\x7a\x00\x69\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0a\ -\x0e\x31\x93\x9c\ -\x00\x47\ -\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x1b\ \x0d\x52\x43\x5c\ \x00\x47\ \x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ \x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0a\ +\x0e\x31\x93\x9c\ +\x00\x47\ +\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0c\ \x0e\x81\x61\xdc\ \x00\x57\ \x00\x69\x00\x6b\x00\x69\x00\x61\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x14\ -\x06\xbb\x4c\x7c\ -\x00\x4d\ -\x00\x65\x00\x74\x00\x61\x00\x47\x00\x65\x00\x72\x00\x5f\x00\x4d\x00\x65\x00\x74\x00\x61\x00\x47\x00\x65\x00\x72\x00\x32\x00\x2e\ -\x00\x78\x00\x6d\x00\x6c\ \x00\x10\ \x06\x9e\x0e\x7c\ \x00\x53\ @@ -1298,42 +1302,38 @@ \x0f\xc7\x2e\x1c\ \x00\x73\ \x00\x65\x00\x61\x00\x72\x00\x78\x00\x6d\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0e\ +\x08\xce\x7c\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x72\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x08\x57\xee\x9c\ +\x00\x51\ +\x00\x77\x00\x61\x00\x6e\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x08\ +\x0e\x4c\x55\xdc\ +\x00\x50\ +\x00\x79\x00\x50\x00\x49\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x09\ \x0f\x62\xe1\xdc\ \x00\x59\ \x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x10\ +\x09\x73\x65\x7c\ +\x00\x4c\ +\x00\x69\x00\x6e\x00\x75\x00\x78\x00\x4d\x00\x61\x00\x67\x00\x61\x00\x7a\x00\x69\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x10\ \x06\xbb\x0e\x7c\ \x00\x53\ \x00\x74\x00\x61\x00\x72\x00\x74\x00\x50\x00\x61\x00\x67\x00\x65\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0b\ -\x0b\x48\x8a\x5c\ -\x00\x59\ -\x00\x6f\x00\x75\x00\x54\x00\x75\x00\x62\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0a\ \x0b\x0c\x48\x7c\ \x00\x52\ \x00\x65\x00\x64\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x00\xf1\x12\x1c\ -\x00\x4c\ -\x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0c\ -\x0f\xd5\x68\x1c\ -\x00\x46\ -\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x09\ -\x08\x57\xee\x9c\ -\x00\x51\ -\x00\x77\x00\x61\x00\x6e\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x08\xce\x7c\x3c\ +\x01\xf4\xe3\x3c\ \x00\x57\ -\x00\x69\x00\x6b\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x72\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x08\ -\x00\x4a\x56\x1c\ -\x00\x42\ -\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0d\ \x06\xf8\x53\x3c\ \x00\x57\ @@ -1342,77 +1342,77 @@ qt_resource_struct_v1 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x16\x00\x00\x00\x01\ -\x00\x00\x02\x92\x00\x00\x00\x00\x00\x01\x00\x00\x46\x57\ -\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x25\x65\ -\x00\x00\x00\x42\x00\x00\x00\x00\x00\x01\x00\x00\x08\x9b\ -\x00\x00\x01\x62\x00\x00\x00\x00\x00\x01\x00\x00\x19\x07\ -\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xd8\ -\x00\x00\x01\x34\x00\x00\x00\x00\x00\x01\x00\x00\x17\x56\ +\x00\x00\x00\x64\x00\x00\x00\x00\x00\x01\x00\x00\x0b\x19\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ +\x00\x00\x02\x90\x00\x00\x00\x00\x00\x01\x00\x00\x45\x7c\ +\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x70\ +\x00\x00\x02\x50\x00\x00\x00\x00\x00\x01\x00\x00\x41\x78\ +\x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x1f\ \x00\x00\x02\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x47\xd4\ -\x00\x00\x02\x58\x00\x00\x00\x00\x00\x01\x00\x00\x29\x65\ -\x00\x00\x02\x70\x00\x00\x00\x00\x00\x01\x00\x00\x44\xb8\ -\x00\x00\x00\x20\x00\x00\x00\x00\x00\x01\x00\x00\x01\x99\ -\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x8d\ -\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xf3\ -\x00\x00\x01\xfe\x00\x00\x00\x00\x00\x01\x00\x00\x23\xf2\ -\x00\x00\x01\xe2\x00\x00\x00\x00\x00\x01\x00\x00\x22\x69\ -\x00\x00\x00\xda\x00\x00\x00\x00\x00\x01\x00\x00\x12\xa4\ -\x00\x00\x00\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x10\x5a\ -\x00\x00\x00\x84\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x15\ -\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x15\x0c\ -\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x1d\xad\ -\x00\x00\x01\x88\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x98\ -\x00\x00\x02\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x27\xe3\ +\x00\x00\x01\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x20\xb5\ +\x00\x00\x01\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x16\ +\x00\x00\x00\x42\x00\x00\x00\x00\x00\x01\x00\x00\x04\x17\ +\x00\x00\x02\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x3f\xab\ +\x00\x00\x00\x22\x00\x00\x00\x00\x00\x01\x00\x00\x02\x7e\ +\x00\x00\x00\xe2\x00\x00\x00\x00\x00\x01\x00\x00\x11\x52\ +\x00\x00\x02\x76\x00\x00\x00\x00\x00\x01\x00\x00\x44\x09\ +\x00\x00\x00\x7a\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x96\ +\x00\x00\x01\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x13\x74\ +\x00\x00\x01\x48\x00\x00\x00\x00\x00\x01\x00\x00\x15\xdc\ +\x00\x00\x01\xfc\x00\x00\x00\x00\x00\x01\x00\x00\x3c\x08\ +\x00\x00\x01\x62\x00\x00\x00\x00\x00\x01\x00\x00\x18\x26\ +\x00\x00\x02\x12\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x80\ +\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x01\ +\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x0f\xd0\ " qt_resource_struct_v2 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x16\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x02\x92\x00\x00\x00\x00\x00\x01\x00\x00\x46\x57\ -\x00\x00\x01\x6a\x36\x3b\x51\x92\ -\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x25\x65\ -\x00\x00\x01\x6a\x36\x3b\x51\x94\ -\x00\x00\x00\x42\x00\x00\x00\x00\x00\x01\x00\x00\x08\x9b\ -\x00\x00\x01\x6a\x36\x3b\x51\x96\ -\x00\x00\x01\x62\x00\x00\x00\x00\x00\x01\x00\x00\x19\x07\ -\x00\x00\x01\x6a\x36\x3b\x51\x88\ -\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xd8\ -\x00\x00\x01\x6a\x36\x3b\x51\xf7\ -\x00\x00\x01\x34\x00\x00\x00\x00\x00\x01\x00\x00\x17\x56\ -\x00\x00\x01\x6a\x36\x3b\x51\xb1\ +\x00\x00\x00\x64\x00\x00\x00\x00\x00\x01\x00\x00\x0b\x19\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x02\x90\x00\x00\x00\x00\x00\x01\x00\x00\x45\x7c\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x70\ +\x00\x00\x01\x71\xda\xe0\x03\xe3\ +\x00\x00\x02\x50\x00\x00\x00\x00\x00\x01\x00\x00\x41\x78\ +\x00\x00\x01\x71\xda\xe0\x03\xcb\ +\x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x1f\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ \x00\x00\x02\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x47\xd4\ -\x00\x00\x01\x6a\x36\x3b\x51\xb3\ -\x00\x00\x02\x58\x00\x00\x00\x00\x00\x01\x00\x00\x29\x65\ -\x00\x00\x01\x6a\x36\x3b\x52\x8b\ -\x00\x00\x02\x70\x00\x00\x00\x00\x00\x01\x00\x00\x44\xb8\ -\x00\x00\x01\x6a\x36\x3b\x51\xc4\ -\x00\x00\x00\x20\x00\x00\x00\x00\x00\x01\x00\x00\x01\x99\ -\x00\x00\x01\x6a\x36\x3b\x52\x89\ -\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x8d\ -\x00\x00\x01\x6a\x36\x3b\x51\xd8\ -\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x6a\x36\x3b\x51\xf4\ -\x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xf3\ -\x00\x00\x01\x6a\x36\x3b\x51\xd6\ -\x00\x00\x01\xfe\x00\x00\x00\x00\x00\x01\x00\x00\x23\xf2\ -\x00\x00\x01\x6a\x36\x3b\x52\x11\ -\x00\x00\x01\xe2\x00\x00\x00\x00\x00\x01\x00\x00\x22\x69\ -\x00\x00\x01\x6a\x36\x3b\x52\x13\ -\x00\x00\x00\xda\x00\x00\x00\x00\x00\x01\x00\x00\x12\xa4\ -\x00\x00\x01\x6a\x36\x3b\x51\xf6\ -\x00\x00\x00\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x10\x5a\ -\x00\x00\x01\x6a\x36\x3b\x51\x86\ -\x00\x00\x00\x84\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x15\ -\x00\x00\x01\x6a\x36\x3b\x51\xc3\ -\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x15\x0c\ -\x00\x00\x01\x6a\x36\x3b\x51\xd9\ -\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x1d\xad\ -\x00\x00\x01\x6a\x36\x3b\x52\x8c\ -\x00\x00\x01\x88\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x98\ -\x00\x00\x01\x6a\x36\x3b\x51\xf9\ -\x00\x00\x02\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x27\xe3\ -\x00\x00\x01\x6a\x36\x3b\x52\x10\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x01\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x20\xb5\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x01\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x16\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x00\x42\x00\x00\x00\x00\x00\x01\x00\x00\x04\x17\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x02\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x3f\xab\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x00\x22\x00\x00\x00\x00\x00\x01\x00\x00\x02\x7e\ +\x00\x00\x01\x71\xda\xe0\x03\xcb\ +\x00\x00\x00\xe2\x00\x00\x00\x00\x00\x01\x00\x00\x11\x52\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x02\x76\x00\x00\x00\x00\x00\x01\x00\x00\x44\x09\ +\x00\x00\x01\x71\xda\xe0\x04\x13\ +\x00\x00\x00\x7a\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x96\ +\x00\x00\x01\x71\xda\xe0\x04\x13\ +\x00\x00\x01\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x13\x74\ +\x00\x00\x01\x71\xda\xe0\x03\xcb\ +\x00\x00\x01\x48\x00\x00\x00\x00\x00\x01\x00\x00\x15\xdc\ +\x00\x00\x01\x71\xda\xe0\x03\xe3\ +\x00\x00\x01\xfc\x00\x00\x00\x00\x00\x01\x00\x00\x3c\x08\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x01\x62\x00\x00\x00\x00\x00\x01\x00\x00\x18\x26\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x02\x12\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x80\ +\x00\x00\x01\x71\xda\xe0\x03\xc7\ +\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x01\ +\x00\x00\x01\x71\xda\xe0\x03\xcb\ +\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x0f\xd0\ +\x00\x00\x01\x71\xda\xe0\x04\x13\ " qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py Sun May 31 17:26:14 2020 +0200 @@ -24,14 +24,16 @@ from ..WebBrowserPage import WebBrowserPage import UI.PixmapCache +import Preferences + +from WebBrowser.WebBrowserWindow import WebBrowserWindow class SiteInfoDialog(QDialog, Ui_SiteInfoDialog): """ Class implementing a dialog to show some information about a site. """ - okStyle = "QLabel { color : white; background-color : green; }" - nokStyle = "QLabel { color : white; background-color : red; }" + securityStyleFormat = "QLabel {{ background-color : {0}; }}" def __init__(self, browser, parent=None): """ @@ -72,11 +74,31 @@ self.heading.setText("<b>{0}</b>".format(title)) self.siteAddressLabel.setText(self.__baseUrl.toString()) if self.__baseUrl.scheme() in ["https"]: - self.securityLabel.setStyleSheet(SiteInfoDialog.okStyle) - self.securityLabel.setText( - self.tr('<b>Connection is encrypted.</b>')) + if WebBrowserWindow.networkManager().isInsecureHost( + self.__baseUrl.host() + ): + self.securityIconLabel.setPixmap( + UI.PixmapCache.getPixmap("securityMedium")) + self.securityLabel.setStyleSheet( + SiteInfoDialog.securityStyleFormat.format( + Preferences.getWebBrowser("InsecureUrlColor").name() + ) + ) + self.securityLabel.setText(self.tr( + '<b>Connection is encrypted but may be insecure.</b>')) + else: + self.securityIconLabel.setPixmap( + UI.PixmapCache.getPixmap("securityHigh")) + self.securityLabel.setStyleSheet( + SiteInfoDialog.securityStyleFormat.format( + Preferences.getWebBrowser("SecureUrlColor").name() + ) + ) + self.securityLabel.setText( + self.tr('<b>Connection is encrypted.</b>')) else: - self.securityLabel.setStyleSheet(SiteInfoDialog.nokStyle) + self.securityIconLabel.setPixmap( + UI.PixmapCache.getPixmap("securityLow")) self.securityLabel.setText( self.tr('<b>Connection is not encrypted.</b>')) browser.page().runJavaScript(
--- a/eric6/WebBrowser/SiteInfo/SiteInfoDialog.ui Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/SiteInfo/SiteInfoDialog.ui Sun May 31 17:26:14 2020 +0200 @@ -16,7 +16,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QLabel" name="heading"> <property name="text"> @@ -36,7 +36,7 @@ <attribute name="title"> <string>General</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> @@ -140,13 +140,16 @@ </spacer> </item> <item row="1" column="1"> + <widget class="QLabel" name="securityIconLabel"/> + </item> + <item row="1" column="2"> <widget class="QLabel" name="securityLabel"> <property name="text"> <string/> </property> </widget> </item> - <item row="1" column="2"> + <item row="1" column="3"> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum>
--- a/eric6/WebBrowser/SiteInfo/SiteInfoWidget.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/SiteInfo/SiteInfoWidget.py Sun May 31 17:26:14 2020 +0200 @@ -59,10 +59,17 @@ secureLabel.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) layout.addWidget(secureLabel, rows, 1) if url.scheme() in ["https"]: - secureLabel.setText( - self.tr("Your connection to this site is <b>secure</b>.")) - secureIcon.setPixmap( - UI.PixmapCache.getPixmap("securityHigh")) + if WebBrowserWindow.networkManager().isInsecureHost(url.host()): + secureLabel.setText( + self.tr("Your connection to this site " + "<b>may not be secure</b>.")) + secureIcon.setPixmap( + UI.PixmapCache.getPixmap("securityMedium")) + else: + secureLabel.setText( + self.tr("Your connection to this site is <b>secure</b>.")) + secureIcon.setPixmap( + UI.PixmapCache.getPixmap("securityHigh")) else: secureLabel.setText( self.tr("Your connection to this site is <b>not secure</b>."))
--- a/eric6/WebBrowser/Tools/WebIconLoader.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Tools/WebIconLoader.py Sun May 31 17:26:14 2020 +0200 @@ -19,7 +19,7 @@ """ Class implementing a loader for web site icons. - @signal iconLoaded(icon) emitted when the con has been loaded + @signal iconLoaded(icon) emitted when the icon has been loaded """ iconLoaded = pyqtSignal(QIcon) @@ -50,5 +50,7 @@ icon = QIcon(QPixmap.fromImage(QImage.fromData(data))) self.iconLoaded.emit(icon) + # TODO: extract SSL data as a by-product + self.__reply.deleteLater() self.__reply = None
--- a/eric6/WebBrowser/Tools/WebIconProvider.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/Tools/WebIconProvider.py Sun May 31 17:26:14 2020 +0200 @@ -80,7 +80,7 @@ def load(self): """ - Public method to load the bookmarks. + Public method to load the web site icons. """ if self.__loaded: return @@ -105,7 +105,7 @@ def save(self): """ - Public method to save the zoom values. + Public method to save the web site icons. """ if not self.__loaded: return @@ -161,7 +161,7 @@ @rtype str """ return url.toString(QUrl.PrettyDecoded | QUrl.RemoveUserInfo | - QUrl.RemoveFragment) + QUrl.RemoveFragment | QUrl.RemovePath) def iconForUrl(self, url): """ @@ -187,18 +187,24 @@ self.load() urlStr = self.__urlToString(url) - for iconUrlStr in self.__iconsDB: - if iconUrlStr.startswith(urlStr): - return self.__iconsDB[iconUrlStr] + if urlStr in self.__iconsDB: + return self.__iconsDB[urlStr] + else: + for iconUrlStr in self.__iconsDB: + if iconUrlStr.startswith(urlStr): + return self.__iconsDB[iconUrlStr] # try replacing http scheme with https scheme url = QUrl(url) if url.scheme() == "http": url.setScheme("https") - urlStr = self.__urlToString(url) - for iconUrlStr in self.__iconsDB: - if iconUrlStr.startswith(urlStr): - return self.__iconsDB[iconUrlStr] + urlStr = self.__urlToString(url) + if urlStr in self.__iconsDB: + return self.__iconsDB[urlStr] + else: + for iconUrlStr in self.__iconsDB: + if iconUrlStr.startswith(urlStr): + return self.__iconsDB[iconUrlStr] if scheme == "https": return UI.PixmapCache.getIcon("securityHigh32")
--- a/eric6/WebBrowser/UrlBar/UrlBar.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/UrlBar/UrlBar.py Sun May 31 17:26:14 2020 +0200 @@ -221,12 +221,12 @@ @param evt reference to the paint event (QPaintEvent) """ + foregroundColor = QApplication.palette().color(QPalette.Text) + if self.__privateMode: - backgroundColor = QColor(220, 220, 220) # light gray - foregroundColor = Qt.black + backgroundColor = Preferences.getWebBrowser("PrivateModeUrlColor") else: backgroundColor = QApplication.palette().color(QPalette.Base) - foregroundColor = QApplication.palette().color(QPalette.Text) if self.__browser is not None: p = self.palette() @@ -234,11 +234,17 @@ if not self.__browser.getSafeBrowsingStatus(): # malicious web site - backgroundColor = QColor(170, 0, 0) - foregroundColor = QColor(Qt.white) + backgroundColor = Preferences.getWebBrowser( + "MaliciousUrlColor") elif self.__browser.url().scheme() == "https": - backgroundColor = Preferences.getWebBrowser( - "SaveUrlColor") + if WebBrowserWindow.networkManager().isInsecureHost( + self.__browser.url().host() + ): + backgroundColor = Preferences.getWebBrowser( + "InsecureUrlColor") + else: + backgroundColor = Preferences.getWebBrowser( + "SecureUrlColor") if progress == 0 or progress == 100: p.setBrush(QPalette.Base, backgroundColor)
--- a/eric6/WebBrowser/UserAgent/UserAgentDefaults_rc.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/UserAgent/UserAgentDefaults_rc.py Sun May 31 17:26:14 2020 +0200 @@ -2,7 +2,7 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.12.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) # # WARNING! All changes made in this file will be lost! @@ -92,7 +92,7 @@ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x6a\x36\x3b\x52\xa8\ +\x00\x00\x01\x71\xda\xe0\x03\xd7\ " qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/eric6/WebBrowser/WebBrowserTabWidget.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/WebBrowserTabWidget.py Sun May 31 17:26:14 2020 +0200 @@ -428,8 +428,8 @@ browser.backwardAvailable.connect( self.__mainWindow.setBackwardAvailable) browser.forwardAvailable.connect(self.__mainWindow.setForwardAvailable) - browser.loadStarted.connect( - lambda: self.__loadStarted(browser)) + browser.loadProgress.connect( + lambda progress: self.__loadProgress(progress, browser)) browser.loadFinished.connect( lambda ok: self.__loadFinished(ok, browser)) browser.faviconChanged.connect( @@ -874,25 +874,6 @@ for urlbar in self.__stackedUrlBar.urlBars(): urlbar.preferencesChanged() - def __loadStarted(self, browser): - """ - Private method to handle the loadStarted signal. - - @param browser reference to the web browser - @type WebBrowserView - """ - index = self.indexOf(browser) - anim = self.animationLabel(index, "loadingAnimation", 40) - if not anim: - self.setTabIcon(index, UI.PixmapCache.getIcon("loading")) - else: - self.setTabIcon(index, QIcon()) - self.setTabText(index, self.tr("Loading...")) - self.setTabToolTip(index, self.tr("Loading...")) - self.showMessage.emit(self.tr("Loading...")) - - self.__mainWindow.setLoadingActions(True) - def __loadFinished(self, ok, browser): """ Private method to handle the loadFinished signal. @@ -902,18 +883,45 @@ @param browser reference to the web browser @type WebBrowserView """ - import WebBrowser.WebBrowserWindow - index = self.indexOf(browser) - self.resetAnimation(index) - self.setTabIcon( - index, WebBrowser.WebBrowserWindow.WebBrowserWindow.icon( - browser.url())) if ok: self.showMessage.emit(self.tr("Finished loading")) else: self.showMessage.emit(self.tr("Failed to load")) + + def __loadProgress(self, progress, browser): + """ + Private method to handle the loadProgress signal. - self.__mainWindow.setLoadingActions(False) + Note: This works around wegengine not sending a loadFinished + signal for navigation on the same page. + + @param progress load progress in percent + @type int + @param browser reference to the web browser + @type WebBrowserView + """ + index = self.indexOf(browser) + if progress == 0: + # page loading has started + anim = self.animationLabel(index, "loadingAnimation", 40) + if not anim: + self.setTabIcon(index, UI.PixmapCache.getIcon("loading")) + else: + self.setTabIcon(index, QIcon()) + self.setTabText(index, self.tr("Loading...")) + self.setTabToolTip(index, self.tr("Loading...")) + self.showMessage.emit(self.tr("Loading...")) + + self.__mainWindow.setLoadingActions(True) + elif progress == 100: + import WebBrowser.WebBrowserWindow + self.resetAnimation(index) + self.setTabIcon( + index, WebBrowser.WebBrowserWindow.WebBrowserWindow.icon( + browser.url())) + self.showMessage.emit(self.tr("Finished loading")) + + self.__mainWindow.setLoadingActions(False) def __iconChanged(self, browser): """
--- a/eric6/WebBrowser/data/icons_rc.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/data/icons_rc.py Sun May 31 17:26:14 2020 +0200 @@ -2,13 +2,1044 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.12.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ +\x00\x00\x07\x84\ +\x47\ +\x49\x46\x38\x39\x61\x36\x00\x37\x00\xf3\x00\x00\xff\xff\xff\x00\ +\x00\x00\x78\x78\x78\x1c\x1c\x1c\x0e\x0e\x0e\xd8\xd8\xd8\x54\x54\ +\x54\xdc\xdc\xdc\xc4\xc4\xc4\x48\x48\x48\x8a\x8a\x8a\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x21\xff\x0b\x4e\ +\x45\x54\x53\x43\x41\x50\x45\x32\x2e\x30\x03\x01\x00\x00\x00\x21\ +\xfe\x1a\x43\x72\x65\x61\x74\x65\x64\x20\x77\x69\x74\x68\x20\x61\ +\x6a\x61\x78\x6c\x6f\x61\x64\x2e\x69\x6e\x66\x6f\x00\x21\xf9\x04\ +\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\ +\xcc\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\ +\x9e\x25\x92\x10\x44\x82\xa0\xa7\xc2\xce\x84\x02\x93\x08\x4d\xbf\ +\x77\xb8\xea\xac\x44\x2f\x04\xa4\x0d\x41\xc5\xd9\xf1\xf3\x03\x0a\ +\x97\x9d\x5c\x91\x77\x2c\x18\x58\x86\x02\x46\xa6\xb3\x2d\x0b\x03\ +\xda\x40\x7b\x51\x05\xa9\x16\xc1\x60\x20\x18\x5d\x75\x06\x93\x80\ +\xd6\x26\x16\x4d\xe1\xd9\x40\x94\xc4\x8b\x45\x6f\x34\x71\x25\x73\ +\x33\x75\x20\x07\x79\x2c\x03\x07\x27\x6a\x6c\x24\x07\x6f\x06\x8d\ +\x50\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x1c\x8f\x87\x96\xa1\x1a\ +\x85\x2c\xa2\x47\xa6\x04\xa8\x14\x8a\x04\x7b\x96\xae\xb0\x17\xb2\ +\x97\xb5\x18\xaa\xac\x3d\xb9\xa5\x6b\xba\x43\xa4\x9f\xc2\xc3\xc4\ +\xc5\xc6\xc7\xc8\x9b\xc1\x8e\xbe\x24\xbc\x72\x74\x23\xb7\x25\xd3\ +\x20\xd5\xd2\x7f\x22\xcf\x84\xd1\x23\xcb\x72\xcd\xc9\x9e\xdf\xc5\ +\xdb\xc5\xd7\xc3\xe8\xc2\xe6\xe5\xe1\xe2\xef\x3d\x11\x00\x21\xf9\ +\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\ +\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\ +\x69\x9e\x68\xaa\x16\x06\x41\x18\x85\x5a\x16\x83\xeb\x0e\xb1\x2c\ +\xb6\xb6\x6b\xe8\xa2\x5e\x0f\x18\x12\xda\x88\x20\x5e\xef\x87\xf4\ +\x1c\x6a\xb6\xc1\xe1\x82\x48\xb8\x12\x88\xa6\xe4\xc0\x33\x4c\x2d\ +\x0a\xa3\x62\x24\x18\x0c\x04\x26\x84\xd1\x95\x05\x09\x7a\x68\x92\ +\x75\x9d\x08\x41\x6f\xa5\xf5\x11\x74\x27\x0c\xf2\x7a\x04\x21\x6f\ +\x36\x71\x23\x73\x46\x75\x83\x66\x86\x23\x6a\x6b\x6d\x5a\x1a\x61\ +\x42\x63\x92\x1c\x55\x57\x91\x97\x9c\x9d\x9e\x9f\xa0\xa1\x6e\x8c\ +\x97\x65\x67\x1a\x84\x2e\x8d\x40\xa9\x04\xab\x14\x7d\x7f\x4d\xb1\ +\x19\xb4\xb3\x3d\xb2\x17\xad\xaf\x32\xbb\xa8\xa4\x92\xa6\xbc\xa2\ +\xc4\xc5\xc6\xc7\xc8\xc9\xca\x27\xc2\x29\xcd\x64\x70\xcc\xd1\x22\ +\xb6\x25\xd5\x7c\xb8\x27\xd7\x1f\xbe\x26\xdd\x22\xcf\xcc\xc0\xcb\ +\x9e\xe1\xc7\xdf\xc6\xdb\xc4\xea\xa2\xe8\xc6\xe6\xe4\xf1\x27\x11\ +\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\ +\x37\x00\x00\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\ +\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\x0a\x44\x4d\ +\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\x86\x1f\x17\ +\x0c\x99\x2b\x18\x6a\x86\x02\x49\x79\x24\x15\x76\xb6\x81\x34\x54\ +\xac\x55\x45\x4f\x1e\xc1\x00\xcc\x9a\xc4\xb6\x72\x4d\x48\x42\xd7\ +\x44\xdd\x9b\x29\xcc\x23\xc3\x5f\x5f\xd1\x01\xbb\x3e\x30\x3b\x07\ +\x61\x06\x7e\x7f\x85\x86\x87\x88\x89\x8a\x12\x08\x09\x35\x09\x08\ +\x8b\x15\x0a\x68\x0a\x19\x54\x43\x08\x6e\x04\x91\x16\x71\x79\x29\ +\x8e\x6e\x09\x17\x7c\x3d\x3f\x9b\x6f\x16\xa6\x6c\x2c\xa9\x04\x17\ +\x9f\x3f\xa2\x68\xa4\xb1\x78\x99\x9b\x9d\x92\x94\x62\x96\x92\x13\ +\x8d\x8f\xbb\xc0\xc5\xc6\xc7\xc8\xc9\x13\x98\x28\xcc\x70\x3c\xa0\ +\x44\xd0\x23\xac\x27\xd5\x6a\xa7\x26\xd7\x5c\xd3\x26\xb2\x23\xce\ +\xde\xb8\xca\x88\xe1\xc5\xdf\xc6\xdb\xc5\xea\xc0\xe8\xc6\xe6\xe4\ +\xf1\x26\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\ +\x00\x36\x00\x37\x00\x00\x04\xcd\x10\xc8\x49\xab\xbd\x38\xeb\xcd\ +\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\ +\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\ +\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\x8a\x35\ +\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\xea\x09\ +\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\xbc\xaa\x60\xa8\ +\x19\x0a\x1a\x71\x3f\x05\x67\x80\x17\x6c\x5a\x29\x7d\x3c\x04\x06\ +\x18\x67\x43\x8c\x36\x8f\x41\x91\x92\x04\x18\x88\x43\x8b\x3c\x8e\ +\x99\x52\x48\x07\x67\x07\x7a\x13\x07\x8b\x06\xa4\xa5\xab\xac\xad\ +\xae\x27\x08\x09\x35\x09\x08\xac\x0a\x92\x0a\x23\x82\x23\x08\x97\ +\x04\xb5\x54\x46\x25\xb2\x97\x09\x21\x90\x24\xbe\x35\xc7\x95\xc9\ +\xca\x21\x9a\x24\xc4\x92\xc6\xd0\xa0\x25\xbd\x97\xc0\x79\xb7\x8c\ +\xb9\x48\xbb\x15\xb1\xb3\xdb\x3f\xd1\xab\xc8\xe8\xcd\xab\xe7\xec\ +\xd7\xaf\xf0\x2b\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ +\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcb\x10\xc8\x49\xab\xbd\x38\ +\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ +\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ +\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ +\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ +\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ +\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ +\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x99\x4c\x05\ +\x06\x35\x06\x05\x6e\x52\x27\x05\x67\xa0\x21\x8f\x23\x9d\x3c\x04\ +\x06\x40\x5d\x26\xab\x36\xae\x61\xb0\xb1\x04\x57\x6a\x25\xaa\x3c\ +\xad\x57\xa2\x19\x08\x09\x35\x09\x08\x17\x07\x67\x07\x43\x0a\xb1\ +\x0a\xc6\xaa\x06\xc9\x3f\x08\xb6\x04\xc5\x79\xc2\xb6\x09\x7a\xd4\ +\x35\xdb\xdc\x7a\xd8\xb1\xda\x79\xd3\xb6\xd6\x79\xcb\xab\xcd\x95\ +\xc1\xc3\xe7\x22\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ +\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\x38\ +\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ +\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ +\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ +\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ +\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ +\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ +\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x00\x08\x09\ +\x35\x09\x08\x96\x0a\x3c\x35\x0a\x94\x08\xa2\x36\x9f\x33\x52\x22\ +\x9c\xa7\x04\x09\x33\x6a\x20\xae\x36\x5f\x41\x21\xb4\x35\xb6\x5d\ +\x21\xad\xa7\xb0\x6e\xb2\x1f\xa6\xae\xa9\x6e\xab\x22\xa1\xa2\xa4\ +\x17\x05\x06\x35\x06\x05\x48\x9b\x9d\xc6\x15\x05\x67\xd2\x94\xcf\ +\xa2\x06\x95\xb4\xdf\xae\x95\xdc\x3c\xde\x94\x07\x67\x07\x96\x07\ +\xdc\x06\xea\x99\x28\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\ +\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\ +\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\ +\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\ +\x44\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\ +\x8a\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\ +\xc9\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\x22\x44\ +\xa2\x96\x40\xe0\x2b\x0a\x3c\x35\x0a\x7f\x12\x08\x82\x36\x7e\x3f\ +\x71\x16\x7b\x88\x04\x09\x8b\x6a\x16\x8f\x36\x3f\x67\x17\x95\x35\ +\x97\x41\x17\x8e\x88\x91\x39\x6c\x5a\x87\x8f\x8a\xa2\x52\x19\x81\ +\x82\x84\x85\x86\x8e\x7d\xae\xb2\xb3\xb4\xb5\x4c\x05\x06\x35\x06\ +\x05\xb3\x05\x67\xbc\x51\x4b\x22\xb9\x82\x06\x4e\x93\x20\x95\x26\ +\x98\x21\xca\x5f\x9d\x21\xc4\x3c\xc6\x33\xc8\x1f\x07\x67\x07\x6b\ +\xa9\x23\x07\xc4\x06\xda\xb6\x1d\x8c\xb2\xa3\xb4\xcc\xb2\xe8\xae\ +\xe6\xb4\xe4\xe2\xef\x27\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\ +\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\ +\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\ +\x30\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\ +\x0f\x44\xb3\xe1\x7e\x88\x44\x2d\x81\xd0\xb8\x60\x43\x80\x82\x57\ +\x53\x44\x39\x08\xaa\xad\x39\x7b\x1d\x3f\x4a\x2d\x21\x31\xe3\x7d\ +\x3b\x62\x5b\x69\x67\x13\x7e\xd2\xb5\x75\x30\x14\xd6\x92\x49\xc5\ +\xda\x19\x9b\xe6\xe2\xbd\x23\x53\x54\x56\x57\x58\x61\x4c\x85\x89\ +\x8a\x8b\x8c\x8d\x57\x05\x06\x35\x06\x05\x8e\x16\x05\x6c\x35\x03\ +\x94\x43\x4f\x7b\x13\x91\x54\x06\x9c\x66\x18\x69\x43\x98\x3d\xa5\ +\x62\xa7\x73\x17\xa0\x3c\xa2\x3f\x79\x37\x18\x07\xa8\x03\x07\x51\ +\x9d\x1a\x07\xa0\x06\xb9\x95\xc1\xc2\xc3\xc4\xc5\xc6\xc7\x1d\xbb\ +\x28\xca\x22\xb3\x9e\x44\xa4\x40\x6d\x27\xb7\x23\xd5\x26\xd7\x21\ +\xce\x27\xdb\x23\xcc\x26\xdf\xc8\x89\xe1\xc2\xdd\xc4\xd9\xc3\xe8\ +\xe5\xd1\xc5\xe4\xe2\xef\x25\x11\x00\x3b\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\ +\x00\x00\x04\x2c\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x2e\x23\x00\x00\ +\x2e\x23\x01\x78\xa5\x3f\x76\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ +\xde\x03\x0c\x12\x06\x08\xae\xb5\x4a\x3d\x00\x00\x03\xb9\x49\x44\ +\x41\x54\x38\xcb\x5d\xcb\x5b\x4c\x5b\x75\x00\x07\xe0\xdf\xff\x9c\ +\xd3\x9e\x76\x6d\x69\xc1\x52\x84\xca\x40\x2e\x16\xc7\x9d\x31\x67\ +\x9c\x66\x03\x27\x73\x2f\x8a\x71\x2c\x12\x12\x12\x1f\xa6\x89\x2c\ +\x73\xc9\x36\x37\x13\x6f\x0f\x5e\xa2\xcc\x88\x0f\xb8\x87\x3d\x78\ +\x99\x09\x09\x4b\x34\xd1\x38\x86\x3a\xb9\x3a\x04\x06\x1d\x84\x6b\ +\xa1\x2d\xd0\x0b\xa5\xed\xa1\x17\x7a\x4a\xdb\x73\xf3\xc9\x17\xbf\ +\xf7\x8f\xe0\x7f\xea\x00\xac\xf6\x78\xb0\x7f\xb1\x10\x00\xd0\x07\ +\x50\xbf\x9d\x69\x36\x15\x55\xd5\x3f\x22\xe6\xab\xcd\xac\xbc\x64\ +\xcd\x65\x33\x82\x73\x79\x67\xa2\xa7\x7b\x36\xc8\xfc\x17\xaf\xff\ +\x74\x15\xee\x73\x9f\xe3\xd9\xf0\x3e\xd5\x4e\xb4\xf2\xbb\x57\x3a\ +\xcb\xac\x95\xcd\xaf\x2f\x14\x72\xf5\xad\x79\xe5\x15\xe1\x4c\xf2\ +\xf1\xd8\xf4\x10\x76\x84\x2d\x18\x92\x31\xec\x39\x82\xc3\x25\x96\ +\x83\x2d\x04\x00\x2e\x5f\xac\xc7\xf5\x1e\x3b\x00\xe0\x30\xa0\x39\ +\xd6\xf5\xd2\x25\x5e\x6f\x7c\x7f\x6e\x88\x66\x6d\x2f\x04\x51\x7b\ +\x54\xc0\xae\x5f\x40\x69\x41\x03\xbc\x53\x03\xd8\x18\xf7\x80\x4f\ +\x88\x23\xb6\x23\xc5\x2d\x14\x00\x68\xee\xd8\x71\xfe\xe7\x5e\xb4\ +\xb5\xe1\xc0\xe9\xdb\xbd\xb7\x72\x5a\xda\x3f\x76\xb8\xfd\x78\x30\ +\xf5\x9d\x1c\xe7\xb6\x51\x7a\x92\x81\x62\x52\x63\xda\x31\x89\xb9\ +\xbf\xfd\xf0\x2b\x40\xda\xc4\xc4\x3e\xb9\xb1\x92\xa1\x15\x1f\x8f\ +\xc1\x6c\x99\x4a\xda\x1a\xe9\x12\x53\xd5\x37\x74\x9e\xa5\xa3\xb1\ +\x22\x28\x91\x1c\x95\x8a\x11\x52\xe4\xe9\x4e\x03\x16\x07\x78\x84\ +\x97\x05\x78\xe7\x37\x40\xcb\xe9\x8c\x56\x94\x69\xa3\x4a\xee\x9e\ +\x73\x8a\x76\x82\xa1\x2f\x80\xa6\x77\xf0\xf5\xc4\xa7\x6f\xe9\x8a\ +\x6d\xbd\xae\xe1\x11\x29\x15\x72\xd0\xc9\x1d\x0e\x12\x05\x04\xdc\ +\x5e\x48\xfb\x09\xe8\xf2\x53\x70\xfc\xa9\xc8\x8f\xb2\x22\x65\xc8\ +\xa2\x6f\x5c\x7b\xbe\xbc\xab\xf1\xa3\x15\x85\x00\xc0\xbc\x32\x9a\ +\xfd\xfd\xef\x77\xdc\x81\x99\x87\x9a\x02\x36\xc2\xae\x8e\xfa\x90\ +\x65\x12\x11\xe6\x62\x30\x9b\x4f\x23\xbb\xf0\x14\x84\x3d\x23\x7c\ +\xbe\x10\x88\xb2\xb5\xb5\xe6\x2e\x6b\x5d\x9e\x79\xd3\xde\xda\x71\ +\x93\xd0\x00\xf0\x58\x53\xcb\xb5\x8d\x91\x6f\x4f\x1d\x88\x6d\x52\ +\xf6\xb1\x20\xd1\x54\x18\x91\x10\xd3\x38\x56\xdd\x83\x27\x6a\xda\ +\x50\x5d\x57\x8b\xd1\x87\x01\x94\x54\x14\x2b\x12\x2c\xc6\xd2\x43\ +\xe6\x8e\xe8\x5e\xcd\xf4\xc4\x1f\x17\x5c\x74\xdf\xe2\x6d\x53\x44\ +\xc5\xf6\x4c\xf5\xf5\x9b\xa3\x7e\x9e\x98\x73\x68\x44\x96\x7d\x28\ +\x50\xbf\x08\xe4\x34\xe1\xe5\xd6\x2a\xdc\x9b\x74\x81\x97\x15\x4c\ +\xce\x7b\xc9\x92\x33\x44\x68\x8d\x5a\xa5\xa5\x94\x13\x14\x9e\xfa\ +\x81\xa2\x8c\xf9\x15\x54\xc2\x63\x63\x58\x0d\x38\x5f\x1a\x9b\x0b\ +\x31\x68\x24\x82\x38\x7d\x1c\x95\x35\x79\x90\x28\x1a\x87\x8f\x94\ +\x40\x9d\x63\xc4\x1e\xab\x86\xd6\x92\x85\xcd\x9d\x38\x61\xb2\xb3\ +\x8a\xac\xe5\xb9\x8d\x54\x38\xb0\x5e\xe4\x78\x30\x02\x29\x1e\x05\ +\x51\x53\x90\x64\x05\xb1\x3d\x3d\x26\x96\x44\xc5\xbe\x16\x86\x27\ +\x18\xc7\x36\xc7\x43\xaf\x67\x90\x7b\xd0\x0c\xc5\xa8\x03\xa3\xd3\ +\x92\x86\xa3\x25\xe0\x79\xb1\x99\xe1\x9c\xc1\x48\x68\x66\x05\x11\ +\x2f\x0f\x0d\x14\x68\x55\x04\x1a\x35\x03\x5a\x21\xc4\xee\xe4\x94\ +\x8c\xd1\x43\x12\x94\x0a\x9b\xbc\x80\x24\xcb\x82\xe8\xb5\x60\x29\ +\x82\xd5\xb5\x20\x64\x31\x93\x62\xaa\xa4\xe8\xfd\x1d\x83\xe5\x33\ +\x29\x8f\xb7\xa6\x12\x9c\x64\xd0\xe8\x32\x3a\x2d\x1f\xdd\xd8\x4d\ +\xbc\x1d\x88\xa4\x35\x26\x5e\x42\x43\xa5\x05\x87\x74\x5a\x0c\xaf\ +\x85\x11\x57\x13\x45\xf0\xa4\xc9\xd2\xec\x3a\xb4\xa9\xf4\x10\x01\ +\x80\xfb\xeb\x23\x54\x55\x7e\x21\x9d\xda\xf5\xca\xf7\x06\x26\xa9\ +\xd7\x7e\xb9\x22\x9c\x4c\x5c\xfd\xd1\xa9\xb7\x75\xe8\x9f\xb4\x2a\ +\x6f\x9c\xad\x23\x65\x16\x13\xb8\xfd\x0c\xee\x8e\xaf\x63\x6c\x70\ +\x11\x8c\x2f\x3c\x4b\x85\x62\xc7\x19\xcf\xea\x2d\x7c\xf9\xd5\x7b\ +\x68\xef\x1f\x93\x18\x0a\xd0\xab\x21\xb5\x7b\x40\x14\xe5\xf2\x85\ +\x13\x67\x7e\x4d\x46\xf7\xd3\xe7\xc6\x1d\x1c\x5e\x6d\xb0\x60\x76\ +\x4b\xc4\x6e\x28\x01\x46\x10\x97\x52\xf1\x54\xa7\x7f\xed\xc3\x04\ +\x01\x00\x87\xeb\x2e\xb8\x40\x1c\xdb\xae\x05\xc4\xc2\x22\x3c\x3e\ +\x2b\x3e\xe8\xee\x02\x00\x3c\xf7\xca\xcd\x4a\xc5\x64\x38\x5b\x5d\ +\x5b\x58\xe0\xf2\x44\x64\xce\xbf\xfb\x17\xef\x0e\x0d\x2e\xff\x73\ +\x29\xfa\xcc\xf9\x7e\xfc\x0b\x0b\xb9\xbe\x45\x31\x2c\x8e\xcb\x00\ +\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x03\x16\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ +\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ +\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x02\x93\x49\x44\ +\x41\x54\x38\x8d\x95\x91\xbd\x4f\x1b\x41\x10\xc5\x67\xe1\x96\xbb\ +\xf3\x25\xd8\x46\xe1\x82\x20\x91\x2c\x45\x38\x42\x51\x94\x02\x19\ +\x21\x04\x1d\xa2\xa3\x80\xa3\x30\x05\x25\x12\x15\x32\x14\x44\x48\ +\xfc\x05\x54\x96\x28\x29\x4c\x45\x0f\xae\xa0\xc0\x20\x0a\x7a\xa0\ +\x20\x46\x48\x24\x0e\x8e\xb1\x8d\xe3\x23\xb7\xc7\xde\xde\xee\x5e\ +\x8a\xc4\x16\x1f\x49\xc1\x2b\x67\xde\xfc\xf4\x66\x06\x65\xb3\xd9\ +\x81\x20\x08\x52\x08\xa1\x38\x3c\x43\x41\x10\xe4\x11\x42\x69\xc5\ +\xf7\xfd\x85\x91\x91\x91\x01\xc3\x30\xd4\xe7\x00\x08\x21\xd1\xc3\ +\xc3\xc3\x05\x45\x4a\x19\x07\x80\x6a\xbd\x5e\x77\x9f\x03\xc0\x18\ +\x87\xa4\x94\x71\x85\x52\x0a\x94\xd2\x27\xc3\xb9\x5c\x2e\xba\xb7\ +\xb7\xf7\x2a\x16\x8b\xb9\xc9\x64\xb2\x64\x18\x86\xb8\xdf\x17\x42\ +\xb8\x94\xd2\x76\x85\x73\x8e\x82\x20\x68\x36\x6a\xb5\x9a\x92\x4a\ +\xa5\x3e\x5e\x5c\x5c\x84\x55\x55\x85\x83\x83\x03\xd8\xd8\xd8\x78\ +\x37\x3f\x3f\xff\x65\x6a\x6a\xea\xfa\x3e\x84\x73\x8e\x14\xc6\x18\ +\xe2\x9c\x37\x8b\x2b\x2b\x2b\x1f\x6e\x6f\x6f\xdb\x97\x96\x96\x2a\ +\x63\x63\x63\x2e\x00\xc0\xc9\xc9\x49\x5b\x22\x91\x70\xe6\xe6\xe6\ +\x3e\x25\x93\xc9\x6f\xc3\xc3\xc3\x3f\x01\x00\x18\x63\xa8\x85\x73\ +\x8e\xa4\x94\x20\xa5\x84\xb3\xb3\x33\xa3\x5c\x2e\x47\xa7\xa7\xa7\ +\x6b\x96\x65\x5d\xa9\xaa\x5a\x50\x55\xf5\x6a\x68\x68\xe8\x47\x26\ +\x93\xe9\xa8\x56\xab\xd1\xf5\xf5\xf5\xf7\x9e\xe7\x21\x29\x25\x70\ +\xce\x51\x0b\x63\x0c\x49\x29\x61\x7b\x7b\xbb\x6b\x6b\x6b\xeb\xad\ +\x69\x9a\x80\x31\xf6\x8e\x8e\x8e\x24\x63\x8c\x33\xc6\xd8\xf1\xf1\ +\x31\xdf\xdd\xdd\x8d\x99\xa6\x09\x9a\xa6\x69\xe9\x74\x3a\x2e\xa5\ +\x6c\x26\x00\x29\x25\x10\x42\xc2\xf9\x7c\xbe\x4b\xd7\x75\xd8\xd9\ +\xd9\x31\x4d\xd3\x0c\x1a\xc9\x84\x10\x6d\xcb\xcb\xcb\x15\x5d\xd7\ +\x61\x76\x76\xf6\x7a\x7c\x7c\xdc\xfd\x9b\x00\x94\xc6\x0a\x33\x33\ +\x33\x25\x00\x78\x71\x7e\x7e\xfe\x72\x71\x71\xb1\x18\x8d\x46\x5d\ +\x29\x25\x00\x00\xf4\xf6\xf6\x3a\x99\x4c\x46\xd5\x75\x1d\xfa\xfa\ +\xfa\xca\xba\xae\x13\xc6\xd8\x9f\x23\x36\x00\xae\xeb\xda\x96\x65\ +\x95\x4e\x4f\x4f\xef\x22\x91\x48\x79\x6d\x6d\x2d\xde\xdf\xdf\x5f\ +\xc1\x18\xcb\x5c\x2e\xf7\xc6\x71\x9c\xc8\xc4\xc4\x44\x05\x63\x5c\ +\xa7\x94\x8a\xe6\x17\xee\x1f\x11\x63\x5c\x1e\x1c\x1c\xbc\xcb\x66\ +\xb3\x86\x6d\xdb\x1d\x9b\x9b\x9b\xaf\x01\x00\x4c\xd3\x04\xcb\xb2\ +\x2a\x89\x44\xa2\xe4\x38\x8e\x78\xf0\x46\xdf\xf7\x51\x23\xaa\xe7\ +\x79\xbe\xe7\x79\xb5\xd1\xd1\x51\x6d\x72\x72\xf2\xeb\xcd\xcd\x0d\ +\xb6\x6d\x5b\xe9\xe9\xe9\xf1\x11\x42\xbf\x6c\xdb\xae\x35\xbc\x00\ +\x00\xbe\xef\x3f\x04\x34\x44\x08\xa1\x84\x90\xef\x9a\xa6\x69\x9d\ +\x9d\x9d\xd8\xb6\xed\x3b\x21\x04\x87\x47\xf2\x7d\x1f\x29\x00\x70\ +\x59\x28\x14\xc2\xdd\xdd\xdd\xec\xb1\x81\x10\x42\x01\x80\x3e\xae\ +\x03\x00\x14\x8b\xc5\x36\x00\xb8\x54\x42\xa1\xd0\xea\xfe\xfe\xfe\ +\x67\x21\x44\xec\x5f\xc6\xff\xa9\xb5\xb5\xf5\x32\x1c\x0e\xaf\xfe\ +\x06\x47\x78\x84\x8a\xac\x27\x36\x0e\x00\x00\x00\x00\x49\x45\x4e\ +\x44\xae\x42\x60\x82\ +\x00\x00\x03\x30\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\x4d\x00\x00\x0e\x9c\ +\x01\xde\xf6\x9c\x57\x00\x00\x02\xd2\x49\x44\x41\x54\x38\x8d\x6d\ +\x93\x4d\x68\x5c\x55\x14\x80\xbf\x73\xdf\x9b\xe9\xc4\x21\xcc\x4c\ +\x4c\xc6\x2a\x22\xb6\xa9\x93\x44\x0c\xa3\x62\xc1\x2c\x14\x9d\xd2\ +\x12\x35\x85\x52\x5a\x11\x6c\xa5\x1b\x71\x57\xe8\xce\xc5\x74\x37\ +\x82\x2e\xa5\x4b\x05\xcb\x20\xc6\x45\xdd\x48\x4a\xf0\x27\xf1\x07\ +\x69\xa4\x86\xc2\x98\xd0\xc4\x50\x14\x1a\x4d\x9b\x57\xf3\x63\xe0\ +\xbd\xe4\xdd\xf7\xee\xbd\x2e\x06\xa7\xb1\x7a\x56\xe7\x1c\x38\x1f\ +\x87\xc3\x77\x84\x7b\x62\x69\x69\xc9\x69\xad\xef\x6d\x03\x90\xcd\ +\x66\xa9\x54\x2a\xb2\xbb\xe7\xef\x2e\x5a\xad\x96\xdb\xba\xd0\xc0\ +\x9f\xbe\x8c\x12\xc1\xcb\x08\xce\x82\xb5\x0e\xa7\x1c\x5b\xcf\x8f\ +\xd1\x6a\xb5\x5c\xb5\x5a\xed\x40\x3a\xc9\xcc\xcc\x8c\x53\xcd\x0b\ +\xdc\xf7\xed\x57\x78\x22\x74\xed\xf5\x31\xeb\x16\x44\xf0\xef\x57\ +\x6c\xdf\x4a\x30\xc6\x12\xd5\x0e\x63\x4e\x9f\x65\x64\x64\x44\x3a\ +\x80\xe9\xe9\x69\xe7\x35\x3f\xa0\x77\x76\x8a\x6c\xc6\xc3\xf7\x05\ +\x3f\xeb\xa1\x3c\x01\x0b\x56\x1c\x26\xb5\x24\x3b\x16\x9d\x1a\xd6\ +\x0e\x1e\x22\x3d\xf5\x26\xb5\x5a\x4d\x64\x62\x62\xc2\x75\x7d\xfa\ +\x11\xe5\xab\xdf\xb3\x99\x11\x36\x8d\x63\xef\x9e\x0c\x7b\xba\x3d\ +\x82\x6d\x8b\x00\xbd\x5d\x42\x12\x59\x56\xa2\x04\x8b\xa3\x94\x3a\ +\xf4\xb3\x2f\x12\xbf\x76\x06\x15\x04\x01\x3d\x3f\x7c\x83\x38\x21\ +\x1e\x3d\xc6\xd8\x42\xc0\xce\xcb\x27\x59\x13\xc7\xa1\xd9\xdf\x79\ +\xe1\xc7\xdf\x28\xbc\x7b\x91\x2b\x5b\x09\x47\x17\x02\x8e\xce\xdf\ +\x22\x7f\xfe\x3d\xf4\x77\x5f\xb3\xba\xba\x8a\x0a\xc3\x10\x25\xa0\ +\xb2\x42\xe1\xf1\xa7\xd8\xd9\xdc\xa0\xfb\x89\x2a\x6e\xbb\x7d\x9e\ +\xcf\xde\x38\xc6\xc3\x07\x9f\x23\xdf\xdf\x0f\xc0\xf8\xe9\x93\x3c\ +\xfd\xfa\x19\x36\x4a\xbd\x84\x61\xd8\x06\x58\x0b\x6b\x91\xa1\x6f\ +\xb8\x4a\xeb\xd2\x38\xbd\x83\xc3\xfc\xa9\x0c\x69\x9a\xf2\xcc\x5b\ +\xe7\xb8\x73\x63\x91\x70\xf9\x0f\xd2\x34\x25\xd7\x53\x20\x35\x06\ +\x67\xcc\x5d\x80\x01\xee\x28\x45\x71\x7f\x85\x6b\x1f\x5f\xa4\x7b\ +\x5f\x3f\xb7\xb7\x1c\x71\x1c\xb3\x7c\x6d\x96\x5c\xdf\x83\xa8\x62\ +\x81\x38\x8e\x39\xf2\xce\xfb\xfc\xd4\xfc\x90\xe2\xe6\x3a\x51\x14\ +\xe1\x87\x61\x48\x92\x18\xa2\x47\x2b\x58\xa5\x38\xde\xbc\x84\x01\ +\x72\xfb\x0f\xa0\xb5\xe6\xe7\x4f\x9a\x0c\xbe\x7a\x0a\x3f\x5f\x44\ +\x6b\xcd\xf8\x93\xfb\x18\x44\xe8\x43\xda\x1b\x44\x51\x84\x4e\x0c\ +\xde\xc0\x10\x2b\x73\x2d\xa6\xce\xbf\xcd\xed\xeb\xf3\x94\x2a\x43\ +\x68\xad\x39\xf1\xf9\x14\x37\xaf\x5e\x61\xe3\xfa\x3c\x5a\x6b\x4a\ +\x0a\xf2\x16\x92\x24\x25\x8a\x22\xa4\x5e\xaf\xbb\x07\xa6\x26\xc9\ +\x2d\x2d\xe0\x7b\x8a\x03\x39\x9f\x65\xe7\x40\x14\x4a\xb5\x45\xe9\ +\x51\x0a\x27\x8e\x20\x4a\x29\x88\xa3\xa8\x60\xee\x91\x01\x56\x6a\ +\xa3\x6d\x91\xea\xf5\xba\x2b\x7f\x39\x49\x75\xe5\x17\x24\x01\x25\ +\x42\xae\xe0\x63\x22\x07\x80\x97\x17\xe2\xbf\x0c\xd6\x39\x5c\xc6\ +\xd1\x7a\x68\x80\xd5\xc3\x2f\xd1\x68\x34\xa4\xa3\x72\xbd\x5e\x77\ +\xe5\x2f\x2e\x33\xf8\xeb\x02\x9e\x08\xa2\xa4\x6d\xa2\x03\xac\xc3\ +\xe2\x48\x8d\x63\xb1\x7f\x88\xe0\xc8\x2b\x34\x1a\x8d\xbb\x2a\xef\ +\x86\x94\x26\x27\x78\x6c\x71\x0e\x2f\xeb\xe1\x2c\xe0\x40\x7c\x30\ +\xb1\xe1\xc6\xd0\x30\xeb\xa3\x63\x9d\xe1\xff\x00\xfe\x81\x04\x41\ +\xf0\xbf\xef\x5c\x2e\x97\xff\x35\x0c\xf0\x37\x5c\xfc\x53\xd5\x3a\ +\x96\xb0\xec\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x02\x4a\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ +\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ +\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x01\xc7\x49\x44\ +\x41\x54\x38\x8d\xa5\x93\xcd\x6a\x1a\x61\x14\x86\x1f\x33\x0e\x05\ +\x4d\x47\xda\x88\x64\x53\x14\x83\x43\x76\xc6\x95\x4c\x5d\xb9\x33\ +\x05\x17\xdd\x64\x99\x45\x2e\x20\xbd\x82\x76\x51\x7a\x03\xbd\x82\ +\x76\x93\x95\x0c\x82\x8b\xe2\x76\x32\xe8\x6a\x04\x85\x04\xa2\xd0\ +\xa2\x14\x84\x80\xc5\x9f\x5a\xb5\xf0\xa5\xa7\x1b\x2d\x93\xa1\x29\ +\x14\x0f\x9c\xcd\x39\xe7\x79\x39\x3f\xdf\x17\x12\x11\xb6\xb1\x9d\ +\xad\xe8\x07\x04\x12\x40\x1a\x88\xfa\x62\x51\xe0\x60\x9d\xfb\xa7\ +\xc0\x7e\x3e\x9f\x3f\xd6\x75\xfd\xa3\x6d\xdb\xe6\x1a\x8c\xda\xb6\ +\x6d\xea\xba\xfe\x21\x9f\xcf\x1f\x03\xfb\xf7\x08\x11\xd9\x78\xc2\ +\xb2\xac\x53\xa0\x0b\x5c\x69\x9a\x76\x59\xad\x56\x8f\xaa\xd5\xea\ +\x91\xa6\x69\x97\xc0\x15\xd0\xb5\x2c\xeb\x54\x44\x12\x1b\x2e\xe4\ +\x5b\x62\x3a\x95\x4a\xbd\x1f\x0c\x06\x4f\x00\x01\x1e\x85\xc3\xe1\ +\x39\x80\x52\x6a\x17\xf8\x09\x84\x92\xc9\xe4\xb8\xdf\xef\xbf\x02\ +\xbe\x04\x47\xb8\xf5\x3c\xef\x22\x93\xc9\x5c\x03\x0b\x60\xac\x94\ +\xd2\x94\x52\x1a\x30\x06\x16\x99\x4c\xe6\xda\xf3\xbc\x0b\xe0\x76\ +\x03\x85\x02\x67\x34\x46\xa3\xd1\x8b\x42\xa1\xf0\xbc\xd7\xeb\x3d\ +\xf3\x27\x4c\xd3\xfc\xda\x68\x34\x9a\xf1\x78\xfc\x13\x30\x7b\x68\ +\x89\x77\xad\x56\xab\xb7\x5c\x2e\xf7\xd6\x5d\xfc\xf1\xd5\x6a\xf5\ +\xb4\xdd\x6e\x77\x81\x3b\x3f\xe0\xef\x20\x5a\xaf\xd7\x0f\xca\xe5\ +\xf2\x6b\xa5\x94\x02\xe6\x01\xf1\x5d\x5d\xd7\xb5\x5a\xad\xf6\xae\ +\x54\x2a\x7d\x06\x7e\x04\x05\xd2\xb1\x58\xec\xcd\x6c\x36\xfb\x05\ +\x7c\x07\xc8\x66\xb3\xdf\x00\x3a\x9d\xce\xde\xba\xe6\xb1\x61\x18\ +\x3b\xd3\xe9\xf4\xed\xdf\x96\x38\xaf\x54\x2a\xcd\x48\x24\x32\x04\ +\x16\xb9\x5c\x6e\xe8\x38\xce\x8d\xe3\x38\x37\xb9\x5c\x6e\x08\x2c\ +\x22\x91\xc8\xb0\x52\xa9\x34\xef\x75\xe7\x7b\x07\x88\xc8\xa1\xeb\ +\xba\x67\xc5\x62\xf1\x7c\x32\x99\x9c\x88\x88\x21\x22\xc6\x64\x32\ +\x39\x29\x16\x8b\xe7\xae\xeb\x9e\x89\xc8\xa1\x9f\x09\x0a\x20\x22\ +\xa6\x88\xbc\x5c\xc3\x9b\x98\xb1\x8e\x99\xc1\xfa\xe0\x19\xff\xdb\ +\xb6\xfe\x8d\xbf\x01\x7c\x52\x08\x38\x8e\xd7\x1d\xc8\x00\x00\x00\ +\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x02\x73\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ +\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ +\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x01\xf0\x49\x44\ +\x41\x54\x38\x8d\xa5\x92\x4f\x6b\x1a\x61\x10\xc6\x7f\xae\x8a\x55\ +\x8a\xed\xcd\x20\x14\xb2\x87\x88\x87\x42\x4d\x3c\x49\x3d\xec\x25\ +\x64\x03\x7b\xc9\xc1\xdc\x3c\xf5\xb0\xb7\xc6\x9b\x5f\x20\x1f\x40\ +\xea\xb9\x9f\xc0\xe0\xa9\x37\x21\x14\x12\x59\x58\xd8\x84\x42\xa1\ +\xe0\x69\x89\x60\x4c\x2f\x49\xb5\xa8\xc4\x3f\xd3\x43\xde\xb5\x26\ +\x48\x28\x74\xe0\x85\x79\x67\x9e\x79\x98\x99\x67\x42\x22\xc2\xff\ +\x58\xe4\x99\x5c\x1a\x78\xa9\xfc\xdf\x40\x6f\x2d\x4a\x44\x56\xdf\ +\x2b\x11\xd1\x45\x24\x6d\x59\xd6\x01\x70\x03\xdc\x58\x96\x75\x20\ +\x22\x69\x11\xd9\x54\x98\x65\xcd\xa3\x62\xdb\xb6\x77\x43\xa1\x90\ +\x97\x4a\xa5\x8e\x63\xb1\xd8\x09\x70\x09\x5c\xc6\x62\xb1\x93\x54\ +\x2a\x75\x1c\x0e\x87\x1d\xdb\xb6\x77\x57\x49\x42\x2b\x3b\xd8\x8c\ +\x46\xa3\x9f\x67\xb3\x59\x52\xb5\x3e\x01\xc6\x2a\x17\x07\x5e\x00\ +\xa3\x48\x24\x72\x37\x9d\x4e\x3f\x00\x3e\x80\xb6\x32\xcd\x7d\xb9\ +\x5c\xfe\x02\x0c\x81\x6b\xe0\x56\x91\x4c\x94\x7f\x0d\xfc\x52\x98\ +\xfb\xa7\x4b\x4c\x97\x4a\xa5\x9d\x56\xab\xb5\xa5\x0a\x48\x26\x93\ +\x77\x95\x4a\xe5\x1b\x40\xad\x56\x7b\x37\x18\x0c\x5e\x03\x34\x9b\ +\xcd\xad\xe1\x70\xb8\xd3\x68\x34\x00\x7a\xc1\xfc\x19\xe0\x02\x68\ +\x01\x4d\xa0\x59\xad\x56\x8f\x44\x64\x5b\x44\xb6\xab\xd5\xea\x51\ +\x10\x57\x98\x0b\x11\xc9\x88\xc8\x5f\x19\x35\x4d\xfb\xb1\x58\x2c\ +\x42\xc1\xbf\xdd\x6e\x0f\x80\xfe\x8a\x3f\x51\xa9\x89\xa6\x69\x3f\ +\x97\x75\x81\xce\xae\xeb\x9e\x19\x86\xd1\x09\xe6\x76\x1c\x67\x5f\ +\xd7\xf5\x43\x5d\xd7\x0f\x1d\xc7\xd9\x0f\xe2\x86\x61\x74\x5c\xd7\ +\x3d\x53\xb7\xb1\x24\xe8\xe5\xf3\xf9\xd3\x6c\x36\x7b\x15\x00\xe7\ +\xf3\xf9\xc0\xf7\xfd\x3d\xdf\xf7\xf7\xe6\xf3\x79\xd0\xc1\x24\x9b\ +\xcd\x5e\xe5\xf3\xf9\x53\xd4\x61\x3d\x92\x31\x91\x48\x7c\x1c\x8f\ +\x03\xe5\xd6\x5b\x3c\x1e\x67\x34\x1a\x7d\x62\x8d\x8c\xb7\x9e\xe7\ +\xb9\xb9\x5c\xae\x5f\xaf\xd7\x3b\xa6\x69\x76\x79\xb8\x83\xb1\x69\ +\x9a\xdd\x7a\xbd\xde\xc9\xe5\x72\x7d\xcf\xf3\x5c\x1e\x64\xe5\x69\ +\x07\x00\x1b\xc0\x7b\xa0\xeb\x38\x4e\xba\x58\x2c\xbe\x05\x38\x3f\ +\x3f\xff\x5e\x28\x14\x7a\xc0\x1b\xa0\x1d\x2c\x77\x1d\xc1\xaa\x65\ +\x00\x43\xf9\x5f\x81\xce\x3a\xd0\x73\x04\xff\x64\x7f\x00\x19\x1e\ +\x09\x5d\x0e\xd9\xff\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\ +\x60\x82\ +\x00\x00\x03\xb1\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ +\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ +\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\x5e\x1a\ +\x91\x1c\x00\x00\x03\x56\x49\x44\x41\x54\x48\xc7\xdd\x95\x4d\x68\ +\x5c\x55\x14\xc7\x7f\xf7\xe3\xbd\x97\xe9\x34\x69\x5a\x93\x60\xdb\ +\x80\x60\xc1\x12\x9a\x20\x0d\x49\x88\x50\xca\x43\xbb\x70\x93\x85\ +\x62\x41\x2b\xea\x42\xb0\xb8\xb2\x20\x08\x6e\x64\xd0\x55\x4b\x2d\ +\x48\x37\x22\x48\x10\x8c\x20\xba\x09\x45\xa4\x12\xe2\x98\x8a\x29\ +\x1a\xa4\x92\x6a\x6d\x4a\x9b\xb4\x19\x9d\x98\xc4\xb1\xd3\x99\x79\ +\xf3\xde\x9b\xf7\xee\x75\x51\x2c\xe4\x63\x31\xc1\x6e\xf4\xec\xee\ +\xc7\x39\xbf\x7b\xee\xb9\xff\x73\xe1\xbf\x6e\xa2\x99\x4d\xfd\x9f\ +\x3e\xd4\xff\xdc\x23\x2f\x7d\x38\xbe\xf0\xc9\xa3\x8e\x94\xc1\xc1\ +\xae\xc1\xc9\xa1\xae\x43\x6f\x3c\xbb\xef\xd5\x5f\xb7\x04\xc8\xe7\ +\xf3\x76\xb3\x4d\x1f\x94\x4f\xf3\xee\x91\xf7\x99\x2d\xcd\x90\xda\ +\x98\x30\x89\x28\xdd\x5e\x65\xdf\x9d\x83\x9b\x06\xf5\x7d\xff\x5e\ +\x5c\xbd\x7e\x31\x9f\xcf\x6f\x70\xb8\xb6\x67\x8e\x6f\x0a\x13\x74\ +\x74\x08\x04\x29\x5e\xb5\x8d\xc9\xf9\x2f\x58\x9c\x2d\x6f\x16\x7c\ +\xcd\x58\x6f\x76\x82\x5c\x2e\xb7\x26\xb3\x87\x3f\xda\xf5\x43\x6c\ +\xa2\x81\xdf\x6a\xab\x08\x04\xd9\x44\x33\x2f\xaf\xce\x8c\xe5\x26\ +\x06\xd7\xf9\x6d\xb8\x01\xdd\x4c\x0d\x52\x63\x48\xad\x21\x6c\xc4\ +\x08\xa0\xc5\x1a\x8c\x69\xae\xc8\x4d\x01\x4c\x6a\x30\x58\x6a\x71\ +\x08\x08\xda\x74\x4a\x6a\xec\xfd\x03\x24\xc6\x24\xc6\x1a\xea\xc9\ +\xdd\x0c\x8c\x34\x24\xa9\x49\xb6\x04\x38\x3b\x73\xb6\xb7\x20\x0b\ +\x9c\xeb\x3c\x07\xa7\xf9\xde\xd3\x5a\x68\x29\xd1\x52\x26\x89\xb1\ +\x7d\x49\x9a\x12\x36\x42\xa4\x10\xc4\x6e\x8c\xc5\xf6\x0d\x7e\xde\ +\x3d\xed\x69\xad\x1d\xad\xd0\x12\xbb\xcc\x4f\xd4\xf6\xec\x67\xa2\ +\xf8\x59\xcf\x91\xdd\x47\xaf\xac\x01\xcc\xfd\x39\xf7\xde\xa9\xc7\ +\x4f\x51\x11\x65\x8e\xc6\x4f\x0f\x4a\x29\x11\xc2\x82\x00\x29\x04\ +\x59\x37\x63\x83\x30\x10\x00\x9e\xf2\xec\xf1\xde\xd7\xb3\x4a\xa8\ +\x61\x29\x24\x5a\x2a\xb6\x39\x59\xb6\xeb\xed\x34\x08\xf8\xea\xd6\ +\xd8\x3b\xc0\x33\x6b\x00\xa3\x97\x46\x87\x0f\x74\xf4\x70\xa3\x72\ +\x85\x62\x58\x44\x6a\x85\x52\xa0\x94\x44\x0b\xc9\x5c\x60\x44\xc3\ +\x84\x48\x01\xd3\x2b\x93\x42\x0b\x05\x48\x5a\x9d\x76\x8c\x51\xfc\ +\xb2\x74\x8d\x1b\xc5\x45\x5e\x1c\x1a\x61\x29\x28\x3c\xb9\xe1\x8a\ +\x82\x28\xb0\x97\x57\x7e\x26\x30\x65\x6a\x69\x1d\x65\x25\xca\x48\ +\x1c\xa3\x70\xd4\xdd\x6c\x94\x54\x78\xca\xa3\x45\xb5\xa0\x71\xa9\ +\xc4\x55\xbe\xfb\xe3\x22\xf3\xa5\x5b\x54\xc2\x90\xac\x69\xa7\xd6\ +\xa8\xd2\x30\xe9\xc6\x1a\x58\x63\xc7\xa7\x16\x2e\x1c\xeb\xe9\xec\ +\xc1\x53\x6d\x68\xa9\xf0\x94\x8b\x87\x8b\x46\xd1\xea\x64\xec\xc5\ +\xe5\xf3\xc2\xca\x98\xa1\xce\x27\x6c\x10\xd7\x85\x12\x9a\xbe\x07\ +\x0e\xd0\xb7\xab\x17\x8b\xc5\x95\x8a\x42\x78\x95\xc4\xa4\xe3\x9b\ +\x01\x4e\x64\xa2\xcc\xb1\xa9\xcb\x53\x14\xdd\xe2\x0c\x02\x90\x20\ +\x24\x89\xab\x54\xdf\x53\xfb\x47\xb2\x5a\x5b\x32\x6e\x96\xdb\xf5\ +\xbf\xc4\x97\x0b\xe7\x6b\x9e\x23\x67\x5d\xa5\xb4\xab\x14\xae\xd6\ +\xec\x8c\x3a\x06\xba\xdb\xbb\x89\x68\x9c\xd8\xf8\x4c\xdf\x66\xe5\ +\x64\xfe\x24\xf9\x7c\x9e\xdc\x9b\xb9\x7b\x0a\xb5\x80\x39\x63\xa7\ +\x83\x24\x18\xd6\x8e\xc4\xd3\x92\xba\x09\x48\x4c\x32\x7b\xf3\x85\ +\xca\x63\x6b\x95\xfc\xb2\xf5\x7d\x1f\xdf\xf7\x57\xfe\x99\x93\x4d\ +\x29\xd9\xa2\xab\x71\x15\x8b\x45\x29\x41\x64\x42\x52\xd3\x9c\x86\ +\x9a\x53\xb2\x35\x54\xa2\x0a\xa9\x13\x92\x71\x15\x51\x5c\x25\x69\ +\xb2\x57\x34\x05\xc0\xc0\x6a\xbd\x8c\x67\x22\xea\x8d\x06\x36\x89\ +\x48\xed\xbf\x00\xac\xef\x8a\x1f\xcb\x51\x5c\x62\x16\x4b\x15\x56\ +\x74\x8d\xbd\xdb\xba\xd9\x5b\xef\x1e\x78\x2d\xf7\xbc\xdd\x32\x60\ +\x7d\x3f\x07\x98\x5b\xfe\x1a\xe9\x2d\xb2\x50\x2d\x61\x52\x4d\x97\ +\xde\x8d\xd3\xea\xe0\xf7\xfb\xf7\xe7\xcb\x1c\x19\x7b\xf0\xd0\x1d\ +\xd4\x99\x0b\x4b\xbf\x0f\xb4\x7b\x3b\xea\x87\x77\x1e\xfe\xf6\xd2\ +\xf5\x1f\x5f\x59\x78\xab\x70\x93\xff\xbd\xfd\x0d\xf6\xbd\x75\x1d\ +\x3b\xea\x7e\x89\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\ +\x00\x00\x04\x7f\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ +\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ +\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\ +\x00\x00\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\ +\x5e\x1a\x91\x1c\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x01\x0a\ +\x17\x02\x30\xf6\x73\x58\xfb\x00\x00\x03\xff\x49\x44\x41\x54\x48\ +\xc7\xbd\x95\x6b\x4c\x9b\x75\x14\xc6\x9f\xb7\xd7\xc1\xe8\xe8\xca\ +\x66\x3b\x4a\xc9\x80\x7a\x03\x5a\xca\x8c\x81\x99\x60\x5e\x37\x2e\ +\x92\x2c\xd9\x07\x2c\x4a\xe4\x36\x32\x34\xc6\x84\x0c\xe2\x40\x12\ +\x63\x5f\xb2\xa8\x89\x41\xe2\x52\xd6\x80\x51\xc1\x38\xa5\xc8\x75\ +\x1b\x42\x3b\x88\x62\x59\x02\x6c\x0c\x07\x04\x4a\xe2\x56\x20\x8b\ +\x5c\x02\x65\xa9\xb6\x89\xbc\x57\xbf\xa0\x21\x0a\x8c\x6e\xd1\xf3\ +\xf9\x7f\xce\xef\xfc\x9f\x73\x9e\x1c\xe0\x3f\x0e\xe2\x51\xf3\x2a\ +\x2a\x2a\x4c\x99\x99\x99\x65\xa1\xa1\xa1\xa9\x1c\xcf\xc9\xfc\x7e\ +\xdf\xdd\x55\xef\x5a\x6b\x6d\x4f\xdd\xe5\x99\xb6\x19\xfa\xb1\x9a\ +\xb2\x58\xde\x2b\x59\x5c\x5a\xa4\x39\x8e\x15\x7c\x3e\x9f\x30\x37\ +\x3f\x27\xdc\x1e\x1f\x13\x3a\x3a\xdb\xf8\x8a\x77\xce\x59\x01\x48\ +\xfe\x7a\x2c\xd9\x9a\x39\x38\x38\x28\x3c\xac\x7a\x4d\x4d\x8d\x3e\ +\xf5\xf8\x0b\xf5\x52\xa9\x54\xca\x32\x1c\xc4\x12\x31\x5a\xed\x76\ +\xbe\xa3\xa3\xc3\x73\xe7\xce\x44\x0f\xc3\x30\x76\x00\xc2\xb6\x80\ +\x4d\xc8\xae\x00\x85\x62\xff\xe9\xf0\x70\x45\x08\xc7\x71\x60\x58\ +\x1a\x04\x41\xa0\xb7\xcf\xf1\xf5\xad\x5b\x63\xd5\x14\x45\x2d\x92\ +\x24\x79\x8e\x24\x49\x62\x47\x00\x00\x50\x14\xb5\xd3\x6c\xc4\x45\ +\x45\xf9\x76\x8f\x67\x1e\x31\x31\x7a\x30\x0c\x03\x91\x58\x8c\x23\ +\x1a\x8d\x1b\xc0\xf2\x76\x09\xa2\x20\xf5\x0f\x79\x36\x3e\xe1\x79\ +\xb7\x7b\x06\x2c\xcb\x80\x65\x59\xb0\x0c\x8b\xc2\xc2\x82\xf4\xf8\ +\xf8\x78\xe9\xd6\xc6\xaa\xaa\xaa\xc2\x83\x06\xa4\xa5\xa5\x3d\xa5\ +\xd7\xc7\x45\x4b\xa5\x32\xb8\x67\xdc\x20\x08\x02\x2c\xcb\x20\x56\ +\x1f\x97\x5e\x5c\x5c\xd0\x5b\x56\x56\x16\xbd\xbc\x7c\xff\xb9\xeb\ +\xd7\x9d\x5f\x28\x0e\x84\x8d\x05\x0b\x20\x48\xf2\xc5\x53\x5a\xad\ +\x96\xd0\x6a\xb5\xe8\xec\xea\xc6\x47\x1f\xd7\x82\x65\x59\xec\x93\ +\xcb\x11\xa5\x8b\x3e\x19\xba\x3f\x64\x56\x1f\xf7\xcc\x58\x64\x64\ +\x64\xc9\x90\x6b\xe8\x41\xb0\x00\x79\xa2\xc1\x98\x73\xf7\xde\x1c\ +\x3a\xbb\x7b\x60\x3a\x76\x0c\x3d\x0e\x07\x26\xa7\xa6\x00\x01\xd0\ +\xe9\x74\x08\x0b\x0b\x0b\x91\xed\x93\x11\x23\xa3\xa3\x6c\x7f\xff\ +\x40\x4b\x30\x00\x82\xa2\xde\x37\x27\x9b\x4c\x46\x43\x42\x02\x7e\ +\x5d\x5a\x82\x58\x24\x42\x6c\x4c\x0c\x5a\xdb\xdb\xc1\xf3\x3c\x94\ +\x4a\x25\x08\x82\xc0\xac\x7b\x56\xa8\xae\xac\x76\xf2\x3c\xdf\xb2\ +\xe3\x16\xfd\xb3\xb8\xcd\x66\xcd\x4b\x49\x39\xde\xb8\xb2\xb2\x02\ +\x83\xc1\x80\xec\xac\x0c\xf4\x3a\x1c\x38\x1a\xa5\x85\x29\xc9\x08\ +\x99\x5c\x86\xd5\xd5\x15\xac\x7b\xd7\x99\xd7\x2d\xf9\xdf\x33\x0c\ +\x53\x0d\x60\x05\xdb\x78\x40\xa0\x28\xea\x6f\x93\x98\xcd\x66\x71\ +\x73\xf3\x97\x96\xcb\xdf\x7e\xc3\x65\x65\x65\x09\x29\xa9\x29\x82\ +\xcb\xe5\x12\x3c\x9e\x7b\xc2\x8f\x83\x3f\x70\x79\x79\xaf\xfd\xf6\ +\x12\x49\xce\x91\x24\xe9\x12\x8b\xc5\x56\x00\x85\x9b\x66\xdd\xdd\ +\x07\x00\x50\x52\x52\xa2\x38\x91\x71\xa2\x69\x7a\x6a\x3a\xc7\xe9\ +\x74\x22\x42\x15\x01\x9d\x2e\x1a\x6a\x8d\x9a\xbf\x74\xc9\x76\xd3\ +\x6a\xb5\x5e\xa3\x69\xfa\x36\x80\x39\x00\x6b\x00\xfc\x14\x45\x6d\ +\x6c\xa6\x0b\xbb\x02\xca\xcb\xcb\xf5\xa6\x64\x43\x47\x5b\xeb\x77\ +\xc6\xf1\xf1\x9f\xa1\x52\xa9\xc0\xb2\x2c\xce\x14\x17\x09\x36\x9b\ +\xad\xeb\xe2\xa7\x17\x2b\x01\x2c\x00\xe0\x1e\xa6\xef\xbf\x00\x7e\ +\xbf\x2f\xfb\xc9\xa7\xe3\x46\x6c\xb6\x86\x88\xf9\xf9\x05\x48\xa4\ +\x12\xd0\x34\x8d\x97\xb3\xb3\x30\x39\x39\xe5\xda\x2c\xee\xd9\xeb\ +\xea\x6d\x05\x48\xaf\x5e\xed\xae\x3e\xac\x3e\x7c\xad\xa1\xe1\x33\ +\xc9\xda\xaa\x17\x22\x91\x08\x1c\xcb\x21\x29\x39\x09\xaa\x83\xaa\ +\x5f\x4a\x4b\xdf\x38\xbf\x29\x09\x82\x02\xe8\xf5\x7a\x79\xd1\x99\ +\xfc\x7a\xb5\x5a\x73\x76\x7a\x7a\x1a\x07\x14\x0a\xd0\x1b\x34\x02\ +\x81\x00\xa2\xa2\xa2\x90\x71\x32\xdd\x5b\x79\xbe\xaa\x12\xc0\xf8\ +\x56\x7d\xf7\x12\x22\x00\x78\xf3\xad\xd2\x2a\x8e\xe3\x72\x9b\x9a\ +\xbf\x7a\xd7\xbb\xfe\xe0\x15\xf3\xab\xe6\xfb\x4a\xa5\x12\x5a\xad\ +\x16\xc5\xc5\x85\x1b\x9f\xd4\xd6\x7d\xe0\xf5\x7a\xfb\xf6\xa2\xf9\ +\xb6\x3f\x38\x14\x71\xc8\x7c\xa5\xeb\xca\xcd\xe1\x1b\xc3\x8d\xc3\ +\x37\x86\x7d\x26\x43\x82\xc6\x68\x34\xd4\x27\x1a\x12\x79\x7b\x8b\ +\xfd\xf3\xdc\xdc\xdc\x3a\x00\x75\x8f\x72\x9d\x24\x00\x20\x97\xcb\ +\x7e\x57\x1f\xd1\xa8\x01\xa8\x01\xf8\xff\x60\x99\x27\x92\x93\x93\ +\x04\x47\x9f\xa3\xdb\x62\xa9\x79\xfb\xb1\x6f\x72\x63\xa3\xad\x20\ +\xfc\x60\x78\xd3\xe8\xc8\xe8\x08\x41\x10\x0b\x31\xb1\x47\x73\x7e\ +\x1a\x1c\xea\x6f\x6f\xeb\x2c\x0b\x76\xa8\x3b\x1d\x7d\xd1\x85\x0f\ +\x2f\x14\x31\x0c\x7d\x36\x10\x08\x10\x13\x13\x93\x3d\x03\xce\x81\ +\x66\x00\x4b\xc1\x0e\xf5\x7f\x8f\x3f\x01\x2e\x51\xa3\xa9\xc7\xde\ +\x69\x7b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x20\x26\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\ +\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ +\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\ +\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\ +\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x02\x15\ +\x0e\x23\x2f\xab\xc9\xe5\x0b\x00\x00\x00\x1d\x69\x54\x58\x74\x43\ +\x6f\x6d\x6d\x65\x6e\x74\x00\x00\x00\x00\x00\x43\x72\x65\x61\x74\ +\x65\x64\x20\x77\x69\x74\x68\x20\x47\x49\x4d\x50\x64\x2e\x65\x07\ +\x00\x00\x1f\x7d\x49\x44\x41\x54\x78\xda\xcd\x9b\x69\x90\x5d\xd7\ +\x71\xdf\x7f\x7d\xee\xfa\x96\xd9\x07\xc4\x00\x33\x18\x02\x03\xae\ +\x22\x45\x53\x0b\x25\xd2\x91\x44\x53\x8a\x2d\x89\x91\x17\xad\xa4\ +\x2c\x5b\x52\x12\xc9\xf1\x56\x72\xca\xa9\xe4\x4b\x2a\x1f\x52\x89\ +\xbf\x38\x49\x39\x72\xe2\x4d\x92\x63\x4b\xb1\x55\x12\x4d\x49\xb4\ +\xc5\x45\x24\x41\x10\xa0\x44\x09\x80\x28\x42\x22\x41\x12\xfb\x3a\ +\x33\x00\x66\x06\xb3\xbf\xed\xde\x7b\x4e\xe7\xc3\xb9\x6f\x30\x00\ +\x41\xed\x76\xe5\x56\xdd\x79\x6f\xee\xf6\x4e\xf7\xe9\xfe\x77\xf7\ +\xff\xf4\x85\x1f\x73\x7b\xf1\xc5\x17\xf9\xff\x65\xfb\x49\xc6\x12\ +\xfe\x34\x06\x70\xe0\xc0\x81\xde\x9e\x9e\x9e\x9f\x37\xc6\xbc\x4e\ +\x44\x7a\x01\xfb\x8f\x24\x6b\xa0\xaa\xcb\xce\xb9\xef\xac\xac\xac\ +\x3c\x7e\xf3\xcd\x37\x2f\xff\xa4\x0f\x94\x1f\xe7\xa6\x3d\x7b\xf6\ +\x70\xfb\xed\xb7\x03\xf0\xf5\xaf\x7f\xbd\x32\x3a\x3a\x7a\x6f\xad\ +\x56\xfb\x70\x14\x45\x37\x1b\x63\x22\x40\x45\x04\x91\x2b\x3f\xfe\ +\xf2\xe3\xaa\xfa\x8a\xbf\xa5\xaa\xeb\xcf\x8b\x73\x2e\xcf\xf3\xfc\ +\x40\xa3\xd1\xf8\xdc\xd4\xd4\xd4\x17\xde\xfc\xe6\x37\xb7\x2e\x1f\ +\xd3\x3f\xea\xf6\xe0\x83\x0f\xae\x7d\x7f\xe0\x81\x07\x92\xe3\xc7\ +\x8f\x7f\xe8\xdc\xb9\x73\xdf\x5c\x5c\x5c\x6c\xaf\x36\x1a\xda\x6c\ +\xb5\xb4\xd5\x6e\x6b\xbb\xd3\xd1\x4e\xb9\x67\x59\xe6\xf7\x3c\xd7\ +\x2c\xcf\x35\xcf\x73\x2d\x8a\x42\xf3\xa2\xf0\x9f\xeb\x8e\x67\x79\ +\xbe\x76\x7d\xa7\xd3\xd1\x76\xbb\xad\xad\x56\x4b\x5b\xad\x96\x36\ +\x5b\x2d\x5d\x5d\x5d\xd5\x85\x85\x85\xf6\xb9\x73\xe7\xbe\x79\xfc\ +\xf8\xf1\x0f\x3d\xf0\xc0\x03\xc9\x95\xc6\xf6\x8f\xb2\xed\xd9\xb3\ +\x67\xed\xfb\xfd\xf7\xdf\x9f\x1e\x3e\x7c\xf8\xdd\xd3\xd3\xd3\x7b\ +\x16\x16\x16\x8a\x46\xa3\xa1\xed\x2c\xd3\x8e\xb5\x2e\x73\x4e\x73\ +\xa7\x5a\xa8\xdf\x6d\xb9\xbb\x72\xbf\xd2\xe6\xd6\xed\xdd\xeb\x0b\ +\x55\xcd\x55\x35\x73\x4e\x33\xe7\xb4\x63\xad\x6b\x67\x99\x36\x1a\ +\x0d\x5d\x58\x58\x28\xa6\xa7\xa7\xf7\x1c\x3e\x7c\xf8\xdd\xf7\xdf\ +\x7f\x7f\x7a\xa5\x31\xfe\x54\x5d\x60\xff\xfe\xfd\xbc\xe6\x35\xaf\ +\x01\x60\xe7\xce\x9d\xb5\xcd\x9b\x37\xbf\xa5\x5e\xaf\xff\xa7\x4a\ +\xb5\x7a\x47\x9a\x24\x88\x88\xae\x9c\x3c\xc1\xe2\xb1\xe3\x92\x35\ +\x56\x41\x04\xb8\xd4\x0d\x8c\xc8\xda\x2f\x0a\x82\x5e\xb4\x73\x7f\ +\x5c\x41\xfd\x1f\x7f\x4e\xb5\xbc\x46\x41\x95\xb8\x56\xa3\x6f\xfb\ +\x76\xed\xdd\xba\x0d\x55\x95\x76\xa7\x43\xab\xd9\xfc\xd6\xea\xea\ +\xea\x7f\x39\x7b\xf6\xec\x53\x77\xdd\x75\x57\xe3\xf2\xb1\xfe\x54\ +\x14\xf0\xdd\xef\x7e\x97\x5b\x6f\xbd\xb5\xeb\xf3\xf5\x91\x91\x91\ +\xb7\x56\xab\xd5\xff\x90\x56\x2a\xff\x2c\x89\x63\x44\x55\x57\xcf\ +\x9c\x91\x43\x9f\xfe\x33\x0e\xff\xcd\xe7\x58\x99\x5d\xea\xca\xb3\ +\xf6\xd9\xfd\x31\x53\xfe\xaf\x57\x18\x88\x00\xee\xb2\xeb\xd7\x3f\ +\xa3\x77\x43\x1f\xd7\xfe\xda\x87\xb9\xfe\xe3\xbf\x45\x6d\xcb\x16\ +\x45\x44\xda\xed\x36\xed\x76\xfb\xe9\x56\xab\xf5\x87\xe7\xcf\x9f\ +\xdf\xf9\xa6\x37\xbd\x69\xf5\xf2\x31\xff\xd8\x0a\x78\xee\xb9\xe7\ +\x00\xb8\xe5\x96\x5b\xba\xc2\xf7\x8c\x8c\x8c\xdc\x5d\xad\x56\x7f\ +\x2f\x4d\xd3\x3b\x92\x24\x51\x50\x56\x4f\x9d\x92\x83\x9f\xfe\x14\ +\x8b\x0f\xfd\x3d\x3d\x4b\x33\xf4\xd7\x13\x50\xc1\xb5\x1d\x61\xcd\ +\x80\x03\x2d\x20\x88\x04\x13\x09\xae\x50\x34\x57\x4c\xc5\x5b\x84\ +\x6d\x28\x26\x11\x24\x14\x5c\xee\x70\x05\x98\x00\x54\xa0\x58\x75\ +\x04\x55\x03\xa2\x2c\xae\x76\x58\xe9\xbb\x8a\xfe\xbb\x7f\x89\xeb\ +\x3f\xf6\x1b\xd4\xc7\xb7\xaa\x0a\x74\x3a\x1d\xe9\x74\x3a\xdf\x6a\ +\x36\x9b\x9f\x3c\x77\xee\xdc\xc3\x6f\x7e\xf3\x9b\x57\xae\x34\xfe\ +\x9f\x28\x0c\x3e\xf9\xe4\x93\x7d\x23\x23\x23\xbf\x52\xad\x56\xff\ +\x4d\x9a\xa6\x77\xc4\x71\x8c\x3a\xc7\xea\x99\xd3\x1c\xfa\xf4\x9f\ +\xb3\xf2\xe8\x57\xe9\x59\x9c\xa5\x1e\x45\x68\x0e\xa2\x10\x24\x01\ +\x61\x2a\xa0\x82\x6d\x39\xd4\x2a\xd6\x2a\x88\x60\x52\x83\xa9\x88\ +\x9f\xdd\x4c\xd1\x42\xa1\xf0\xf3\x6d\x22\x21\x48\x05\x54\x71\x99\ +\x57\x1e\x02\xf5\x20\x86\xc5\x39\x56\x1e\xff\x2a\x07\x51\xae\xff\ +\xd8\x6f\x52\x1f\x1f\x27\x8e\x63\x44\xe4\x0e\x11\x61\x64\x64\x24\ +\x7d\xf2\xc9\x27\x1f\xb8\xeb\xae\xbb\x96\x7e\x22\x17\x58\x6f\x42\ +\x4f\x3d\xf5\x54\xff\xe8\xe8\xe8\xfb\x2a\x95\xca\x47\x93\x24\xb9\ +\x2d\x8a\xe3\x58\x40\x9b\x53\x53\xf2\xe2\xff\xfa\x24\xab\x3b\x1e\ +\xa6\x67\x71\x81\x6a\x28\x84\x89\xc1\x84\x02\x4e\xd0\x8e\x12\xd6\ +\x0d\x58\x50\xab\x98\x48\x30\xa1\x17\xc8\x15\x8a\x49\xbd\xe1\xdb\ +\xa6\xc3\x24\x06\x13\x94\x16\x60\x15\x29\xa7\xa6\x68\x94\x96\x62\ +\x14\x97\x2b\x79\xe6\x68\x5a\x65\xa5\x67\x80\xfa\xdb\xee\xe6\x55\ +\x9f\xf8\x04\xd5\xd1\x31\x75\xaa\x92\x67\x59\x96\x65\xd9\xb7\x5b\ +\xad\xd6\x5f\x4f\x4d\x4d\xdd\xff\x96\xb7\xbc\x65\xf1\x07\xb9\x83\ +\xb9\xd2\xc1\xbd\x7b\xf7\xae\xdd\xb0\x7b\xf7\xee\xbe\x4d\x9b\x36\ +\xbd\x2f\x49\x92\x8f\xc4\x71\xfc\xda\x30\x0c\x63\x13\x04\xb4\x67\ +\xce\xf1\xfc\x27\xff\x88\x95\x47\x1e\xa2\x6f\x79\x81\x9a\x11\xa2\ +\xc0\x10\xc6\x86\xb0\x12\x78\x45\x58\x10\x27\x88\x13\x0c\x42\x18\ +\x1b\xa2\x6a\xf7\x9c\xc1\x38\x83\x71\x10\x60\x88\x12\x43\x54\xf3\ +\x0a\x0c\xf0\xe7\xc5\x09\xc6\xf9\xfb\xc2\x34\xf0\xf7\x07\x86\x2a\ +\x42\xef\xca\x02\x2b\x8f\x3e\xc4\x81\x4f\xfe\x11\xed\xf3\xe7\x08\ +\xc2\x80\x28\x8a\xe2\x38\x8e\x5f\x9b\x24\xc9\x47\x36\x6d\xda\xf4\ +\xbe\xdd\xbb\x77\xf7\x01\xdc\x7a\xeb\xad\xec\xdd\xbb\xf7\x87\xb3\ +\x80\xf5\x09\xc5\x13\x4f\x3c\xd1\x3b\x36\x36\xf6\x9e\x5a\xad\xf6\ +\xb1\x24\x49\x5e\x1b\x45\x51\x25\xae\x56\x59\x3a\x76\x4c\x5f\xf8\ +\xe3\xff\x29\xab\x0f\xfd\x03\xfd\xed\x15\xfa\x7a\x22\x0c\x7e\xd6\ +\x25\x10\x82\x48\xbc\xdf\xe7\x4a\x54\x37\xa8\x13\xef\xf3\x81\xf7\ +\x73\xb5\x0a\x0e\x4c\xd5\xc3\x9b\x6d\x80\x09\x81\x40\xd0\x42\x51\ +\xa7\x48\xe4\xcf\x15\x2b\x8a\x24\xa0\x06\x5c\xae\xa8\x55\x34\x00\ +\xe7\x1c\xcb\xab\x39\x8b\x69\x2f\xb5\x77\xfe\x22\x37\xfd\xde\xbf\ +\xd5\xde\xed\xdb\x25\x6b\x36\x29\xf2\xbc\xd5\xe9\x74\x9e\x6d\x34\ +\x1a\x9f\x99\x9c\x9c\xfc\xf2\xdb\xde\xf6\xb6\xe5\x57\x4a\x96\xcc\ +\xe5\x49\x4e\xf7\x82\xa7\x9f\x7e\xba\x3e\x3a\x3a\x7a\x77\xb5\x5a\ +\xfd\x8d\x24\x49\x6e\x8b\xa2\xa8\x12\x55\xab\xcc\x1f\x3c\xa8\x2f\ +\xfd\xe9\x9f\xc8\xfc\xfd\x5f\x64\xa0\xb9\x44\x5f\x35\x22\x4c\x02\ +\x82\xc4\x60\x8c\x60\x1c\x48\xe1\xf7\x30\x31\x84\xa9\x21\xaa\x08\ +\x41\x28\x88\x03\x32\x10\x2b\x04\x89\x10\x56\x84\x30\xed\x9e\x13\ +\x24\x53\xc4\x79\xb0\x8c\xaa\x42\x58\x09\x30\xdd\x73\x16\xc4\x82\ +\x09\x84\xa8\x62\x88\xd2\x80\xde\x34\x62\xa0\xb9\xc4\xfc\x97\xbf\ +\xc0\x4b\x7f\xf6\x27\x32\x7f\xf0\xa0\x46\x95\x0a\x61\x14\x55\x92\ +\x24\xb9\xad\x5a\xad\xfe\xc6\xe8\xe8\xe8\xdd\x4f\x3f\xfd\x74\x1d\ +\xe0\xf6\xdb\x6f\x7f\x59\xb2\xb4\xa6\x80\x1d\x3b\x76\xf0\xae\x77\ +\xbd\xab\x3b\xf3\xb5\xc1\xc1\xc1\xb7\x56\x2a\x95\x4f\x24\x49\x72\ +\x47\x18\x86\xb1\x09\x43\x96\x8e\x1e\xd5\x43\x9f\xfe\x94\x9c\xfb\ +\xec\xa7\xd9\x12\x5b\xfa\x7b\x52\x0c\x5e\x30\xb1\x42\x60\x84\x20\ +\x36\x04\xa9\x21\x48\x0c\x62\x05\xca\x3d\x10\xf1\xca\xa8\x1b\xc2\ +\x54\x10\xdb\xdd\x0d\x81\x7a\xd3\x8f\xea\x86\x30\x11\x8c\x0a\xe4\ +\xfe\xb9\xc6\x79\x25\x45\x15\xe3\x5d\x47\x04\x0a\x4a\xb7\x32\xf4\ +\xf7\x24\x6c\x49\x95\x73\x9f\xfd\x34\x47\x3e\xfd\x29\x59\x3a\x76\ +\x4c\x4d\x10\x10\x86\x61\x9c\x24\xc9\x1d\x95\x4a\xe5\x13\x83\x83\ +\x83\x6f\x7d\xe2\x89\x27\x6a\x00\xef\x7a\xd7\xbb\xd8\xb1\x63\xc7\ +\x45\x17\xd8\xbd\x7b\x37\x00\x77\xde\x79\x27\x00\xf7\xdd\x77\x5f\ +\x7a\xe3\x8d\x37\xbe\xb5\x56\xab\xfd\xc7\x4a\xa5\xf2\xb3\x69\x9a\ +\x02\x68\x7b\x76\x96\xe7\xff\xfb\xff\x90\xa5\xaf\x7c\x81\x2d\xa9\ +\xa3\xb7\x9e\xe0\x1c\xb8\x86\x62\x62\x81\x42\x08\x13\x21\xac\x1b\ +\x4c\x22\x60\xa1\x98\x71\x04\x35\x0f\x82\x12\x42\xd8\x13\x10\x54\ +\x05\xd7\x56\x8a\x79\x87\x24\x94\xb1\x4e\x09\x07\x0c\x92\x0a\xb6\ +\xa9\x14\xcb\x16\xb5\x20\x06\x6c\x1b\x82\x61\x41\x02\xc5\x76\x94\ +\x62\xc5\x61\x33\x07\x81\x0f\xa7\xa6\x06\xc6\x08\x4b\xab\x1d\xce\ +\xb4\x84\xbe\x77\xdf\xc3\xab\x7f\xff\xdf\x69\xb2\x61\x18\x10\xe9\ +\x74\x3a\xb4\x5a\xad\x6f\x36\x1a\x8d\x3f\x78\xe9\xa5\x97\x76\x7e\ +\xe0\x03\x1f\x68\x97\xd8\xc6\x9d\x77\xde\x79\x29\x06\x7c\xe6\x33\ +\x9f\x49\xde\xf0\x86\x37\xdc\x5d\xab\xd5\xfe\x7d\xa5\x52\xf1\x71\ +\x5e\x95\xd6\xb9\x73\xf2\xd2\xff\xfe\x24\xcd\x47\x1e\x62\xb0\xb9\ +\x44\x5f\x6f\xea\xfd\x59\x3d\xa2\x87\x35\x3f\xdb\x02\x98\xd8\x5b\ +\x01\x16\xdc\xaa\x12\x0d\x1a\xb0\x3e\x22\x98\x54\xbc\x72\x3a\x8a\ +\x6b\x83\xe9\xf3\x3f\x6f\x97\x1c\xa6\x66\x90\x08\x5c\x47\xd1\xcc\ +\x63\x80\x33\x4a\x7e\xc1\x11\xf4\x79\x7c\xb0\x6d\x87\xcb\x14\x35\ +\x8a\x0a\xd8\x86\x2b\xf1\x41\xb0\x99\x63\x69\xb9\xcd\x7c\xb5\x8f\ +\xea\x3b\xfe\x05\x37\xfc\xee\x27\xa8\x6c\x1c\x51\x44\xe8\x74\x3a\ +\xd2\x6e\xb7\xbf\xd5\x68\x34\xfe\xdb\xbe\x7d\xfb\x1e\xfe\xd8\xc7\ +\x3e\xd6\xe9\x82\x7d\xd0\x15\xfe\xf3\x9f\xff\x7c\xed\x96\x5b\x6e\ +\x79\x6f\xad\x56\xfb\xfd\x34\x4d\x6f\x4f\xd2\x04\x51\xa5\x71\xe6\ +\x0c\x87\xff\xe2\x4f\xa5\xfd\xe4\xa3\x0c\x76\x96\xa9\x47\x31\x64\ +\x52\x9a\xbe\x10\x24\x86\xb0\x62\x08\x22\x83\x58\xaf\x10\x29\x40\ +\x72\x21\xac\x05\x04\x35\xe3\x7d\xdc\xfa\xe3\x74\x4a\x77\xa9\x1b\ +\x82\x9a\xf8\x90\x59\x78\xa5\xd0\xf1\x85\xb4\x89\xbb\xe7\xfc\x73\ +\x34\xf7\x80\xaa\x39\x98\x50\x08\x6a\x06\x91\x12\x4c\x73\x0f\x9c\ +\xb6\x05\x49\x12\x12\x49\x87\xd5\xe9\x29\x96\x66\xe7\xe9\xb9\xe6\ +\x5a\xe2\xde\x5e\x82\x20\x10\x60\x0b\xb0\x75\x78\x78\xb8\x71\xe7\ +\x9d\x77\x1e\xfb\xd2\x97\xbe\x94\x7f\xfc\xe3\x1f\xf7\x0a\xd8\xb5\ +\x6b\x57\xff\xf8\xf8\xf8\xfb\x6b\xb5\xda\x6f\x56\x2a\x95\x37\x24\ +\x69\x2a\xa2\xaa\xab\xa7\x4f\xc9\xd1\xbf\xfc\x8c\x34\x1f\x7f\x84\ +\xbe\xd5\x45\x6a\x12\x10\x88\x4f\x52\xc2\xd4\x20\x81\xf7\xd3\xc0\ +\x78\x7f\x36\xf8\xe3\x41\x45\x08\x02\x41\xb2\xae\x80\xa5\xcf\xa6\ +\x86\xb0\xba\xee\x98\xc1\x03\x63\x2e\x84\x55\x7f\x9f\x98\x12\x2c\ +\xd5\x2b\xcd\xb5\x14\x53\xf7\x96\x23\x94\xd1\xc5\x51\x46\x19\x90\ +\x58\x30\xb1\xf7\x24\x51\x21\x44\x30\xad\x16\xab\xa7\x27\x59\x5e\ +\x5e\x91\xda\xb6\x09\x89\xfb\xfb\x35\x8c\x22\x11\x91\xcd\xc6\x98\ +\xd1\x81\x81\x81\xce\xbd\xf7\xde\x7b\xe2\x4d\x6f\x7a\x53\xdb\x00\ +\xd4\x6a\xb5\xb7\xa7\x69\xfa\x91\x24\x49\x5e\x1b\xc5\xb1\x41\x55\ +\x57\x4f\x9f\x96\x63\x7f\xf5\x97\x34\xbf\xf6\x10\x3d\x0b\xf3\xd4\ +\xc4\xc7\x64\x29\xe3\x79\x10\x1b\x82\xa8\x1c\xac\x05\x32\x45\x80\ +\x20\x16\x6f\x11\x15\x03\xb9\x9f\x6d\x29\x04\x03\x84\xa9\x10\xf6\ +\xfa\x88\x21\x19\x98\x42\x90\x5c\x30\x85\x10\xa4\xa6\x3c\xb7\x2e\ +\x22\x14\x3e\xaa\x84\x69\x69\x65\xa9\xf1\x4a\xe8\x00\x85\x07\xc8\ +\xa0\x74\xb9\x30\xf1\x2e\x69\x0a\xf1\x79\xc2\xd2\x02\xad\xc7\x1e\ +\xe6\xf8\x67\xff\x92\xc6\xe9\xd3\x82\x53\x8d\xe2\xd8\x24\x49\xf2\ +\xda\x34\x4d\x3f\x52\xab\xd5\xde\xde\x4d\x85\x0d\xf0\xfa\x28\x8a\ +\x6e\x8a\xa2\x28\x0e\xc2\x90\xe5\x63\xc7\x38\xfe\x57\xff\x87\xd5\ +\x47\x1e\xa4\x6f\x71\x9e\x5a\x1a\x12\xc6\x81\x0f\x71\x5a\x9a\x24\ +\x3e\xdd\x35\x81\x1f\x84\x84\x7e\x76\xc8\x40\xb5\x74\x8f\x14\x82\ +\xe4\xe2\x71\xc9\xbc\xcf\x4b\xee\x05\x36\x55\x01\x2d\x5d\xa6\x34\ +\x7f\x29\x84\x20\x02\x62\x5f\x2d\x9a\x96\x81\x36\xa8\x51\xc8\x7c\ +\x2e\x61\x22\xc1\xa1\x60\x9d\x77\x0d\x29\x9f\x6f\xf0\x96\x47\x40\ +\xcd\x29\x6e\xfe\x02\xcb\x0f\x3d\xc8\x51\x07\x13\x1f\xfd\x57\xf4\ +\x4c\x6c\x27\x8a\xa2\xb8\x28\x8a\x9b\x80\xd7\x03\x7f\x17\x02\x71\ +\x51\x14\x7d\x22\x12\x19\x63\x40\x44\xdb\x27\x4f\xca\xfc\xdf\x7d\ +\x91\xe1\xa2\x45\x3d\x8e\x09\x23\x1f\x8f\x8d\x08\xb4\x0a\x74\x39\ +\x43\xe3\xd2\x4c\x43\x90\x24\xc2\x44\x31\x14\xa1\x9f\x71\x01\x71\ +\xbe\xc0\x09\x2a\x5e\x68\x2d\x1c\x34\xdb\xd0\x74\x5e\x71\xc9\xc5\ +\xf2\x58\x0a\x41\x0b\x01\xe3\x43\x1b\x49\x80\xd4\x0c\x8a\xa2\x2b\ +\xde\xc7\xc5\x78\x1c\x30\x36\x83\xb8\x40\x2d\x68\xcb\xa2\x4e\x71\ +\x01\xd8\x86\x85\x48\x90\x54\x10\x15\x02\x31\xd4\xa3\x00\x5d\x9c\ +\xe3\xc2\xdf\x7d\x91\xd6\xcf\xdd\x25\x3d\xd7\x5c\xa3\xc6\x18\x11\ +\x91\xa8\x28\x8a\x3e\x20\x0e\x81\x38\xcb\x32\x51\xf5\xc4\x93\x82\ +\x84\xed\x26\xfd\x0b\xf3\xf4\x8e\x0c\x60\xd4\x9b\x96\xcf\xe7\x0b\ +\xc2\xc1\x61\xd2\x89\x09\xa2\x81\x3a\xb8\xb2\xc4\x35\x19\x6e\x7a\ +\x1a\x37\x77\x01\x43\x41\x90\x78\xd3\x27\x2f\x77\xeb\x08\x7a\x87\ +\x08\xb6\x6c\xc1\x0c\xf4\x41\xe1\x6f\x34\xf5\xb2\x34\x9e\x2f\x50\ +\xcd\x20\x6b\xe1\x66\xe7\x71\xf3\x0b\x68\x2b\x47\x82\x32\x1d\xae\ +\x7b\x73\x93\xb4\x8a\x6c\xbc\x0e\x33\xba\x09\x57\x14\xc4\xab\x0e\ +\x35\x40\x00\x45\xcb\xe2\x6c\x81\xda\x36\xf9\xe2\x22\x3a\x3d\x8b\ +\x2e\x2e\xd0\x5b\x8d\x29\xce\xcf\x13\xb6\x5b\x94\x46\x8b\xaa\x6a\ +\x96\x65\x02\x44\x21\x10\xe4\x79\x1e\x38\xe7\xa4\xcb\xbf\xc5\x81\ +\xa1\xaf\x16\x78\x40\x52\xef\x6f\xea\x14\xbb\xda\xa6\xfe\xd6\xdb\ +\xd9\xf4\x5f\xff\x80\x78\xf3\x96\xb5\xba\xbd\x38\x7f\x96\xe5\x4f\ +\xfd\x39\xd9\xce\xbf\xc7\xb4\x67\x30\x95\x08\xb1\x06\xb7\x02\x18\ +\x41\xdb\x16\xee\xb8\x85\xe4\x77\x7e\x9f\xf8\x96\x9f\x59\x47\x84\ +\xf8\x64\x5c\x5b\x0d\x74\xf9\x02\x6e\x6e\x0a\xfb\xec\x33\xe4\x4f\ +\xee\xc2\x1e\x3e\x88\x5b\x6d\xf9\x7a\x22\x35\x38\x2d\x30\x9b\x46\ +\xa8\x7e\xe8\xb7\xa9\xbd\xf3\xfd\x5c\x89\x45\xb4\xab\xab\xe4\x67\ +\xa7\x69\xbf\x74\x80\x95\xa7\x76\xb1\xfa\xf4\x4e\xb2\xb9\x19\xfa\ +\xeb\x01\x49\x68\xd6\xf8\x45\xe7\x9c\xe4\x79\x1e\x00\x61\x57\x01\ +\x62\xad\x5d\x77\x81\xa2\x0e\xcf\xd9\xa8\xf7\xb9\x30\x16\x6c\x54\ +\x25\xdc\xb6\x95\x78\xf3\x96\x4b\x0a\x09\x73\xd5\x46\x82\x6d\x5b\ +\xa1\xa7\x17\x6d\xcc\xf8\x4a\xb0\x4c\x5b\x83\x41\xa1\xdd\x50\x5a\ +\x81\x12\xa9\x12\x5f\x46\x92\xa0\x20\x95\x1a\xa6\x52\x23\xd8\x38\ +\x4e\x78\xd3\x1d\x84\x3f\x77\x37\xd9\xfd\x7f\x41\xbe\xeb\x61\xf4\ +\x78\x03\x71\xe0\x54\xc8\x33\x25\x2a\xf4\x15\xcb\xd8\xb0\x5e\x27\ +\xbc\xf6\x3a\x2a\xd7\x5e\x47\xcf\x5b\x7f\x81\xe5\x1d\x0f\x73\xfe\ +\xcf\xff\x98\x7c\xe1\x19\x9c\x73\x6b\xf2\x59\x6b\xc9\xf3\x5c\x80\ +\xc0\x5c\x89\x95\x55\xa7\x68\x07\x5c\xc7\x97\xad\x18\x50\x57\x10\ +\x5d\x37\x41\x72\xc3\x75\x2f\xe7\xaa\xc5\x10\x6d\x1b\xc7\x0c\x6f\ +\xc4\xb5\x42\xdc\xac\x43\x97\x94\xa0\xcf\x63\x84\x8b\xa1\x48\x15\ +\x17\xac\x11\x5c\xa8\xb5\x74\x1a\xab\x74\x9a\xab\x14\xad\x16\xea\ +\xdc\x9a\x60\xc1\xe6\xad\x84\xef\xb8\x07\x19\xdb\x82\xe9\x0d\xb0\ +\xf3\x8a\x9d\x71\xe4\x8b\x0e\xdb\xd1\x4b\x18\x63\xe7\x1c\xce\x59\ +\x5c\x79\xff\x7a\x65\xf4\xbd\xfd\x5d\xf4\xbe\xfd\x97\x09\x7a\x36\ +\x78\x17\x5e\xc7\x30\x77\x3f\xc3\x4b\x14\x50\x5e\x20\x02\x12\x81\ +\x89\x7d\xfc\x56\x0b\x2e\xcb\x49\xb6\x6c\x27\xdc\x76\xed\x95\xcb\ +\xca\x8d\x63\x98\xf1\xab\xe1\xe4\x0b\x04\xd9\xaa\x0f\x57\x6d\xa0\ +\xe2\x93\x1f\xb2\x92\xef\x2a\x85\x6c\x2e\x2d\x70\xe0\xef\xef\xc7\ +\x39\x4b\xda\x3b\xc0\xc6\x57\xdd\xcc\xf0\xc4\x35\xc4\x95\x2a\x12\ +\x04\x04\x9b\xae\xc6\x8d\xbf\x0a\xf7\x9d\x93\x04\xbd\x0e\x75\x86\ +\xa2\x66\x20\x94\xf5\x9c\x39\xf3\xa7\x4f\x32\x7f\xfa\x14\xce\x39\ +\xea\xc3\x1b\xe8\xdf\x3c\x4a\xb5\x7f\x00\x63\x0c\x26\xad\x30\xf0\ +\xcb\xef\x66\xe1\xe1\x87\x20\x0a\xd7\x94\xbc\x5e\x11\x21\x50\x6a\ +\xd1\xa1\x5a\x2a\xc3\xf8\x8c\x4b\x82\x92\xd4\xb4\x8a\xd3\x80\x78\ +\x6c\x2b\xe9\xd8\x38\x00\xce\x5a\xb2\x56\x8b\xb8\x52\xc1\x04\x01\ +\xe1\xc6\x51\xc2\xf1\x71\x8a\x81\x3a\x2c\xad\x22\x2a\xb0\x02\xb4\ +\x15\x6d\xe3\x51\x7e\x9d\xa1\xe5\x8b\x0b\x5c\xf8\xca\xe7\x20\xcf\ +\x28\xf2\x80\xe5\xdb\x6f\xc3\xdc\xf3\x51\x46\x5e\xfd\x7a\x7f\x41\ +\x94\x90\x0f\x6e\x01\x35\x44\x69\xc9\x2b\x24\xc6\x87\xdb\x35\x4b\ +\x75\x4c\x7f\xeb\x29\x0e\x7f\xf9\xf3\x34\xe6\xe6\x49\x37\x6f\x63\ +\xeb\x3f\x7f\x07\xd7\xbf\xf3\x9d\xf4\x8f\x6c\x46\x44\xa8\x4c\x5c\ +\x43\xb4\x6d\x2b\x54\x52\xaf\x00\xbd\x68\x39\x6b\x0a\x58\xf3\xff\ +\x2e\x07\x6b\x3d\x45\xe5\x72\xc5\x00\x06\x87\xd9\x34\x42\xb2\x75\ +\x1b\x51\x5f\x3f\x00\x59\xb3\xc9\xd9\x03\xcf\x33\x34\x31\x41\x7d\ +\xc3\x55\x44\x3d\x75\xc2\x4d\xe3\x14\xb5\x21\xf4\xdc\x39\x1c\xea\ +\x79\x81\x58\x7c\x9c\x0f\x29\x99\x62\xaf\x87\x48\x0b\xb6\x15\x33\ +\x24\x45\x46\x73\x36\x23\x7b\x21\xc6\x4e\x4f\x52\xdc\xf4\x3a\x42\ +\xe3\x73\x80\x4e\x1c\x11\x05\xa0\x2d\x87\x16\x0e\xd7\xe3\xc0\xae\ +\x77\x57\x25\x9a\x9b\xa3\xff\xe8\x11\xa2\xc9\xb3\x74\x4e\x9c\xe2\ +\x82\x38\xe6\xc6\xc7\xe8\x1f\xd9\xbc\xce\xa5\xc6\xd0\xb4\xba\x26\ +\x63\x17\x07\x5e\xa6\x80\xf5\x2c\xb5\xb3\x0a\xae\x54\x88\x58\xc2\ +\xed\xdb\x09\xb7\x8c\x23\x71\xe4\x15\xb0\xba\xc2\xe4\x53\x4f\x42\ +\x91\x53\xe9\xeb\x27\x4a\x53\xcc\xc6\x51\x18\x1e\xc3\x1d\x3a\x84\ +\xb1\x0e\x8d\xd5\xc7\x65\x2b\x10\xc0\x3a\x92\x9b\x00\x65\xb4\x2a\ +\xd4\x9c\x21\x6f\xa5\xac\xf6\x0e\x10\x26\xd5\x35\x23\x51\x55\x5a\ +\x8b\xe7\x09\x70\xb8\x0e\x3e\xee\x77\x4a\xee\xb0\x0b\xa2\x0a\x3d\ +\x61\xc4\xd5\xd5\x1a\x59\xb5\xce\xaa\x16\x64\xe7\x4f\x53\x4c\x9d\ +\x59\x7b\x86\x88\xe0\x7a\xfa\x21\x8a\xbc\x60\xe5\xf1\x4b\x14\xd0\ +\x45\xc8\xf5\x3c\x91\x04\xa5\x0b\x38\xc1\x59\x88\xc6\x27\x08\x47\ +\x46\x51\x13\xe0\x54\xc9\x97\x16\x59\xd9\xfb\x14\x0b\x3d\x3d\x8c\ +\xdc\xf2\x33\x84\x69\x8a\x8c\x8c\x22\xdb\x26\xd0\xef\x7d\x1d\x69\ +\xb4\xd0\x1c\x5c\x53\x71\x6d\xc5\x15\x0e\x67\x1d\x0a\x38\x55\x88\ +\x12\x64\xe2\x67\xb0\x6a\x91\xb1\x0a\xb5\x5b\xdf\x88\xd9\x3a\x81\ +\x31\x82\x05\x5a\x17\xe6\x68\x1f\x3c\x44\x3d\x2b\x90\x44\x20\x14\ +\x24\x16\x54\xbc\x1a\x7d\xa4\x72\x88\x58\xc2\xc8\x4b\xd2\x53\x80\ +\x86\x29\xf5\x4a\xa5\xbc\xc6\x21\x41\x40\x3b\xeb\x90\xd8\xe2\xe2\ +\x04\x5c\xee\x02\x97\xad\xbf\x79\x0c\x08\x40\x4a\x53\xd4\xb0\x4a\ +\x3c\xba\x95\x70\x70\x08\x44\xc8\xda\x6d\x9a\x67\x27\x89\x8e\xbd\ +\x48\x3e\x36\x81\x6d\xb6\x70\x7d\xfd\x04\x57\x6d\x24\xd8\xba\x15\ +\xdb\x57\x41\x8a\x16\x7a\x41\xb1\x40\xd1\xf6\x4a\x50\xa7\x9e\xf7\ +\xb7\x05\x66\xe8\x2a\xa2\x8f\xfd\x67\x54\x14\x89\xab\x04\xbd\x7d\ +\x48\xad\x8e\x5a\xcb\xca\xec\x0c\xd3\x5f\xdf\x05\x07\x8f\x20\xb9\ +\x85\xbe\xb2\x68\x4a\x14\x0d\xfd\x33\x9c\x3a\x54\x1d\x84\x01\x54\ +\x62\x4c\x5f\x42\xa0\x75\xa2\x89\x9b\xa8\x4e\x5c\x8b\x2d\x31\xc2\ +\x04\x01\xad\xf3\xd3\x04\xad\x66\xb9\x18\xa3\x2f\x07\xc1\xae\x39\ +\xac\x73\x2d\x9c\x53\x9c\x2a\x62\x95\x60\xeb\x16\xc2\xb1\x51\x24\ +\x4d\x51\xa0\x39\x7f\x81\xd9\xfd\xcf\x30\x94\x77\x60\xf2\x0c\x8d\ +\xd9\xf3\x04\x83\x83\x04\x49\x42\xb0\x61\x33\xb2\x61\x0b\x6e\x66\ +\x1e\x50\x82\x01\xc1\x34\x58\xe3\xf1\x1c\xe0\xac\x83\x30\x46\xae\ +\xbe\xc6\x27\x42\xea\xf1\x41\x8c\xa1\xbd\xba\xca\xf4\xb3\x7b\x39\ +\xf5\xe0\xff\xe5\x3a\xbd\x80\x29\x7c\x14\xc2\xe9\x1a\x9b\xec\x95\ +\xe8\xad\x36\x1c\xd9\x0c\x37\xdd\x8a\x1b\x6f\x52\x7f\xcd\xcf\x52\ +\xb9\xeb\xe7\x89\xb7\x4d\xe0\xb2\x0c\x55\xa5\x68\xb7\x29\x26\x27\ +\xa1\xd9\xf2\x18\x54\x0a\x7e\x65\x17\xd0\x8b\x20\x68\xdb\x8a\x69\ +\x3b\x50\x25\xda\xba\x0d\xd9\xb4\x19\x17\x45\x38\xa0\x7d\xe1\x02\ +\x17\xf6\x7c\x9b\xcd\x0d\xa1\x68\x2e\xb0\x78\xe2\x08\xc9\xe8\x18\ +\x95\x38\xc1\xf6\x5f\x45\x67\xf8\x7a\xcc\xdc\xb3\xa4\x83\xa1\x1f\ +\xac\x51\x48\x1c\x4e\x1c\xb6\x34\xdd\x35\xb0\x59\xf3\x39\x1f\x59\ +\x82\xb4\xc2\xf8\xeb\xdf\xc8\x55\xed\x0f\x23\x5f\xf8\x33\x68\xcf\ +\x52\xcc\x5a\xb2\x8e\x23\x37\x8e\xb8\x65\x4b\x25\xfa\xc5\x82\x9e\ +\x9f\x7b\x27\xbc\xe5\x17\x3c\x28\x18\x03\x81\x41\xad\xc3\x8a\xa0\ +\x45\xc1\x91\x5d\x4f\xd2\x38\x72\x9c\x81\xac\xc0\x18\xb3\x86\x77\ +\x97\xb8\xc0\xe5\x18\x20\xe2\xab\x3b\x89\x05\xd4\x10\x8f\x6d\x25\ +\xda\x30\x82\x44\x31\xce\x29\xc5\xfc\x2c\xee\xe0\x77\x08\x22\x47\ +\xfb\xdc\x0c\xed\x63\x47\xb0\xaf\xb9\x0d\xed\x1b\x20\xd8\xb8\x91\ +\xe8\xd5\x37\x52\x3c\xea\x17\x43\x24\x16\x6c\xc7\x2b\xd4\x59\xb7\ +\x06\x60\x9d\x95\x65\x26\x9f\xfd\x36\xea\x2c\x51\xa5\x4e\xff\xf8\ +\x38\xd5\xa1\x61\xc2\x38\x26\xe8\x1d\xa0\xf2\xc6\xb7\xd2\x39\x7d\ +\x92\xe2\xc4\x17\xa0\xa7\x8d\xa9\x0b\x52\xf7\x96\xa4\xeb\x73\x97\ +\x20\x44\xa2\xe8\xb2\xfc\x52\xb1\x79\xce\xd2\xd4\x24\xa7\xbf\xfa\ +\x65\xc2\xe9\xd3\x04\x5d\x8e\xed\x95\x30\xe0\x12\x96\x5c\x00\xe3\ +\x57\x70\x64\x68\x98\x68\xcb\x38\xa6\x56\x03\x11\x3a\x8d\x06\xf9\ +\xf2\x12\x7d\x7d\xbd\x44\x1b\x37\x12\x65\x06\x1a\x6d\x5c\x27\xc3\ +\xda\x02\x53\xeb\x21\xbe\x7a\x2b\xf9\x55\x43\xd8\xe3\x17\x10\xe3\ +\x28\x5a\xea\xa9\x2c\xab\xde\x77\x81\xe6\xcc\x0c\x2f\x7c\xf2\x0f\ +\x21\xcf\x50\x0c\xf5\x1b\xaf\x63\xfc\x17\xee\x66\xec\xb6\x37\x51\ +\x19\x18\x42\xeb\xfd\xd8\x57\xbd\x91\x9c\xfb\x89\xa2\x32\x22\x45\ +\x0a\x81\x4f\xd5\xbb\x02\xd8\xa2\x83\x2d\x0a\xbf\x8a\x64\x1d\x45\ +\x96\xd1\x59\x5d\xe1\xc2\xb1\x63\x9c\x7a\xf4\x61\xec\xd3\xbb\xa9\ +\xb5\x57\x09\x4c\x77\x61\x56\x5e\x9e\x09\x5e\xb4\x80\x75\x28\x59\ +\x28\xce\x7a\x1f\x0b\xb6\x6c\x81\x24\xc6\x15\x05\x36\xcf\x48\xc7\ +\xc6\xd9\xfc\xaf\x7f\x97\x38\x8a\x89\x73\x07\xa3\x63\x98\x4a\x15\ +\x9b\xe7\xbe\x2c\xee\x1f\xc6\x4e\xdc\x84\x9c\xd8\x45\x18\x19\x5f\ +\x4c\x19\x8f\x29\xea\xbc\x1b\x98\xbc\xcd\xe8\x85\x63\xc4\x79\x46\ +\xb6\x6c\x69\xce\x4f\xb3\xda\xd3\x4b\x63\x6c\x82\xb4\x7f\x08\x15\ +\x41\xae\x9e\xc0\xd6\x6b\x48\x63\x99\x22\xf7\x69\xb0\x2b\xdc\xda\ +\x78\x9d\x73\x9c\x3f\x74\x88\xb9\x43\x07\xc9\x5b\x2d\x6c\x9e\x93\ +\xaf\x2c\xd1\x3a\x7f\x8e\xd6\x91\xa3\xd8\x17\x0f\xb0\xa1\xb5\x42\ +\x54\xb8\x4b\x00\xee\xfb\x24\x42\xeb\xf2\x80\x02\xac\x1a\xe2\x91\ +\x51\xc2\xcd\xa3\x10\x46\xd8\xa2\xc0\x88\x50\xdd\xb2\x15\x19\xbb\ +\x1a\x05\x12\xca\x04\x27\x08\x70\x85\xf7\x4b\x57\xef\x87\x9b\x6e\ +\xc3\xee\x7c\x82\x30\x0d\xc1\x81\x0b\x40\x71\x6b\xb3\x17\x18\xd8\ +\x36\x54\xa7\x52\x74\xc8\x8d\x63\x31\xcb\xe9\xcc\xce\xe2\x96\x97\ +\x70\x28\x2a\x42\xd0\xdf\x4f\xde\xd7\x0f\x0b\xe7\xb0\x1d\x87\x6d\ +\x2b\x36\x2f\x05\x50\xc5\x15\x05\x8b\xcf\x7d\x97\xe9\x7f\xf8\x32\ +\xed\xb9\x79\x04\x07\x59\x0b\x5d\x5a\x22\x5e\x5c\x66\xd0\x2a\xf5\ +\x28\xf4\x39\x84\xbb\x58\x80\xfe\xc0\x3c\x40\x7d\x11\x08\x95\x0a\ +\xd1\x96\x71\xc2\x81\x41\xd4\x18\x70\x0e\x09\x43\x4c\x9c\xbc\xac\ +\x1c\x53\xeb\x50\x67\xb1\x45\x8e\xd4\xea\x44\x37\xdc\x4c\x3b\x48\ +\x08\xda\x4a\xd1\x76\xe5\xcc\x95\xc5\x8b\xfa\xff\xf3\x95\x8c\xb0\ +\xc8\x71\x6d\x4b\xb5\x56\x23\x19\x1e\x24\xa9\x56\xb1\x85\x2d\x81\ +\x52\x68\x4b\x40\x50\xae\xab\xab\x28\xaa\xae\x4c\xdd\xbd\x35\x85\ +\xf3\xb3\xf4\x9f\x3c\x44\x7e\x76\x06\x11\x43\x10\x08\x91\x18\xe2\ +\x20\xc0\x04\x1e\x17\xf2\x2b\xb4\xdd\x7c\xff\x3c\x40\x14\x8d\x04\ +\x19\x1e\x24\x9a\x98\x40\x92\xc4\x87\x94\x4e\x87\x4e\xa3\x41\xd1\ +\x69\xaf\xa5\xb5\xdd\x94\x2c\x8c\x63\xa2\x6a\x95\x30\x4e\x90\x28\ +\x26\xda\xb8\x89\xc6\xa6\xab\x29\xa6\x8f\x53\x34\x2c\xb6\xe3\x13\ +\x21\xd7\x15\x40\x05\x1b\x0d\x92\x4b\x86\xf4\x0b\xe6\xc6\xed\x04\ +\xaf\x7d\x1d\x66\xc3\x46\x5c\x91\xfb\x59\x6a\xb7\x69\xcd\x5c\xa0\ +\x12\x58\xbf\x86\x10\x2b\x1a\x5c\x54\xa2\xaa\xa3\x16\x1b\x92\x9e\ +\x14\xd7\xaa\x50\xb4\xf0\x8a\x2e\x93\x2d\x4f\x9f\xfb\xda\x06\xb9\ +\x72\xdf\xd1\x95\xf3\x00\xa7\x38\x0c\x3a\x38\x4c\xb0\x6d\x3b\x1a\ +\x04\x88\x31\xcc\x1d\x3f\xc6\x81\xaf\x7c\x89\x33\xdf\xde\x43\x10\ +\x45\x65\xd7\x12\x60\x2c\xc3\x37\xdc\xc4\x0d\xef\xf8\x45\x46\x6f\ +\x7d\x0d\x61\x10\xe2\x92\x94\xe2\xf5\xb7\x11\xee\x38\xe9\x31\x40\ +\xf4\x62\xd1\x55\x14\x04\x83\x43\xa4\xbf\xf5\x7b\x04\xce\x41\x5a\ +\xc7\x8c\x8f\x23\xc3\x1b\x21\xad\xe0\xac\xc5\xda\x82\xe5\xa9\xd3\ +\x98\x95\x65\x30\x0e\xeb\xc0\xe6\x65\x1e\xe0\x1c\xea\x9c\x27\x69\ +\x0a\xbf\xe4\x6e\x33\xc5\xa9\x40\xd0\x5d\x49\x2e\x6b\x1a\x51\xac\ +\x5b\x17\x71\xbb\xe4\xc9\xf7\x77\x01\xc5\x3a\x43\x30\xb8\x91\x74\ +\xfc\x6a\x08\x02\xd4\x18\x96\x8f\x1d\x41\x9f\xfe\x06\x63\x07\x5e\ +\x24\x4a\x22\x44\xfc\xb2\x95\x09\x1c\x79\x7b\x85\xec\xba\xeb\xc9\ +\xae\xbb\x1e\x93\xa6\x90\x26\xc4\x6f\xbc\x03\xbb\xf3\x7e\x9c\x71\ +\x68\x54\x9a\xb0\x75\xa8\x75\x50\xad\x11\xfe\xec\x5d\x17\xa3\x4f\ +\x18\xfa\x38\x0e\x20\x86\xce\xf2\x32\x87\xbe\xf4\x79\x36\x6b\x93\ +\xce\xbc\xc5\x15\x96\x3c\xb5\xd8\xce\xc5\x38\xae\xce\xe1\xda\x8e\ +\x7c\xd9\xe1\x56\x1d\x92\x1a\x24\x2e\x59\x6a\x05\x9b\xf9\x88\x63\ +\xf3\x2e\xea\xcb\x95\x5d\xe0\x65\xc5\x90\x31\xc8\x60\x1f\xf1\xab\ +\x6e\x24\xac\x54\x10\x63\xc8\x0b\x8b\x9e\x3a\x4d\xcf\xd9\x29\x7a\ +\x13\x25\xaa\x94\xa1\xa9\x80\x30\x14\x16\xcf\x4e\xc1\xd4\x24\xb6\ +\xd5\xf2\x1d\x40\x71\x42\xe5\xda\xeb\x59\xee\x1d\xc0\x2e\x2c\x63\ +\x33\x8b\x77\xeb\x92\x08\x15\x83\x24\xe9\x25\x21\x49\xfd\x09\x16\ +\xcf\x4e\x73\x7a\xc7\x43\x98\x3d\xbb\x30\x2b\x6d\xcf\x1d\x5a\x45\ +\x52\xf5\x33\x2c\xdd\xe7\x08\x9a\x80\x54\xbc\x7b\x38\xa7\x90\x7b\ +\xf3\x77\xae\x24\x72\xe4\xe5\xed\x38\x3f\x44\x31\x24\xb8\x34\xa5\ +\x55\xad\x32\x73\xf2\x24\x26\x8c\x68\x2c\xcc\xb3\x7a\xf0\x30\x49\ +\xab\x45\x1c\x19\x8c\x94\x99\x65\x01\xd2\x86\xb8\xdd\x24\x3f\x7a\ +\x8c\xb9\x17\x0f\xb0\xda\x69\x21\x4e\x61\x65\x85\x4e\xcf\x26\x8a\ +\xce\x24\xed\xc5\x06\x8b\xd3\x53\xe4\x27\x8e\xe1\xda\xed\x75\xf8\ +\xe1\xf3\xfa\xac\xb9\x42\x67\x71\x81\xa5\x93\x27\x59\xdc\xbf\x1f\ +\x79\xe1\x79\xc6\x16\xe6\x30\x56\x3d\x00\x2b\x58\x2d\x58\x99\x9f\ +\xc5\x1e\x3d\x8a\xeb\xb4\x21\x2f\xe8\x2c\x2c\x80\x2d\x20\x04\xd7\ +\x71\xd8\xac\xeb\x6e\xde\xfc\xdd\xba\xe8\xe6\x09\xce\x2b\x58\x00\ +\x5d\x98\x28\x19\x91\x70\x60\x40\x64\xe3\x26\x8e\x7c\xf9\x4b\xb4\ +\x1f\x7f\x1c\x4c\x80\x74\x9a\x0c\x9c\x99\x64\x28\x2f\x70\xa1\xff\ +\x91\xf2\x79\x88\x40\x12\x05\x2c\xbc\xf0\x1c\x53\x4b\x0b\x74\x7a\ +\x7b\x11\x20\xca\x2d\xa3\x33\xa7\x49\x43\xa1\x79\xfa\x04\x67\xff\ +\xf6\xaf\x29\x1e\xec\x87\x52\xfb\xdd\x2e\x10\xcd\x14\x8a\x0e\xd2\ +\x69\x22\xf3\xf3\xc4\x73\xb3\x0c\xda\x0e\x3d\x71\x0c\x45\xd7\x94\ +\x85\xf6\xec\x3c\xb3\x0f\xfd\x03\x2b\xcf\x7c\x1b\xb5\x16\x93\x2b\ +\x23\x33\x53\xf4\x2c\x37\x90\x42\x71\xca\x25\xd5\xa2\x07\x42\xa8\ +\xde\x7c\x23\xe1\xe0\x20\x65\x25\x24\xeb\xfa\xb5\xbc\x02\xf2\x3c\ +\x6f\x34\x9b\xcd\x22\xcb\x32\xc2\x38\x96\x74\xeb\x36\xbd\xea\x97\ +\x7e\x59\x2e\x7c\xee\xaf\x59\x7d\x7a\x0f\x0a\x54\x42\x88\xd2\x18\ +\x09\x23\x0a\x27\x18\xd5\x72\x61\x04\x34\x12\x82\x28\x20\xba\x30\ +\x43\x38\x79\x86\x5c\x9d\x27\x22\x82\x80\x70\xb8\x4a\x14\x85\x54\ +\x96\x2e\xd0\x3a\x3b\x8d\x5a\xbb\x56\x6e\xfb\x16\x19\xd0\xa6\x12\ +\x8a\xef\x30\xa9\x06\x21\xbd\x69\x48\xad\xc7\x87\xda\xa2\xed\x28\ +\xda\xe5\xd2\x57\xd6\x24\x98\x79\x1e\xf3\xbd\x67\xfc\xac\xb6\x15\ +\x4d\x13\x5c\x12\x43\xee\x85\x27\xf4\x5c\x86\x53\x87\x4a\x40\x65\ +\xfb\x35\x6c\xb8\xe7\x5e\xd2\x6d\x13\x8a\x73\x92\x65\x19\xcd\x66\ +\xb3\xc8\xf3\xbc\xd1\x55\x80\xce\xcc\xcc\xbc\x34\x39\x39\x79\x32\ +\x4d\xd3\x9e\x8d\x41\x10\x56\x47\x46\xd8\xf4\xde\xf7\x91\x0a\xcc\ +\xdd\x77\x1f\xed\x93\xc7\x11\x57\x78\x9a\x1c\xc5\xaa\x2f\x35\x05\ +\xf1\x09\x46\xee\x4d\xa1\x1e\x84\xf4\xf4\x44\x7e\xcd\x4f\x7d\x4d\ +\x61\xc4\x40\xa6\xf4\x07\x01\x83\x3d\x35\x24\xe8\x22\xb2\x10\x94\ +\x3d\x9e\x36\x2a\x01\xca\x74\x13\x16\xf5\xb3\x2e\x42\xd1\x2d\xd2\ +\x14\x12\x23\x6c\xae\xa4\x8c\x06\x09\xaa\x50\xc4\xd6\x27\x6d\x65\ +\x5f\xa1\xba\x6e\x06\xeb\xd0\x20\x22\xdd\x3a\xc1\xf0\xfb\x3e\x40\ +\xff\xaf\xbc\x07\xed\x1f\xa0\xd9\x6a\x32\x3b\x3b\x5b\x4c\x4e\x4e\ +\x9e\x9c\x99\x99\x79\x09\x9f\x9f\x91\x2c\x2d\x2d\x35\x92\x24\x89\ +\xa3\x28\xda\x98\x26\xc9\x50\xa5\x52\x91\xa0\x56\xd3\xca\xb6\x09\ +\x31\x81\xa1\x3d\x39\x45\xb1\xb4\x84\x2b\xac\xaf\x0f\x42\x5f\x57\ +\x28\xfe\x07\xd5\xe1\x5b\x5b\x04\x24\x12\x4c\x59\x9b\x14\x6d\x8f\ +\xc2\x9a\x79\xbe\x91\x08\x24\x36\x28\x50\xb4\x7c\x32\x53\xe4\x3e\ +\xbb\x33\x69\x49\x78\xa8\xc3\xe5\x8a\xcd\x1d\xd6\x2a\x2e\x73\xbe\ +\x49\x2a\x2a\xc1\xab\xbc\xde\x5a\x1f\x02\x25\x04\x82\x2e\xcd\xa5\ +\xd8\xc2\x41\x10\x92\x5e\xbd\x9d\x0d\xf7\xdc\x43\xff\x7b\xde\x83\ +\xeb\xeb\xd3\x4e\xa7\x23\x67\xcf\x9e\xd5\x43\x87\x0e\x1d\x79\xe6\ +\x99\x67\x1e\x7c\xec\xb1\xc7\x1e\x9b\x9d\x9d\x9d\x0f\x80\x60\x76\ +\x76\x36\x3f\x72\xe4\xc8\x5c\xa5\x52\x21\x8a\xa2\x91\x38\x8e\x07\ +\x7b\x7a\x7b\xc5\x54\x2a\x5a\x9d\xb8\x06\x11\x95\xec\xec\x34\xf9\ +\xc2\x22\x58\x77\x91\xdb\x2b\x57\x6a\x25\x10\x14\xf1\x40\xda\xf5\ +\x41\xeb\x97\xb3\x25\x64\xcd\x27\x11\x0f\x33\x2e\x2f\x41\x28\xea\ +\xc6\x64\x5d\x2b\xd5\xbb\x35\x88\x1a\x01\x51\x6c\xc1\x9a\x65\xd8\ +\xdc\xb7\xda\x69\xd9\x57\xe1\x4d\x1d\xd4\x09\xb6\xcc\x0f\x30\x01\ +\x95\x6d\x13\x0c\xbf\xff\xfd\x0c\xbe\xf7\xfd\xea\x7a\xfb\xc8\xad\ +\x95\xd3\xa7\x4e\x71\xe0\xc0\x81\x63\xdf\xfc\xe6\x37\x1f\xb8\xef\ +\xbe\xfb\x1e\x3a\x7d\xfa\xf4\x19\xa0\x15\x74\xd7\x67\x5a\xad\x56\ +\x7e\xf4\xe8\xd1\xf3\x49\x92\xb4\xe2\x38\xde\x14\xc7\xf1\x50\x5f\ +\x7f\x3f\x52\x49\xa9\xdd\x70\xa3\x18\x55\x3a\x93\xa7\xc9\xe6\x2e\ +\xac\x09\xae\x56\x3d\x6d\x66\xc0\x18\xf5\x1d\x23\xb9\x4f\x42\x5c\ +\xee\xdb\xe2\x24\x34\xe0\xb3\x68\x5c\xae\x14\x1d\x3f\x53\x12\x97\ +\x4d\x51\x52\x0a\x97\x95\x25\x73\xb9\x0e\x21\x21\x68\xd9\x03\x50\ +\x74\x1c\x45\xae\xb8\x52\x19\x84\x5d\xc1\xfd\x33\xbb\x33\xef\xd4\ +\x51\xd9\x3e\xc1\x86\x0f\x7c\x90\xc1\x0f\x7e\x08\x5b\xaf\x53\x58\ +\xcb\x89\xe3\xc7\xe5\xb9\xe7\x9e\x3b\xf2\x8d\x6f\x7c\xe3\x8b\x5f\ +\xf9\xca\x57\xbe\xb6\xb4\xb4\x34\x89\xe7\xac\x9b\xdd\x06\x09\x07\ +\xd8\x2c\xcb\xf2\x53\xa7\x4e\xcd\x85\x61\xb8\x9c\xa6\xe9\x58\x1c\ +\xc7\x43\xbd\xfd\xfd\x22\x49\xa2\x3d\x37\xbf\x1a\x51\xa4\x79\xf4\ +\x18\xf9\xfc\x05\x4c\x14\x96\x83\xd7\xb5\x19\x52\xe7\x85\x92\xd0\ +\xcf\x9e\x2b\xd4\x77\x7f\xba\x8b\x33\x29\x51\x49\x4b\x59\x20\xf4\ +\x94\x9b\xed\xf8\xf5\x3d\xc2\x12\xa8\x9d\xef\x1d\x76\x40\xd1\xb4\ +\xde\x52\x02\x59\x8b\xef\x5d\x58\x28\x0a\x8f\xf2\x2a\x8a\xed\x74\ +\x48\xc7\xaf\x66\xe4\xd7\x3f\xca\xf0\xaf\xff\xba\x16\x69\x4a\x6e\ +\xad\x74\x85\x7f\xea\xa9\xa7\xfe\xe6\x91\x47\x1e\xd9\xb9\xb2\xb2\ +\x32\x09\x2c\x02\x2d\xc0\x76\x2d\xc0\x89\x88\x05\x6c\xa7\xd3\xc9\ +\xce\x9f\x3f\xbf\x14\xc7\xf1\x6a\x9a\xa6\x9b\x2a\x69\x3a\x54\xad\ +\xd5\x24\xa8\x56\xa5\x76\xdd\x75\x1a\x55\x2a\xd2\x38\x74\x90\x6c\ +\x61\xbe\x64\x5f\x14\xe7\x04\x6b\x3d\xe5\x2c\xeb\x92\x0f\x97\x97\ +\xa0\x54\xb6\xbe\x11\x78\x41\xbd\x39\x7b\x8e\xc0\xe6\x1e\xb4\x24\ +\xf4\x1c\x84\x73\x4a\x51\x5c\xea\xeb\x5d\xc5\x38\xf5\xee\x51\xe4\ +\xba\x66\xf2\x8a\x62\xdb\x1d\xe2\xd1\x51\xc6\x7e\xf3\xb7\x19\xba\ +\xf7\x83\x6a\x6b\x35\x69\xb7\x5a\x32\x79\xe6\x0c\xcf\x3f\xff\xfc\ +\xe1\xa7\x9f\x7e\xfa\x0b\x3b\x76\xec\xd8\xbd\xb8\xb8\x78\x1a\x58\ +\x14\x91\x06\x90\xe3\xf9\x95\x8b\x15\x40\xa9\x04\xd7\x6a\xb5\x3a\ +\x33\x33\x33\x0b\x95\x4a\x25\x8b\xa2\x68\x43\x25\x4d\xfb\xd2\x38\ +\x0e\xe2\xa1\x21\xa9\x6c\xbd\x5a\xa3\x9e\x1e\x69\x1e\x3d\x4a\xbe\ +\xb0\xe0\x99\xf3\xb2\x5f\x68\xad\xde\xee\x22\xb2\x2b\xc1\xf2\x22\ +\xc3\xee\xf9\x46\xeb\xcf\xa9\x78\xcc\x70\x76\x5d\xfc\xb6\x25\x06\ +\x94\x4f\xb2\xa5\x85\x75\x85\x2f\xd7\x36\x7c\xc1\xe3\x7c\x5a\x9d\ +\x8e\x5f\xcd\x96\xdf\xfa\x1d\x06\xde\xfb\x5e\x65\x68\x48\x56\x17\ +\x17\x99\x9a\x9a\xca\x9f\x7f\xfe\xf9\x23\x7b\xf7\xee\xfd\xf2\xe3\ +\x8f\x3f\xfe\xc4\xdc\xdc\xdc\xa9\xae\xf0\xaa\x9a\x77\xd3\xb0\xe0\ +\xb2\x2c\x71\x4d\x09\x8d\x46\x23\x9b\x99\x99\xb9\x50\xa9\x54\x5c\ +\x1c\xc7\x43\x95\x4a\xa5\x2f\x0a\x82\x20\x1d\x1a\x96\xea\xf6\x6b\ +\x34\x88\x22\x69\x9d\x3e\x43\xbe\xbc\xe4\xeb\x70\xfc\xb4\xbb\x6e\ +\x58\x2a\x0f\xad\x37\x79\xe7\x74\x4d\x40\xa4\x34\x79\xf1\xdc\x83\ +\xb3\x9e\x2c\xed\x0a\x4f\xe8\xc3\xa2\x2d\x13\x1c\x57\x86\x38\xd5\ +\x12\x14\x71\x38\x0c\x95\xad\xdb\xd9\xfc\xd1\x7f\xc9\xd0\x3d\x1f\ +\x54\x06\x87\x64\xf9\xc2\x1c\x67\xcf\x9e\xcd\x0e\x1c\x38\x70\x74\ +\xdf\xbe\x7d\x0f\x3e\xf6\xd8\x63\x8f\x9e\x3f\x7f\xfe\xf4\x95\x84\ +\xbf\x92\x02\xba\x4a\x70\x7e\xb5\x79\xb5\x33\x37\x37\x37\x97\x24\ +\x89\x89\xe3\x78\x30\x4d\xd3\xbe\x24\x0c\x83\xa8\xb7\x57\x7a\x6e\ +\x7c\x95\xaa\x75\xd2\x99\x9e\x26\x5f\x5a\x42\x0b\xeb\x05\x2f\x53\ +\x4f\x5f\x72\x7a\x25\x38\x57\xe6\xfb\xee\x22\x25\xdd\x6d\x8b\x77\ +\x0e\x4f\x94\x96\xd7\xbb\x2e\x75\x8e\x77\x07\x6b\x75\xcd\x9a\xdc\ +\xc5\xe5\x6d\x34\x88\xa8\x6c\x9b\x60\xe4\xde\x0f\xb2\xf1\xc3\x1f\ +\x51\x5b\xab\xc9\xca\xc2\x02\x53\x53\x53\xd9\x0b\x2f\xbc\x70\x74\ +\xef\xde\xbd\x5f\xdb\xb1\x63\xc7\x23\xd3\xd3\xd3\xa7\x80\x05\x11\ +\x69\x5e\x2e\xfc\x2b\x29\xa0\x9b\xa5\x5b\xc0\x2e\x2f\x2f\xb7\x66\ +\x66\x66\xe6\xa2\x28\x92\x28\x8a\x86\xd2\x34\x1d\xa8\x56\xab\xc6\ +\x24\x09\xf5\x1b\x6f\x14\xa3\x8e\xf6\xe4\x14\xd9\xe2\x92\x6f\x50\ +\x30\xbe\x27\x00\x29\x73\x83\x12\xb8\x5c\xb9\xe6\xe8\x43\xa6\x9f\ +\x59\xd5\x75\x16\x51\xce\xb8\x67\x7a\xdc\xda\x71\x67\x3d\x76\x78\ +\x32\x44\xb1\xd6\xc7\xf9\xca\xc4\x04\x9b\xee\xb9\x97\x0d\xbf\xf6\ +\x6b\xd8\x34\xa5\xd5\x6c\xca\x99\x33\x67\x8a\x03\x07\x0e\x1c\xd9\ +\xb3\x67\xcf\x23\x3b\x76\xec\x78\x78\x6a\x6a\xea\x78\x09\x78\x0d\ +\xdf\xe5\xf0\xf2\xb6\x82\xef\xa7\x00\xd7\x7d\x7f\x61\x65\x65\xa5\ +\x31\x37\x37\x37\x17\x86\xa1\x0b\x82\x60\x43\x9a\xa6\xc3\x7d\x7d\ +\x7d\x62\x92\x44\xeb\xd7\x5e\x87\xc1\x48\x6b\x72\x92\xce\xc2\xfc\ +\x1a\xf3\xeb\x5c\x59\xfa\xae\x95\x18\xac\x2d\xbe\x6a\xd7\x15\xd6\ +\x7a\x11\xbc\xc7\x3b\x55\x6c\xd7\x55\xba\xee\xd4\xcd\xe9\x9d\x17\ +\x5e\x4d\x40\x75\xfb\xb5\x6c\xbe\xf7\x57\xd9\x70\xcf\x3d\xea\x6a\ +\x35\xf2\xa2\x90\x13\x27\x4e\xf0\xbd\xef\x7d\xef\xf0\xde\xbd\x7b\ +\xbf\xba\x73\xe7\xce\x47\xa6\xa7\xa7\x8f\x77\x43\x5d\x17\xf0\xae\ +\xf8\x1a\xda\x0f\x68\xa7\xef\x2a\xc1\xae\xac\xac\xb4\x2e\x5c\xb8\ +\x30\x63\x8c\xe9\xa8\xea\xc6\x30\x0c\x87\x87\x86\x86\x90\x34\xa5\ +\xb6\x7d\xbb\x04\x41\x40\x7b\x6a\x8a\xf6\xcc\x9c\x4f\x56\xba\xb4\ +\x9a\xf1\x4d\x53\x97\x08\xee\xca\xc6\xa6\xf2\xb5\x99\xae\x95\x58\ +\xab\x17\x5d\x48\x64\xcd\x0d\x9c\xfa\x64\xc9\x39\xa8\x5f\x77\x3d\ +\xa3\xbf\xfa\x21\x36\xbc\xef\x7d\x68\x6f\x2f\x85\xb5\x1c\x3c\x78\ +\x50\x9e\x7d\xf6\xd9\x43\xfb\xf6\xed\xbb\x7f\xf7\xee\xdd\x5f\x9b\ +\x9e\x9e\x3e\x09\x2c\x95\xc2\x67\xaf\x24\xfc\x0f\xa3\x80\xcb\x95\ +\xd0\x39\x7f\xfe\xfc\x9c\x31\x66\x25\x08\x82\xd1\x20\x08\x86\x07\ +\x07\x07\x25\xa8\xd5\xb4\xb6\x7d\xbb\x04\x61\x48\xeb\xc4\x71\x1a\ +\x8b\x8b\xd8\xf2\xfd\x87\xc2\x2a\x85\xf3\xbb\x75\x17\xbf\x17\xd6\ +\xef\xd6\x2a\x79\x79\x6e\xfd\xf9\xbc\x3c\x5f\xa8\x5f\x10\xb6\x40\ +\xef\xb6\xad\x6c\xf9\xc8\x47\xd9\xf0\x81\xf7\xa3\x7d\xfd\x9a\xe5\ +\xb9\xbc\xf8\xe2\x8b\xb2\x7f\xff\xfe\xc3\x7b\xf6\xec\xf9\xdb\x5d\ +\xbb\x76\x3d\xd1\x05\xbc\x32\xce\xe7\xdf\x4f\xf8\x1f\xf6\x8d\x11\ +\x05\x0a\x11\x69\xa9\x2a\x73\x73\x73\x6e\xf7\xee\xdd\x3b\xad\xb5\ +\xd6\x39\xf7\x11\xe0\xba\xeb\x6f\xb8\x41\xaa\x03\x03\x3a\xfc\x9e\ +\xf7\x30\x74\xfb\xed\xe2\x96\x97\xaf\xdc\x8f\x2f\xeb\x8f\xe8\x2b\ +\x74\xee\xeb\x25\x2f\x0d\x5d\xb2\x64\xd9\xdb\x8b\x6c\xde\xac\x32\ +\x30\x40\xab\xd9\x92\x43\x07\x0f\xf2\xec\xb3\xcf\x1e\xde\xb3\x67\ +\xcf\x67\xbf\xf1\x8d\x6f\xec\x9e\x9f\x9f\x3f\x0d\x2c\x97\x63\x2d\ +\x7e\x90\xf0\x3f\xca\x2b\x33\x4e\x55\x73\x11\xdf\x4c\x36\x3f\x3f\ +\x7f\x6a\xe7\xce\x9d\x4f\x1a\x63\x22\x11\xf9\xd5\x30\x0c\xaf\xd9\ +\xba\x6d\x9b\xe9\xdd\xb8\x91\x78\x7c\x5c\x83\x20\x90\x4b\x49\xd3\ +\xf5\x0b\x37\x3f\x68\x4c\xf2\xf2\x37\xad\x4a\xaa\xda\x5a\xab\x59\ +\xa7\x23\xcb\x8b\x8b\x9c\x3c\x71\xc2\xed\xdf\xbf\xff\xe8\xbe\x7d\ +\xfb\x3e\xbf\x73\xe7\xce\x27\x57\x57\x57\xcf\xfc\xa8\xc2\xff\xa8\ +\xaf\xce\xaa\xaa\xae\x59\xc2\xea\xea\xea\xe4\xe3\x8f\x3f\xfe\x68\ +\x10\x04\x49\x18\x86\xef\x06\xae\x19\xdb\xb2\x25\x4c\xd3\x6e\x91\ +\xaf\xfc\x54\x37\xaf\x50\x69\xb7\xdb\x4c\x9e\x39\x53\xec\xdf\xbf\ +\xff\xe8\x33\xcf\x3c\xf3\x95\xc7\x1f\x7f\xfc\xd1\x46\xa3\x31\xf5\ +\xe3\x08\xff\xe3\xbc\x3b\xac\xa5\x25\xa0\xaa\xd2\x68\x34\xd8\xb5\ +\x6b\xd7\x83\xc6\x18\x03\xbc\x73\x69\x69\x69\x6b\x4f\x4f\x4f\xa8\ +\xfa\xd3\x96\x7e\x6d\xcd\x52\x56\x56\x56\x8a\xe3\xc7\x8f\x9f\xdc\ +\xb7\x6f\xdf\x23\xbb\x76\xed\x7a\xf0\x32\xe1\xf3\x7f\x92\x77\x87\ +\xcb\x2d\x06\x52\xa0\x77\x6c\x6c\x6c\xeb\xeb\x5e\xf7\xba\x3b\xfb\ +\xfb\xfb\x5f\x15\x04\x41\xdd\x39\xa7\x3f\xe1\xb3\xaf\xa8\x7c\x63\ +\x8c\x58\x6b\x57\x17\x17\x17\x5f\xfc\xce\x77\xbe\xb3\x7b\x72\x72\ +\xf2\x24\xb0\x8c\x6f\xc7\xca\xfe\xc9\x5e\x9e\x5e\x77\x6f\x58\xf6\ +\x81\xd5\x81\x1e\xa0\x56\x2a\x26\x58\xf7\x2e\xe4\x4f\x45\xf8\x75\ +\xc9\x59\x56\x26\x36\x2b\xc0\x6a\x89\xf6\x3f\x92\xd9\xaf\xdf\xfe\ +\x1f\xba\xc9\xa0\xf1\xd3\x43\x85\x2f\x00\x00\x00\x00\x49\x45\x4e\ +\x44\xae\x42\x60\x82\ \x00\x00\x0b\x2d\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -190,80 +1221,6 @@ \x57\x58\xe6\x90\x67\x11\xf2\xd4\xf9\x2c\x77\xe2\x73\x08\xbc\x41\ \xbc\x15\x05\x78\x11\xb1\xff\x01\xed\xeb\x89\x21\x3a\xe3\x55\x01\ \x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x04\x7f\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ -\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\ -\x00\x00\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\ -\x5e\x1a\x91\x1c\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x01\x0a\ -\x17\x02\x30\xf6\x73\x58\xfb\x00\x00\x03\xff\x49\x44\x41\x54\x48\ -\xc7\xbd\x95\x6b\x4c\x9b\x75\x14\xc6\x9f\xb7\xd7\xc1\xe8\xe8\xca\ -\x66\x3b\x4a\xc9\x80\x7a\x03\x5a\xca\x8c\x81\x99\x60\x5e\x37\x2e\ -\x92\x2c\xd9\x07\x2c\x4a\xe4\x36\x32\x34\xc6\x84\x0c\xe2\x40\x12\ -\x63\x5f\xb2\xa8\x89\x41\xe2\x52\xd6\x80\x51\xc1\x38\xa5\xc8\x75\ -\x1b\x42\x3b\x88\x62\x59\x02\x6c\x0c\x07\x04\x4a\xe2\x56\x20\x8b\ -\x5c\x02\x65\xa9\xb6\x89\xbc\x57\xbf\xa0\x21\x0a\x8c\x6e\xd1\xf3\ -\xf9\x7f\xce\xef\xfc\x9f\x73\x9e\x1c\xe0\x3f\x0e\xe2\x51\xf3\x2a\ -\x2a\x2a\x4c\x99\x99\x99\x65\xa1\xa1\xa1\xa9\x1c\xcf\xc9\xfc\x7e\ -\xdf\xdd\x55\xef\x5a\x6b\x6d\x4f\xdd\xe5\x99\xb6\x19\xfa\xb1\x9a\ -\xb2\x58\xde\x2b\x59\x5c\x5a\xa4\x39\x8e\x15\x7c\x3e\x9f\x30\x37\ -\x3f\x27\xdc\x1e\x1f\x13\x3a\x3a\xdb\xf8\x8a\x77\xce\x59\x01\x48\ -\xfe\x7a\x2c\xd9\x9a\x39\x38\x38\x28\x3c\xac\x7a\x4d\x4d\x8d\x3e\ -\xf5\xf8\x0b\xf5\x52\xa9\x54\xca\x32\x1c\xc4\x12\x31\x5a\xed\x76\ -\xbe\xa3\xa3\xc3\x73\xe7\xce\x44\x0f\xc3\x30\x76\x00\xc2\xb6\x80\ -\x4d\xc8\xae\x00\x85\x62\xff\xe9\xf0\x70\x45\x08\xc7\x71\x60\x58\ -\x1a\x04\x41\xa0\xb7\xcf\xf1\xf5\xad\x5b\x63\xd5\x14\x45\x2d\x92\ -\x24\x79\x8e\x24\x49\x62\x47\x00\x00\x50\x14\xb5\xd3\x6c\xc4\x45\ -\x45\xf9\x76\x8f\x67\x1e\x31\x31\x7a\x30\x0c\x03\x91\x58\x8c\x23\ -\x1a\x8d\x1b\xc0\xf2\x76\x09\xa2\x20\xf5\x0f\x79\x36\x3e\xe1\x79\ -\xb7\x7b\x06\x2c\xcb\x80\x65\x59\xb0\x0c\x8b\xc2\xc2\x82\xf4\xf8\ -\xf8\x78\xe9\xd6\xc6\xaa\xaa\xaa\xc2\x83\x06\xa4\xa5\xa5\x3d\xa5\ -\xd7\xc7\x45\x4b\xa5\x32\xb8\x67\xdc\x20\x08\x02\x2c\xcb\x20\x56\ -\x1f\x97\x5e\x5c\x5c\xd0\x5b\x56\x56\x16\xbd\xbc\x7c\xff\xb9\xeb\ -\xd7\x9d\x5f\x28\x0e\x84\x8d\x05\x0b\x20\x48\xf2\xc5\x53\x5a\xad\ -\x96\xd0\x6a\xb5\xe8\xec\xea\xc6\x47\x1f\xd7\x82\x65\x59\xec\x93\ -\xcb\x11\xa5\x8b\x3e\x19\xba\x3f\x64\x56\x1f\xf7\xcc\x58\x64\x64\ -\x64\xc9\x90\x6b\xe8\x41\xb0\x00\x79\xa2\xc1\x98\x73\xf7\xde\x1c\ -\x3a\xbb\x7b\x60\x3a\x76\x0c\x3d\x0e\x07\x26\xa7\xa6\x00\x01\xd0\ -\xe9\x74\x08\x0b\x0b\x0b\x91\xed\x93\x11\x23\xa3\xa3\x6c\x7f\xff\ -\x40\x4b\x30\x00\x82\xa2\xde\x37\x27\x9b\x4c\x46\x43\x42\x02\x7e\ -\x5d\x5a\x82\x58\x24\x42\x6c\x4c\x0c\x5a\xdb\xdb\xc1\xf3\x3c\x94\ -\x4a\x25\x08\x82\xc0\xac\x7b\x56\xa8\xae\xac\x76\xf2\x3c\xdf\xb2\ -\xe3\x16\xfd\xb3\xb8\xcd\x66\xcd\x4b\x49\x39\xde\xb8\xb2\xb2\x02\ -\x83\xc1\x80\xec\xac\x0c\xf4\x3a\x1c\x38\x1a\xa5\x85\x29\xc9\x08\ -\x99\x5c\x86\xd5\xd5\x15\xac\x7b\xd7\x99\xd7\x2d\xf9\xdf\x33\x0c\ -\x53\x0d\x60\x05\xdb\x78\x40\xa0\x28\xea\x6f\x93\x98\xcd\x66\x71\ -\x73\xf3\x97\x96\xcb\xdf\x7e\xc3\x65\x65\x65\x09\x29\xa9\x29\x82\ -\xcb\xe5\x12\x3c\x9e\x7b\xc2\x8f\x83\x3f\x70\x79\x79\xaf\xfd\xf6\ -\x12\x49\xce\x91\x24\xe9\x12\x8b\xc5\x56\x00\x85\x9b\x66\xdd\xdd\ -\x07\x00\x50\x52\x52\xa2\x38\x91\x71\xa2\x69\x7a\x6a\x3a\xc7\xe9\ -\x74\x22\x42\x15\x01\x9d\x2e\x1a\x6a\x8d\x9a\xbf\x74\xc9\x76\xd3\ -\x6a\xb5\x5e\xa3\x69\xfa\x36\x80\x39\x00\x6b\x00\xfc\x14\x45\x6d\ -\x6c\xa6\x0b\xbb\x02\xca\xcb\xcb\xf5\xa6\x64\x43\x47\x5b\xeb\x77\ -\xc6\xf1\xf1\x9f\xa1\x52\xa9\xc0\xb2\x2c\xce\x14\x17\x09\x36\x9b\ -\xad\xeb\xe2\xa7\x17\x2b\x01\x2c\x00\xe0\x1e\xa6\xef\xbf\x00\x7e\ -\xbf\x2f\xfb\xc9\xa7\xe3\x46\x6c\xb6\x86\x88\xf9\xf9\x05\x48\xa4\ -\x12\xd0\x34\x8d\x97\xb3\xb3\x30\x39\x39\xe5\xda\x2c\xee\xd9\xeb\ -\xea\x6d\x05\x48\xaf\x5e\xed\xae\x3e\xac\x3e\x7c\xad\xa1\xe1\x33\ -\xc9\xda\xaa\x17\x22\x91\x08\x1c\xcb\x21\x29\x39\x09\xaa\x83\xaa\ -\x5f\x4a\x4b\xdf\x38\xbf\x29\x09\x82\x02\xe8\xf5\x7a\x79\xd1\x99\ -\xfc\x7a\xb5\x5a\x73\x76\x7a\x7a\x1a\x07\x14\x0a\xd0\x1b\x34\x02\ -\x81\x00\xa2\xa2\xa2\x90\x71\x32\xdd\x5b\x79\xbe\xaa\x12\xc0\xf8\ -\x56\x7d\xf7\x12\x22\x00\x78\xf3\xad\xd2\x2a\x8e\xe3\x72\x9b\x9a\ -\xbf\x7a\xd7\xbb\xfe\xe0\x15\xf3\xab\xe6\xfb\x4a\xa5\x12\x5a\xad\ -\x16\xc5\xc5\x85\x1b\x9f\xd4\xd6\x7d\xe0\xf5\x7a\xfb\xf6\xa2\xf9\ -\xb6\x3f\x38\x14\x71\xc8\x7c\xa5\xeb\xca\xcd\xe1\x1b\xc3\x8d\xc3\ -\x37\x86\x7d\x26\x43\x82\xc6\x68\x34\xd4\x27\x1a\x12\x79\x7b\x8b\ -\xfd\xf3\xdc\xdc\xdc\x3a\x00\x75\x8f\x72\x9d\x24\x00\x20\x97\xcb\ -\x7e\x57\x1f\xd1\xa8\x01\xa8\x01\xf8\xff\x60\x99\x27\x92\x93\x93\ -\x04\x47\x9f\xa3\xdb\x62\xa9\x79\xfb\xb1\x6f\x72\x63\xa3\xad\x20\ -\xfc\x60\x78\xd3\xe8\xc8\xe8\x08\x41\x10\x0b\x31\xb1\x47\x73\x7e\ -\x1a\x1c\xea\x6f\x6f\xeb\x2c\x0b\x76\xa8\x3b\x1d\x7d\xd1\x85\x0f\ -\x2f\x14\x31\x0c\x7d\x36\x10\x08\x10\x13\x13\x93\x3d\x03\xce\x81\ -\x66\x00\x4b\xc1\x0e\xf5\x7f\x8f\x3f\x01\x2e\x51\xa3\xa9\xc7\xde\ -\x69\x7b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x20\xb1\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -790,523 +1747,6 @@ \x53\x4d\x4d\x4d\xc1\xa9\xa6\xf6\x23\xda\xff\x01\xb7\xbe\xbf\x34\ \x7c\xc5\x7a\x2d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \ -\x00\x00\x20\x26\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\ -\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ -\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\ -\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\ -\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x02\x15\ -\x0e\x23\x2f\xab\xc9\xe5\x0b\x00\x00\x00\x1d\x69\x54\x58\x74\x43\ -\x6f\x6d\x6d\x65\x6e\x74\x00\x00\x00\x00\x00\x43\x72\x65\x61\x74\ -\x65\x64\x20\x77\x69\x74\x68\x20\x47\x49\x4d\x50\x64\x2e\x65\x07\ -\x00\x00\x1f\x7d\x49\x44\x41\x54\x78\xda\xcd\x9b\x69\x90\x5d\xd7\ -\x71\xdf\x7f\x7d\xee\xfa\x96\xd9\x07\xc4\x00\x33\x18\x02\x03\xae\ -\x22\x45\x53\x0b\x25\xd2\x91\x44\x53\x8a\x2d\x89\x91\x17\xad\xa4\ -\x2c\x5b\x52\x12\xc9\xf1\x56\x72\xca\xa9\xe4\x4b\x2a\x1f\x52\x89\ -\xbf\x38\x49\x39\x72\xe2\x4d\x92\x63\x4b\xb1\x55\x12\x4d\x49\xb4\ -\xc5\x45\x24\x41\x10\xa0\x44\x09\x80\x28\x42\x22\x41\x12\xfb\x3a\ -\x33\x00\x66\x06\xb3\xbf\xed\xde\x7b\x4e\xe7\xc3\xb9\x6f\x30\x00\ -\x41\xed\x76\xe5\x56\xdd\x79\x6f\xee\xf6\x4e\xf7\xe9\xfe\x77\xf7\ -\xff\xf4\x85\x1f\x73\x7b\xf1\xc5\x17\xf9\xff\x65\xfb\x49\xc6\x12\ -\xfe\x34\x06\x70\xe0\xc0\x81\xde\x9e\x9e\x9e\x9f\x37\xc6\xbc\x4e\ -\x44\x7a\x01\xfb\x8f\x24\x6b\xa0\xaa\xcb\xce\xb9\xef\xac\xac\xac\ -\x3c\x7e\xf3\xcd\x37\x2f\xff\xa4\x0f\x94\x1f\xe7\xa6\x3d\x7b\xf6\ -\x70\xfb\xed\xb7\x03\xf0\xf5\xaf\x7f\xbd\x32\x3a\x3a\x7a\x6f\xad\ -\x56\xfb\x70\x14\x45\x37\x1b\x63\x22\x40\x45\x04\x91\x2b\x3f\xfe\ -\xf2\xe3\xaa\xfa\x8a\xbf\xa5\xaa\xeb\xcf\x8b\x73\x2e\xcf\xf3\xfc\ -\x40\xa3\xd1\xf8\xdc\xd4\xd4\xd4\x17\xde\xfc\xe6\x37\xb7\x2e\x1f\ -\xd3\x3f\xea\xf6\xe0\x83\x0f\xae\x7d\x7f\xe0\x81\x07\x92\xe3\xc7\ -\x8f\x7f\xe8\xdc\xb9\x73\xdf\x5c\x5c\x5c\x6c\xaf\x36\x1a\xda\x6c\ -\xb5\xb4\xd5\x6e\x6b\xbb\xd3\xd1\x4e\xb9\x67\x59\xe6\xf7\x3c\xd7\ -\x2c\xcf\x35\xcf\x73\x2d\x8a\x42\xf3\xa2\xf0\x9f\xeb\x8e\x67\x79\ -\xbe\x76\x7d\xa7\xd3\xd1\x76\xbb\xad\xad\x56\x4b\x5b\xad\x96\x36\ -\x5b\x2d\x5d\x5d\x5d\xd5\x85\x85\x85\xf6\xb9\x73\xe7\xbe\x79\xfc\ -\xf8\xf1\x0f\x3d\xf0\xc0\x03\xc9\x95\xc6\xf6\x8f\xb2\xed\xd9\xb3\ -\x67\xed\xfb\xfd\xf7\xdf\x9f\x1e\x3e\x7c\xf8\xdd\xd3\xd3\xd3\x7b\ -\x16\x16\x16\x8a\x46\xa3\xa1\xed\x2c\xd3\x8e\xb5\x2e\x73\x4e\x73\ -\xa7\x5a\xa8\xdf\x6d\xb9\xbb\x72\xbf\xd2\xe6\xd6\xed\xdd\xeb\x0b\ -\x55\xcd\x55\x35\x73\x4e\x33\xe7\xb4\x63\xad\x6b\x67\x99\x36\x1a\ -\x0d\x5d\x58\x58\x28\xa6\xa7\xa7\xf7\x1c\x3e\x7c\xf8\xdd\xf7\xdf\ -\x7f\x7f\x7a\xa5\x31\xfe\x54\x5d\x60\xff\xfe\xfd\xbc\xe6\x35\xaf\ -\x01\x60\xe7\xce\x9d\xb5\xcd\x9b\x37\xbf\xa5\x5e\xaf\xff\xa7\x4a\ -\xb5\x7a\x47\x9a\x24\x88\x88\xae\x9c\x3c\xc1\xe2\xb1\xe3\x92\x35\ -\x56\x41\x04\xb8\xd4\x0d\x8c\xc8\xda\x2f\x0a\x82\x5e\xb4\x73\x7f\ -\x5c\x41\xfd\x1f\x7f\x4e\xb5\xbc\x46\x41\x95\xb8\x56\xa3\x6f\xfb\ -\x76\xed\xdd\xba\x0d\x55\x95\x76\xa7\x43\xab\xd9\xfc\xd6\xea\xea\ -\xea\x7f\x39\x7b\xf6\xec\x53\x77\xdd\x75\x57\xe3\xf2\xb1\xfe\x54\ -\x14\xf0\xdd\xef\x7e\x97\x5b\x6f\xbd\xb5\xeb\xf3\xf5\x91\x91\x91\ -\xb7\x56\xab\xd5\xff\x90\x56\x2a\xff\x2c\x89\x63\x44\x55\x57\xcf\ -\x9c\x91\x43\x9f\xfe\x33\x0e\xff\xcd\xe7\x58\x99\x5d\xea\xca\xb3\ -\xf6\xd9\xfd\x31\x53\xfe\xaf\x57\x18\x88\x00\xee\xb2\xeb\xd7\x3f\ -\xa3\x77\x43\x1f\xd7\xfe\xda\x87\xb9\xfe\xe3\xbf\x45\x6d\xcb\x16\ -\x45\x44\xda\xed\x36\xed\x76\xfb\xe9\x56\xab\xf5\x87\xe7\xcf\x9f\ -\xdf\xf9\xa6\x37\xbd\x69\xf5\xf2\x31\xff\xd8\x0a\x78\xee\xb9\xe7\ -\x00\xb8\xe5\x96\x5b\xba\xc2\xf7\x8c\x8c\x8c\xdc\x5d\xad\x56\x7f\ -\x2f\x4d\xd3\x3b\x92\x24\x51\x50\x56\x4f\x9d\x92\x83\x9f\xfe\x14\ -\x8b\x0f\xfd\x3d\x3d\x4b\x33\xf4\xd7\x13\x50\xc1\xb5\x1d\x61\xcd\ -\x80\x03\x2d\x20\x88\x04\x13\x09\xae\x50\x34\x57\x4c\xc5\x5b\x84\ -\x6d\x28\x26\x11\x24\x14\x5c\xee\x70\x05\x98\x00\x54\xa0\x58\x75\ -\x04\x55\x03\xa2\x2c\xae\x76\x58\xe9\xbb\x8a\xfe\xbb\x7f\x89\xeb\ -\x3f\xf6\x1b\xd4\xc7\xb7\xaa\x0a\x74\x3a\x1d\xe9\x74\x3a\xdf\x6a\ -\x36\x9b\x9f\x3c\x77\xee\xdc\xc3\x6f\x7e\xf3\x9b\x57\xae\x34\xfe\ -\x9f\x28\x0c\x3e\xf9\xe4\x93\x7d\x23\x23\x23\xbf\x52\xad\x56\xff\ -\x4d\x9a\xa6\x77\xc4\x71\x8c\x3a\xc7\xea\x99\xd3\x1c\xfa\xf4\x9f\ -\xb3\xf2\xe8\x57\xe9\x59\x9c\xa5\x1e\x45\x68\x0e\xa2\x10\x24\x01\ -\x61\x2a\xa0\x82\x6d\x39\xd4\x2a\xd6\x2a\x88\x60\x52\x83\xa9\x88\ -\x9f\xdd\x4c\xd1\x42\xa1\xf0\xf3\x6d\x22\x21\x48\x05\x54\x71\x99\ -\x57\x1e\x02\xf5\x20\x86\xc5\x39\x56\x1e\xff\x2a\x07\x51\xae\xff\ -\xd8\x6f\x52\x1f\x1f\x27\x8e\x63\x44\xe4\x0e\x11\x61\x64\x64\x24\ -\x7d\xf2\xc9\x27\x1f\xb8\xeb\xae\xbb\x96\x7e\x22\x17\x58\x6f\x42\ -\x4f\x3d\xf5\x54\xff\xe8\xe8\xe8\xfb\x2a\x95\xca\x47\x93\x24\xb9\ -\x2d\x8a\xe3\x58\x40\x9b\x53\x53\xf2\xe2\xff\xfa\x24\xab\x3b\x1e\ -\xa6\x67\x71\x81\x6a\x28\x84\x89\xc1\x84\x02\x4e\xd0\x8e\x12\xd6\ -\x0d\x58\x50\xab\x98\x48\x30\xa1\x17\xc8\x15\x8a\x49\xbd\xe1\xdb\ -\xa6\xc3\x24\x06\x13\x94\x16\x60\x15\x29\xa7\xa6\x68\x94\x96\x62\ -\x14\x97\x2b\x79\xe6\x68\x5a\x65\xa5\x67\x80\xfa\xdb\xee\xe6\x55\ -\x9f\xf8\x04\xd5\xd1\x31\x75\xaa\x92\x67\x59\x96\x65\xd9\xb7\x5b\ -\xad\xd6\x5f\x4f\x4d\x4d\xdd\xff\x96\xb7\xbc\x65\xf1\x07\xb9\x83\ -\xb9\xd2\xc1\xbd\x7b\xf7\xae\xdd\xb0\x7b\xf7\xee\xbe\x4d\x9b\x36\ -\xbd\x2f\x49\x92\x8f\xc4\x71\xfc\xda\x30\x0c\x63\x13\x04\xb4\x67\ -\xce\xf1\xfc\x27\xff\x88\x95\x47\x1e\xa2\x6f\x79\x81\x9a\x11\xa2\ -\xc0\x10\xc6\x86\xb0\x12\x78\x45\x58\x10\x27\x88\x13\x0c\x42\x18\ -\x1b\xa2\x6a\xf7\x9c\xc1\x38\x83\x71\x10\x60\x88\x12\x43\x54\xf3\ -\x0a\x0c\xf0\xe7\xc5\x09\xc6\xf9\xfb\xc2\x34\xf0\xf7\x07\x86\x2a\ -\x42\xef\xca\x02\x2b\x8f\x3e\xc4\x81\x4f\xfe\x11\xed\xf3\xe7\x08\ -\xc2\x80\x28\x8a\xe2\x38\x8e\x5f\x9b\x24\xc9\x47\x36\x6d\xda\xf4\ -\xbe\xdd\xbb\x77\xf7\x01\xdc\x7a\xeb\xad\xec\xdd\xbb\xf7\x87\xb3\ -\x80\xf5\x09\xc5\x13\x4f\x3c\xd1\x3b\x36\x36\xf6\x9e\x5a\xad\xf6\ -\xb1\x24\x49\x5e\x1b\x45\x51\x25\xae\x56\x59\x3a\x76\x4c\x5f\xf8\ -\xe3\xff\x29\xab\x0f\xfd\x03\xfd\xed\x15\xfa\x7a\x22\x0c\x7e\xd6\ -\x25\x10\x82\x48\xbc\xdf\xe7\x4a\x54\x37\xa8\x13\xef\xf3\x81\xf7\ -\x73\xb5\x0a\x0e\x4c\xd5\xc3\x9b\x6d\x80\x09\x81\x40\xd0\x42\x51\ -\xa7\x48\xe4\xcf\x15\x2b\x8a\x24\xa0\x06\x5c\xae\xa8\x55\x34\x00\ -\xe7\x1c\xcb\xab\x39\x8b\x69\x2f\xb5\x77\xfe\x22\x37\xfd\xde\xbf\ -\xd5\xde\xed\xdb\x25\x6b\x36\x29\xf2\xbc\xd5\xe9\x74\x9e\x6d\x34\ -\x1a\x9f\x99\x9c\x9c\xfc\xf2\xdb\xde\xf6\xb6\xe5\x57\x4a\x96\xcc\ -\xe5\x49\x4e\xf7\x82\xa7\x9f\x7e\xba\x3e\x3a\x3a\x7a\x77\xb5\x5a\ -\xfd\x8d\x24\x49\x6e\x8b\xa2\xa8\x12\x55\xab\xcc\x1f\x3c\xa8\x2f\ -\xfd\xe9\x9f\xc8\xfc\xfd\x5f\x64\xa0\xb9\x44\x5f\x35\x22\x4c\x02\ -\x82\xc4\x60\x8c\x60\x1c\x48\xe1\xf7\x30\x31\x84\xa9\x21\xaa\x08\ -\x41\x28\x88\x03\x32\x10\x2b\x04\x89\x10\x56\x84\x30\xed\x9e\x13\ -\x24\x53\xc4\x79\xb0\x8c\xaa\x42\x58\x09\x30\xdd\x73\x16\xc4\x82\ -\x09\x84\xa8\x62\x88\xd2\x80\xde\x34\x62\xa0\xb9\xc4\xfc\x97\xbf\ -\xc0\x4b\x7f\xf6\x27\x32\x7f\xf0\xa0\x46\x95\x0a\x61\x14\x55\x92\ -\x24\xb9\xad\x5a\xad\xfe\xc6\xe8\xe8\xe8\xdd\x4f\x3f\xfd\x74\x1d\ -\xe0\xf6\xdb\x6f\x7f\x59\xb2\xb4\xa6\x80\x1d\x3b\x76\xf0\xae\x77\ -\xbd\xab\x3b\xf3\xb5\xc1\xc1\xc1\xb7\x56\x2a\x95\x4f\x24\x49\x72\ -\x47\x18\x86\xb1\x09\x43\x96\x8e\x1e\xd5\x43\x9f\xfe\x94\x9c\xfb\ -\xec\xa7\xd9\x12\x5b\xfa\x7b\x52\x0c\x5e\x30\xb1\x42\x60\x84\x20\ -\x36\x04\xa9\x21\x48\x0c\x62\x05\xca\x3d\x10\xf1\xca\xa8\x1b\xc2\ -\x54\x10\xdb\xdd\x0d\x81\x7a\xd3\x8f\xea\x86\x30\x11\x8c\x0a\xe4\ -\xfe\xb9\xc6\x79\x25\x45\x15\xe3\x5d\x47\x04\x0a\x4a\xb7\x32\xf4\ -\xf7\x24\x6c\x49\x95\x73\x9f\xfd\x34\x47\x3e\xfd\x29\x59\x3a\x76\ -\x4c\x4d\x10\x10\x86\x61\x9c\x24\xc9\x1d\x95\x4a\xe5\x13\x83\x83\ -\x83\x6f\x7d\xe2\x89\x27\x6a\x00\xef\x7a\xd7\xbb\xd8\xb1\x63\xc7\ -\x45\x17\xd8\xbd\x7b\x37\x00\x77\xde\x79\x27\x00\xf7\xdd\x77\x5f\ -\x7a\xe3\x8d\x37\xbe\xb5\x56\xab\xfd\xc7\x4a\xa5\xf2\xb3\x69\x9a\ -\x02\x68\x7b\x76\x96\xe7\xff\xfb\xff\x90\xa5\xaf\x7c\x81\x2d\xa9\ -\xa3\xb7\x9e\xe0\x1c\xb8\x86\x62\x62\x81\x42\x08\x13\x21\xac\x1b\ -\x4c\x22\x60\xa1\x98\x71\x04\x35\x0f\x82\x12\x42\xd8\x13\x10\x54\ -\x05\xd7\x56\x8a\x79\x87\x24\x94\xb1\x4e\x09\x07\x0c\x92\x0a\xb6\ -\xa9\x14\xcb\x16\xb5\x20\x06\x6c\x1b\x82\x61\x41\x02\xc5\x76\x94\ -\x62\xc5\x61\x33\x07\x81\x0f\xa7\xa6\x06\xc6\x08\x4b\xab\x1d\xce\ -\xb4\x84\xbe\x77\xdf\xc3\xab\x7f\xff\xdf\x69\xb2\x61\x18\x10\xe9\ -\x74\x3a\xb4\x5a\xad\x6f\x36\x1a\x8d\x3f\x78\xe9\xa5\x97\x76\x7e\ -\xe0\x03\x1f\x68\x97\xd8\xc6\x9d\x77\xde\x79\x29\x06\x7c\xe6\x33\ -\x9f\x49\xde\xf0\x86\x37\xdc\x5d\xab\xd5\xfe\x7d\xa5\x52\xf1\x71\ -\x5e\x95\xd6\xb9\x73\xf2\xd2\xff\xfe\x24\xcd\x47\x1e\x62\xb0\xb9\ -\x44\x5f\x6f\xea\xfd\x59\x3d\xa2\x87\x35\x3f\xdb\x02\x98\xd8\x5b\ -\x01\x16\xdc\xaa\x12\x0d\x1a\xb0\x3e\x22\x98\x54\xbc\x72\x3a\x8a\ -\x6b\x83\xe9\xf3\x3f\x6f\x97\x1c\xa6\x66\x90\x08\x5c\x47\xd1\xcc\ -\x63\x80\x33\x4a\x7e\xc1\x11\xf4\x79\x7c\xb0\x6d\x87\xcb\x14\x35\ -\x8a\x0a\xd8\x86\x2b\xf1\x41\xb0\x99\x63\x69\xb9\xcd\x7c\xb5\x8f\ -\xea\x3b\xfe\x05\x37\xfc\xee\x27\xa8\x6c\x1c\x51\x44\xe8\x74\x3a\ -\xd2\x6e\xb7\xbf\xd5\x68\x34\xfe\xdb\xbe\x7d\xfb\x1e\xfe\xd8\xc7\ -\x3e\xd6\xe9\x82\x7d\xd0\x15\xfe\xf3\x9f\xff\x7c\xed\x96\x5b\x6e\ -\x79\x6f\xad\x56\xfb\xfd\x34\x4d\x6f\x4f\xd2\x04\x51\xa5\x71\xe6\ -\x0c\x87\xff\xe2\x4f\xa5\xfd\xe4\xa3\x0c\x76\x96\xa9\x47\x31\x64\ -\x52\x9a\xbe\x10\x24\x86\xb0\x62\x08\x22\x83\x58\xaf\x10\x29\x40\ -\x72\x21\xac\x05\x04\x35\xe3\x7d\xdc\xfa\xe3\x74\x4a\x77\xa9\x1b\ -\x82\x9a\xf8\x90\x59\x78\xa5\xd0\xf1\x85\xb4\x89\xbb\xe7\xfc\x73\ -\x34\xf7\x80\xaa\x39\x98\x50\x08\x6a\x06\x91\x12\x4c\x73\x0f\x9c\ -\xb6\x05\x49\x12\x12\x49\x87\xd5\xe9\x29\x96\x66\xe7\xe9\xb9\xe6\ -\x5a\xe2\xde\x5e\x82\x20\x10\x60\x0b\xb0\x75\x78\x78\xb8\x71\xe7\ -\x9d\x77\x1e\xfb\xd2\x97\xbe\x94\x7f\xfc\xe3\x1f\xf7\x0a\xd8\xb5\ -\x6b\x57\xff\xf8\xf8\xf8\xfb\x6b\xb5\xda\x6f\x56\x2a\x95\x37\x24\ -\x69\x2a\xa2\xaa\xab\xa7\x4f\xc9\xd1\xbf\xfc\x8c\x34\x1f\x7f\x84\ -\xbe\xd5\x45\x6a\x12\x10\x88\x4f\x52\xc2\xd4\x20\x81\xf7\xd3\xc0\ -\x78\x7f\x36\xf8\xe3\x41\x45\x08\x02\x41\xb2\xae\x80\xa5\xcf\xa6\ -\x86\xb0\xba\xee\x98\xc1\x03\x63\x2e\x84\x55\x7f\x9f\x98\x12\x2c\ -\xd5\x2b\xcd\xb5\x14\x53\xf7\x96\x23\x94\xd1\xc5\x51\x46\x19\x90\ -\x58\x30\xb1\xf7\x24\x51\x21\x44\x30\xad\x16\xab\xa7\x27\x59\x5e\ -\x5e\x91\xda\xb6\x09\x89\xfb\xfb\x35\x8c\x22\x11\x91\xcd\xc6\x98\ -\xd1\x81\x81\x81\xce\xbd\xf7\xde\x7b\xe2\x4d\x6f\x7a\x53\xdb\x00\ -\xd4\x6a\xb5\xb7\xa7\x69\xfa\x91\x24\x49\x5e\x1b\xc5\xb1\x41\x55\ -\x57\x4f\x9f\x96\x63\x7f\xf5\x97\x34\xbf\xf6\x10\x3d\x0b\xf3\xd4\ -\xc4\xc7\x64\x29\xe3\x79\x10\x1b\x82\xa8\x1c\xac\x05\x32\x45\x80\ -\x20\x16\x6f\x11\x15\x03\xb9\x9f\x6d\x29\x04\x03\x84\xa9\x10\xf6\ -\xfa\x88\x21\x19\x98\x42\x90\x5c\x30\x85\x10\xa4\xa6\x3c\xb7\x2e\ -\x22\x14\x3e\xaa\x84\x69\x69\x65\xa9\xf1\x4a\xe8\x00\x85\x07\xc8\ -\xa0\x74\xb9\x30\xf1\x2e\x69\x0a\xf1\x79\xc2\xd2\x02\xad\xc7\x1e\ -\xe6\xf8\x67\xff\x92\xc6\xe9\xd3\x82\x53\x8d\xe2\xd8\x24\x49\xf2\ -\xda\x34\x4d\x3f\x52\xab\xd5\xde\xde\x4d\x85\x0d\xf0\xfa\x28\x8a\ -\x6e\x8a\xa2\x28\x0e\xc2\x90\xe5\x63\xc7\x38\xfe\x57\xff\x87\xd5\ -\x47\x1e\xa4\x6f\x71\x9e\x5a\x1a\x12\xc6\x81\x0f\x71\x5a\x9a\x24\ -\x3e\xdd\x35\x81\x1f\x84\x84\x7e\x76\xc8\x40\xb5\x74\x8f\x14\x82\ -\xe4\xe2\x71\xc9\xbc\xcf\x4b\xee\x05\x36\x55\x01\x2d\x5d\xa6\x34\ -\x7f\x29\x84\x20\x02\x62\x5f\x2d\x9a\x96\x81\x36\xa8\x51\xc8\x7c\ -\x2e\x61\x22\xc1\xa1\x60\x9d\x77\x0d\x29\x9f\x6f\xf0\x96\x47\x40\ -\xcd\x29\x6e\xfe\x02\xcb\x0f\x3d\xc8\x51\x07\x13\x1f\xfd\x57\xf4\ -\x4c\x6c\x27\x8a\xa2\xb8\x28\x8a\x9b\x80\xd7\x03\x7f\x17\x02\x71\ -\x51\x14\x7d\x22\x12\x19\x63\x40\x44\xdb\x27\x4f\xca\xfc\xdf\x7d\ -\x91\xe1\xa2\x45\x3d\x8e\x09\x23\x1f\x8f\x8d\x08\xb4\x0a\x74\x39\ -\x43\xe3\xd2\x4c\x43\x90\x24\xc2\x44\x31\x14\xa1\x9f\x71\x01\x71\ -\xbe\xc0\x09\x2a\x5e\x68\x2d\x1c\x34\xdb\xd0\x74\x5e\x71\xc9\xc5\ -\xf2\x58\x0a\x41\x0b\x01\xe3\x43\x1b\x49\x80\xd4\x0c\x8a\xa2\x2b\ -\xde\xc7\xc5\x78\x1c\x30\x36\x83\xb8\x40\x2d\x68\xcb\xa2\x4e\x71\ -\x01\xd8\x86\x85\x48\x90\x54\x10\x15\x02\x31\xd4\xa3\x00\x5d\x9c\ -\xe3\xc2\xdf\x7d\x91\xd6\xcf\xdd\x25\x3d\xd7\x5c\xa3\xc6\x18\x11\ -\x91\xa8\x28\x8a\x3e\x20\x0e\x81\x38\xcb\x32\x51\xf5\xc4\x93\x82\ -\x84\xed\x26\xfd\x0b\xf3\xf4\x8e\x0c\x60\xd4\x9b\x96\xcf\xe7\x0b\ -\xc2\xc1\x61\xd2\x89\x09\xa2\x81\x3a\xb8\xb2\xc4\x35\x19\x6e\x7a\ -\x1a\x37\x77\x01\x43\x41\x90\x78\xd3\x27\x2f\x77\xeb\x08\x7a\x87\ -\x08\xb6\x6c\xc1\x0c\xf4\x41\xe1\x6f\x34\xf5\xb2\x34\x9e\x2f\x50\ -\xcd\x20\x6b\xe1\x66\xe7\x71\xf3\x0b\x68\x2b\x47\x82\x32\x1d\xae\ -\x7b\x73\x93\xb4\x8a\x6c\xbc\x0e\x33\xba\x09\x57\x14\xc4\xab\x0e\ -\x35\x40\x00\x45\xcb\xe2\x6c\x81\xda\x36\xf9\xe2\x22\x3a\x3d\x8b\ -\x2e\x2e\xd0\x5b\x8d\x29\xce\xcf\x13\xb6\x5b\x94\x46\x8b\xaa\x6a\ -\x96\x65\x02\x44\x21\x10\xe4\x79\x1e\x38\xe7\xa4\xcb\xbf\xc5\x81\ -\xa1\xaf\x16\x78\x40\x52\xef\x6f\xea\x14\xbb\xda\xa6\xfe\xd6\xdb\ -\xd9\xf4\x5f\xff\x80\x78\xf3\x96\xb5\xba\xbd\x38\x7f\x96\xe5\x4f\ -\xfd\x39\xd9\xce\xbf\xc7\xb4\x67\x30\x95\x08\xb1\x06\xb7\x02\x18\ -\x41\xdb\x16\xee\xb8\x85\xe4\x77\x7e\x9f\xf8\x96\x9f\x59\x47\x84\ -\xf8\x64\x5c\x5b\x0d\x74\xf9\x02\x6e\x6e\x0a\xfb\xec\x33\xe4\x4f\ -\xee\xc2\x1e\x3e\x88\x5b\x6d\xf9\x7a\x22\x35\x38\x2d\x30\x9b\x46\ -\xa8\x7e\xe8\xb7\xa9\xbd\xf3\xfd\x5c\x89\x45\xb4\xab\xab\xe4\x67\ -\xa7\x69\xbf\x74\x80\x95\xa7\x76\xb1\xfa\xf4\x4e\xb2\xb9\x19\xfa\ -\xeb\x01\x49\x68\xd6\xf8\x45\xe7\x9c\xe4\x79\x1e\x00\x61\x57\x01\ -\x62\xad\x5d\x77\x81\xa2\x0e\xcf\xd9\xa8\xf7\xb9\x30\x16\x6c\x54\ -\x25\xdc\xb6\x95\x78\xf3\x96\x4b\x0a\x09\x73\xd5\x46\x82\x6d\x5b\ -\xa1\xa7\x17\x6d\xcc\xf8\x4a\xb0\x4c\x5b\x83\x41\xa1\xdd\x50\x5a\ -\x81\x12\xa9\x12\x5f\x46\x92\xa0\x20\x95\x1a\xa6\x52\x23\xd8\x38\ -\x4e\x78\xd3\x1d\x84\x3f\x77\x37\xd9\xfd\x7f\x41\xbe\xeb\x61\xf4\ -\x78\x03\x71\xe0\x54\xc8\x33\x25\x2a\xf4\x15\xcb\xd8\xb0\x5e\x27\ -\xbc\xf6\x3a\x2a\xd7\x5e\x47\xcf\x5b\x7f\x81\xe5\x1d\x0f\x73\xfe\ -\xcf\xff\x98\x7c\xe1\x19\x9c\x73\x6b\xf2\x59\x6b\xc9\xf3\x5c\x80\ -\xc0\x5c\x89\x95\x55\xa7\x68\x07\x5c\xc7\x97\xad\x18\x50\x57\x10\ -\x5d\x37\x41\x72\xc3\x75\x2f\xe7\xaa\xc5\x10\x6d\x1b\xc7\x0c\x6f\ -\xc4\xb5\x42\xdc\xac\x43\x97\x94\xa0\xcf\x63\x84\x8b\xa1\x48\x15\ -\x17\xac\x11\x5c\xa8\xb5\x74\x1a\xab\x74\x9a\xab\x14\xad\x16\xea\ -\xdc\x9a\x60\xc1\xe6\xad\x84\xef\xb8\x07\x19\xdb\x82\xe9\x0d\xb0\ -\xf3\x8a\x9d\x71\xe4\x8b\x0e\xdb\xd1\x4b\x18\x63\xe7\x1c\xce\x59\ -\x5c\x79\xff\x7a\x65\xf4\xbd\xfd\x5d\xf4\xbe\xfd\x97\x09\x7a\x36\ -\x78\x17\x5e\xc7\x30\x77\x3f\xc3\x4b\x14\x50\x5e\x20\x02\x12\x81\ -\x89\x7d\xfc\x56\x0b\x2e\xcb\x49\xb6\x6c\x27\xdc\x76\xed\x95\xcb\ -\xca\x8d\x63\x98\xf1\xab\xe1\xe4\x0b\x04\xd9\xaa\x0f\x57\x6d\xa0\ -\xe2\x93\x1f\xb2\x92\xef\x2a\x85\x6c\x2e\x2d\x70\xe0\xef\xef\xc7\ -\x39\x4b\xda\x3b\xc0\xc6\x57\xdd\xcc\xf0\xc4\x35\xc4\x95\x2a\x12\ -\x04\x04\x9b\xae\xc6\x8d\xbf\x0a\xf7\x9d\x93\x04\xbd\x0e\x75\x86\ -\xa2\x66\x20\x94\xf5\x9c\x39\xf3\xa7\x4f\x32\x7f\xfa\x14\xce\x39\ -\xea\xc3\x1b\xe8\xdf\x3c\x4a\xb5\x7f\x00\x63\x0c\x26\xad\x30\xf0\ -\xcb\xef\x66\xe1\xe1\x87\x20\x0a\xd7\x94\xbc\x5e\x11\x21\x50\x6a\ -\xd1\xa1\x5a\x2a\xc3\xf8\x8c\x4b\x82\x92\xd4\xb4\x8a\xd3\x80\x78\ -\x6c\x2b\xe9\xd8\x38\x00\xce\x5a\xb2\x56\x8b\xb8\x52\xc1\x04\x01\ -\xe1\xc6\x51\xc2\xf1\x71\x8a\x81\x3a\x2c\xad\x22\x2a\xb0\x02\xb4\ -\x15\x6d\xe3\x51\x7e\x9d\xa1\xe5\x8b\x0b\x5c\xf8\xca\xe7\x20\xcf\ -\x28\xf2\x80\xe5\xdb\x6f\xc3\xdc\xf3\x51\x46\x5e\xfd\x7a\x7f\x41\ -\x94\x90\x0f\x6e\x01\x35\x44\x69\xc9\x2b\x24\xc6\x87\xdb\x35\x4b\ -\x75\x4c\x7f\xeb\x29\x0e\x7f\xf9\xf3\x34\xe6\xe6\x49\x37\x6f\x63\ -\xeb\x3f\x7f\x07\xd7\xbf\xf3\x9d\xf4\x8f\x6c\x46\x44\xa8\x4c\x5c\ -\x43\xb4\x6d\x2b\x54\x52\xaf\x00\xbd\x68\x39\x6b\x0a\x58\xf3\xff\ -\x2e\x07\x6b\x3d\x45\xe5\x72\xc5\x00\x06\x87\xd9\x34\x42\xb2\x75\ -\x1b\x51\x5f\x3f\x00\x59\xb3\xc9\xd9\x03\xcf\x33\x34\x31\x41\x7d\ -\xc3\x55\x44\x3d\x75\xc2\x4d\xe3\x14\xb5\x21\xf4\xdc\x39\x1c\xea\ -\x79\x81\x58\x7c\x9c\x0f\x29\x99\x62\xaf\x87\x48\x0b\xb6\x15\x33\ -\x24\x45\x46\x73\x36\x23\x7b\x21\xc6\x4e\x4f\x52\xdc\xf4\x3a\x42\ -\xe3\x73\x80\x4e\x1c\x11\x05\xa0\x2d\x87\x16\x0e\xd7\xe3\xc0\xae\ -\x77\x57\x25\x9a\x9b\xa3\xff\xe8\x11\xa2\xc9\xb3\x74\x4e\x9c\xe2\ -\x82\x38\xe6\xc6\xc7\xe8\x1f\xd9\xbc\xce\xa5\xc6\xd0\xb4\xba\x26\ -\x63\x17\x07\x5e\xa6\x80\xf5\x2c\xb5\xb3\x0a\xae\x54\x88\x58\xc2\ -\xed\xdb\x09\xb7\x8c\x23\x71\xe4\x15\xb0\xba\xc2\xe4\x53\x4f\x42\ -\x91\x53\xe9\xeb\x27\x4a\x53\xcc\xc6\x51\x18\x1e\xc3\x1d\x3a\x84\ -\xb1\x0e\x8d\xd5\xc7\x65\x2b\x10\xc0\x3a\x92\x9b\x00\x65\xb4\x2a\ -\xd4\x9c\x21\x6f\xa5\xac\xf6\x0e\x10\x26\xd5\x35\x23\x51\x55\x5a\ -\x8b\xe7\x09\x70\xb8\x0e\x3e\xee\x77\x4a\xee\xb0\x0b\xa2\x0a\x3d\ -\x61\xc4\xd5\xd5\x1a\x59\xb5\xce\xaa\x16\x64\xe7\x4f\x53\x4c\x9d\ -\x59\x7b\x86\x88\xe0\x7a\xfa\x21\x8a\xbc\x60\xe5\xf1\x4b\x14\xd0\ -\x45\xc8\xf5\x3c\x91\x04\xa5\x0b\x38\xc1\x59\x88\xc6\x27\x08\x47\ -\x46\x51\x13\xe0\x54\xc9\x97\x16\x59\xd9\xfb\x14\x0b\x3d\x3d\x8c\ -\xdc\xf2\x33\x84\x69\x8a\x8c\x8c\x22\xdb\x26\xd0\xef\x7d\x1d\x69\ -\xb4\xd0\x1c\x5c\x53\x71\x6d\xc5\x15\x0e\x67\x1d\x0a\x38\x55\x88\ -\x12\x64\xe2\x67\xb0\x6a\x91\xb1\x0a\xb5\x5b\xdf\x88\xd9\x3a\x81\ -\x31\x82\x05\x5a\x17\xe6\x68\x1f\x3c\x44\x3d\x2b\x90\x44\x20\x14\ -\x24\x16\x54\xbc\x1a\x7d\xa4\x72\x88\x58\xc2\xc8\x4b\xd2\x53\x80\ -\x86\x29\xf5\x4a\xa5\xbc\xc6\x21\x41\x40\x3b\xeb\x90\xd8\xe2\xe2\ -\x04\x5c\xee\x02\x97\xad\xbf\x79\x0c\x08\x40\x4a\x53\xd4\xb0\x4a\ -\x3c\xba\x95\x70\x70\x08\x44\xc8\xda\x6d\x9a\x67\x27\x89\x8e\xbd\ -\x48\x3e\x36\x81\x6d\xb6\x70\x7d\xfd\x04\x57\x6d\x24\xd8\xba\x15\ -\xdb\x57\x41\x8a\x16\x7a\x41\xb1\x40\xd1\xf6\x4a\x50\xa7\x9e\xf7\ -\xb7\x05\x66\xe8\x2a\xa2\x8f\xfd\x67\x54\x14\x89\xab\x04\xbd\x7d\ -\x48\xad\x8e\x5a\xcb\xca\xec\x0c\xd3\x5f\xdf\x05\x07\x8f\x20\xb9\ -\x85\xbe\xb2\x68\x4a\x14\x0d\xfd\x33\x9c\x3a\x54\x1d\x84\x01\x54\ -\x62\x4c\x5f\x42\xa0\x75\xa2\x89\x9b\xa8\x4e\x5c\x8b\x2d\x31\xc2\ -\x04\x01\xad\xf3\xd3\x04\xad\x66\xb9\x18\xa3\x2f\x07\xc1\xae\x39\ -\xac\x73\x2d\x9c\x53\x9c\x2a\x62\x95\x60\xeb\x16\xc2\xb1\x51\x24\ -\x4d\x51\xa0\x39\x7f\x81\xd9\xfd\xcf\x30\x94\x77\x60\xf2\x0c\x8d\ -\xd9\xf3\x04\x83\x83\x04\x49\x42\xb0\x61\x33\xb2\x61\x0b\x6e\x66\ -\x1e\x50\x82\x01\xc1\x34\x58\xe3\xf1\x1c\xe0\xac\x83\x30\x46\xae\ -\xbe\xc6\x27\x42\xea\xf1\x41\x8c\xa1\xbd\xba\xca\xf4\xb3\x7b\x39\ -\xf5\xe0\xff\xe5\x3a\xbd\x80\x29\x7c\x14\xc2\xe9\x1a\x9b\xec\x95\ -\xe8\xad\x36\x1c\xd9\x0c\x37\xdd\x8a\x1b\x6f\x52\x7f\xcd\xcf\x52\ -\xb9\xeb\xe7\x89\xb7\x4d\xe0\xb2\x0c\x55\xa5\x68\xb7\x29\x26\x27\ -\xa1\xd9\xf2\x18\x54\x0a\x7e\x65\x17\xd0\x8b\x20\x68\xdb\x8a\x69\ -\x3b\x50\x25\xda\xba\x0d\xd9\xb4\x19\x17\x45\x38\xa0\x7d\xe1\x02\ -\x17\xf6\x7c\x9b\xcd\x0d\xa1\x68\x2e\xb0\x78\xe2\x08\xc9\xe8\x18\ -\x95\x38\xc1\xf6\x5f\x45\x67\xf8\x7a\xcc\xdc\xb3\xa4\x83\xa1\x1f\ -\xac\x51\x48\x1c\x4e\x1c\xb6\x34\xdd\x35\xb0\x59\xf3\x39\x1f\x59\ -\x82\xb4\xc2\xf8\xeb\xdf\xc8\x55\xed\x0f\x23\x5f\xf8\x33\x68\xcf\ -\x52\xcc\x5a\xb2\x8e\x23\x37\x8e\xb8\x65\x4b\x25\xfa\xc5\x82\x9e\ -\x9f\x7b\x27\xbc\xe5\x17\x3c\x28\x18\x03\x81\x41\xad\xc3\x8a\xa0\ -\x45\xc1\x91\x5d\x4f\xd2\x38\x72\x9c\x81\xac\xc0\x18\xb3\x86\x77\ -\x97\xb8\xc0\xe5\x18\x20\xe2\xab\x3b\x89\x05\xd4\x10\x8f\x6d\x25\ -\xda\x30\x82\x44\x31\xce\x29\xc5\xfc\x2c\xee\xe0\x77\x08\x22\x47\ -\xfb\xdc\x0c\xed\x63\x47\xb0\xaf\xb9\x0d\xed\x1b\x20\xd8\xb8\x91\ -\xe8\xd5\x37\x52\x3c\xea\x17\x43\x24\x16\x6c\xc7\x2b\xd4\x59\xb7\ -\x06\x60\x9d\x95\x65\x26\x9f\xfd\x36\xea\x2c\x51\xa5\x4e\xff\xf8\ -\x38\xd5\xa1\x61\xc2\x38\x26\xe8\x1d\xa0\xf2\xc6\xb7\xd2\x39\x7d\ -\x92\xe2\xc4\x17\xa0\xa7\x8d\xa9\x0b\x52\xf7\x96\xa4\xeb\x73\x97\ -\x20\x44\xa2\xe8\xb2\xfc\x52\xb1\x79\xce\xd2\xd4\x24\xa7\xbf\xfa\ -\x65\xc2\xe9\xd3\x04\x5d\x8e\xed\x95\x30\xe0\x12\x96\x5c\x00\xe3\ -\x57\x70\x64\x68\x98\x68\xcb\x38\xa6\x56\x03\x11\x3a\x8d\x06\xf9\ -\xf2\x12\x7d\x7d\xbd\x44\x1b\x37\x12\x65\x06\x1a\x6d\x5c\x27\xc3\ -\xda\x02\x53\xeb\x21\xbe\x7a\x2b\xf9\x55\x43\xd8\xe3\x17\x10\xe3\ -\x28\x5a\xea\xa9\x2c\xab\xde\x77\x81\xe6\xcc\x0c\x2f\x7c\xf2\x0f\ -\x21\xcf\x50\x0c\xf5\x1b\xaf\x63\xfc\x17\xee\x66\xec\xb6\x37\x51\ -\x19\x18\x42\xeb\xfd\xd8\x57\xbd\x91\x9c\xfb\x89\xa2\x32\x22\x45\ -\x0a\x81\x4f\xd5\xbb\x02\xd8\xa2\x83\x2d\x0a\xbf\x8a\x64\x1d\x45\ -\x96\xd1\x59\x5d\xe1\xc2\xb1\x63\x9c\x7a\xf4\x61\xec\xd3\xbb\xa9\ -\xb5\x57\x09\x4c\x77\x61\x56\x5e\x9e\x09\x5e\xb4\x80\x75\x28\x59\ -\x28\xce\x7a\x1f\x0b\xb6\x6c\x81\x24\xc6\x15\x05\x36\xcf\x48\xc7\ -\xc6\xd9\xfc\xaf\x7f\x97\x38\x8a\x89\x73\x07\xa3\x63\x98\x4a\x15\ -\x9b\xe7\xbe\x2c\xee\x1f\xc6\x4e\xdc\x84\x9c\xd8\x45\x18\x19\x5f\ -\x4c\x19\x8f\x29\xea\xbc\x1b\x98\xbc\xcd\xe8\x85\x63\xc4\x79\x46\ -\xb6\x6c\x69\xce\x4f\xb3\xda\xd3\x4b\x63\x6c\x82\xb4\x7f\x08\x15\ -\x41\xae\x9e\xc0\xd6\x6b\x48\x63\x99\x22\xf7\x69\xb0\x2b\xdc\xda\ -\x78\x9d\x73\x9c\x3f\x74\x88\xb9\x43\x07\xc9\x5b\x2d\x6c\x9e\x93\ -\xaf\x2c\xd1\x3a\x7f\x8e\xd6\x91\xa3\xd8\x17\x0f\xb0\xa1\xb5\x42\ -\x54\xb8\x4b\x00\xee\xfb\x24\x42\xeb\xf2\x80\x02\xac\x1a\xe2\x91\ -\x51\xc2\xcd\xa3\x10\x46\xd8\xa2\xc0\x88\x50\xdd\xb2\x15\x19\xbb\ -\x1a\x05\x12\xca\x04\x27\x08\x70\x85\xf7\x4b\x57\xef\x87\x9b\x6e\ -\xc3\xee\x7c\x82\x30\x0d\xc1\x81\x0b\x40\x71\x6b\xb3\x17\x18\xd8\ -\x36\x54\xa7\x52\x74\xc8\x8d\x63\x31\xcb\xe9\xcc\xce\xe2\x96\x97\ -\x70\x28\x2a\x42\xd0\xdf\x4f\xde\xd7\x0f\x0b\xe7\xb0\x1d\x87\x6d\ -\x2b\x36\x2f\x05\x50\xc5\x15\x05\x8b\xcf\x7d\x97\xe9\x7f\xf8\x32\ -\xed\xb9\x79\x04\x07\x59\x0b\x5d\x5a\x22\x5e\x5c\x66\xd0\x2a\xf5\ -\x28\xf4\x39\x84\xbb\x58\x80\xfe\xc0\x3c\x40\x7d\x11\x08\x95\x0a\ -\xd1\x96\x71\xc2\x81\x41\xd4\x18\x70\x0e\x09\x43\x4c\x9c\xbc\xac\ -\x1c\x53\xeb\x50\x67\xb1\x45\x8e\xd4\xea\x44\x37\xdc\x4c\x3b\x48\ -\x08\xda\x4a\xd1\x76\xe5\xcc\x95\xc5\x8b\xfa\xff\xf3\x95\x8c\xb0\ -\xc8\x71\x6d\x4b\xb5\x56\x23\x19\x1e\x24\xa9\x56\xb1\x85\x2d\x81\ -\x52\x68\x4b\x40\x50\xae\xab\xab\x28\xaa\xae\x4c\xdd\xbd\x35\x85\ -\xf3\xb3\xf4\x9f\x3c\x44\x7e\x76\x06\x11\x43\x10\x08\x91\x18\xe2\ -\x20\xc0\x04\x1e\x17\xf2\x2b\xb4\xdd\x7c\xff\x3c\x40\x14\x8d\x04\ -\x19\x1e\x24\x9a\x98\x40\x92\xc4\x87\x94\x4e\x87\x4e\xa3\x41\xd1\ -\x69\xaf\xa5\xb5\xdd\x94\x2c\x8c\x63\xa2\x6a\x95\x30\x4e\x90\x28\ -\x26\xda\xb8\x89\xc6\xa6\xab\x29\xa6\x8f\x53\x34\x2c\xb6\xe3\x13\ -\x21\xd7\x15\x40\x05\x1b\x0d\x92\x4b\x86\xf4\x0b\xe6\xc6\xed\x04\ -\xaf\x7d\x1d\x66\xc3\x46\x5c\x91\xfb\x59\x6a\xb7\x69\xcd\x5c\xa0\ -\x12\x58\xbf\x86\x10\x2b\x1a\x5c\x54\xa2\xaa\xa3\x16\x1b\x92\x9e\ -\x14\xd7\xaa\x50\xb4\xf0\x8a\x2e\x93\x2d\x4f\x9f\xfb\xda\x06\xb9\ -\x72\xdf\xd1\x95\xf3\x00\xa7\x38\x0c\x3a\x38\x4c\xb0\x6d\x3b\x1a\ -\x04\x88\x31\xcc\x1d\x3f\xc6\x81\xaf\x7c\x89\x33\xdf\xde\x43\x10\ -\x45\x65\xd7\x12\x60\x2c\xc3\x37\xdc\xc4\x0d\xef\xf8\x45\x46\x6f\ -\x7d\x0d\x61\x10\xe2\x92\x94\xe2\xf5\xb7\x11\xee\x38\xe9\x31\x40\ -\xf4\x62\xd1\x55\x14\x04\x83\x43\xa4\xbf\xf5\x7b\x04\xce\x41\x5a\ -\xc7\x8c\x8f\x23\xc3\x1b\x21\xad\xe0\xac\xc5\xda\x82\xe5\xa9\xd3\ -\x98\x95\x65\x30\x0e\xeb\xc0\xe6\x65\x1e\xe0\x1c\xea\x9c\x27\x69\ -\x0a\xbf\xe4\x6e\x33\xc5\xa9\x40\xd0\x5d\x49\x2e\x6b\x1a\x51\xac\ -\x5b\x17\x71\xbb\xe4\xc9\xf7\x77\x01\xc5\x3a\x43\x30\xb8\x91\x74\ -\xfc\x6a\x08\x02\xd4\x18\x96\x8f\x1d\x41\x9f\xfe\x06\x63\x07\x5e\ -\x24\x4a\x22\x44\xfc\xb2\x95\x09\x1c\x79\x7b\x85\xec\xba\xeb\xc9\ -\xae\xbb\x1e\x93\xa6\x90\x26\xc4\x6f\xbc\x03\xbb\xf3\x7e\x9c\x71\ -\x68\x54\x9a\xb0\x75\xa8\x75\x50\xad\x11\xfe\xec\x5d\x17\xa3\x4f\ -\x18\xfa\x38\x0e\x20\x86\xce\xf2\x32\x87\xbe\xf4\x79\x36\x6b\x93\ -\xce\xbc\xc5\x15\x96\x3c\xb5\xd8\xce\xc5\x38\xae\xce\xe1\xda\x8e\ -\x7c\xd9\xe1\x56\x1d\x92\x1a\x24\x2e\x59\x6a\x05\x9b\xf9\x88\x63\ -\xf3\x2e\xea\xcb\x95\x5d\xe0\x65\xc5\x90\x31\xc8\x60\x1f\xf1\xab\ -\x6e\x24\xac\x54\x10\x63\xc8\x0b\x8b\x9e\x3a\x4d\xcf\xd9\x29\x7a\ -\x13\x25\xaa\x94\xa1\xa9\x80\x30\x14\x16\xcf\x4e\xc1\xd4\x24\xb6\ -\xd5\xf2\x1d\x40\x71\x42\xe5\xda\xeb\x59\xee\x1d\xc0\x2e\x2c\x63\ -\x33\x8b\x77\xeb\x92\x08\x15\x83\x24\xe9\x25\x21\x49\xfd\x09\x16\ -\xcf\x4e\x73\x7a\xc7\x43\x98\x3d\xbb\x30\x2b\x6d\xcf\x1d\x5a\x45\ -\x52\xf5\x33\x2c\xdd\xe7\x08\x9a\x80\x54\xbc\x7b\x38\xa7\x90\x7b\ -\xf3\x77\xae\x24\x72\xe4\xe5\xed\x38\x3f\x44\x31\x24\xb8\x34\xa5\ -\x55\xad\x32\x73\xf2\x24\x26\x8c\x68\x2c\xcc\xb3\x7a\xf0\x30\x49\ -\xab\x45\x1c\x19\x8c\x94\x99\x65\x01\xd2\x86\xb8\xdd\x24\x3f\x7a\ -\x8c\xb9\x17\x0f\xb0\xda\x69\x21\x4e\x61\x65\x85\x4e\xcf\x26\x8a\ -\xce\x24\xed\xc5\x06\x8b\xd3\x53\xe4\x27\x8e\xe1\xda\xed\x75\xf8\ -\xe1\xf3\xfa\xac\xb9\x42\x67\x71\x81\xa5\x93\x27\x59\xdc\xbf\x1f\ -\x79\xe1\x79\xc6\x16\xe6\x30\x56\x3d\x00\x2b\x58\x2d\x58\x99\x9f\ -\xc5\x1e\x3d\x8a\xeb\xb4\x21\x2f\xe8\x2c\x2c\x80\x2d\x20\x04\xd7\ -\x71\xd8\xac\xeb\x6e\xde\xfc\xdd\xba\xe8\xe6\x09\xce\x2b\x58\x00\ -\x5d\x98\x28\x19\x91\x70\x60\x40\x64\xe3\x26\x8e\x7c\xf9\x4b\xb4\ -\x1f\x7f\x1c\x4c\x80\x74\x9a\x0c\x9c\x99\x64\x28\x2f\x70\xa1\xff\ -\x91\xf2\x79\x88\x40\x12\x05\x2c\xbc\xf0\x1c\x53\x4b\x0b\x74\x7a\ -\x7b\x11\x20\xca\x2d\xa3\x33\xa7\x49\x43\xa1\x79\xfa\x04\x67\xff\ -\xf6\xaf\x29\x1e\xec\x87\x52\xfb\xdd\x2e\x10\xcd\x14\x8a\x0e\xd2\ -\x69\x22\xf3\xf3\xc4\x73\xb3\x0c\xda\x0e\x3d\x71\x0c\x45\xd7\x94\ -\x85\xf6\xec\x3c\xb3\x0f\xfd\x03\x2b\xcf\x7c\x1b\xb5\x16\x93\x2b\ -\x23\x33\x53\xf4\x2c\x37\x90\x42\x71\xca\x25\xd5\xa2\x07\x42\xa8\ -\xde\x7c\x23\xe1\xe0\x20\x65\x25\x24\xeb\xfa\xb5\xbc\x02\xf2\x3c\ -\x6f\x34\x9b\xcd\x22\xcb\x32\xc2\x38\x96\x74\xeb\x36\xbd\xea\x97\ -\x7e\x59\x2e\x7c\xee\xaf\x59\x7d\x7a\x0f\x0a\x54\x42\x88\xd2\x18\ -\x09\x23\x0a\x27\x18\xd5\x72\x61\x04\x34\x12\x82\x28\x20\xba\x30\ -\x43\x38\x79\x86\x5c\x9d\x27\x22\x82\x80\x70\xb8\x4a\x14\x85\x54\ -\x96\x2e\xd0\x3a\x3b\x8d\x5a\xbb\x56\x6e\xfb\x16\x19\xd0\xa6\x12\ -\x8a\xef\x30\xa9\x06\x21\xbd\x69\x48\xad\xc7\x87\xda\xa2\xed\x28\ -\xda\xe5\xd2\x57\xd6\x24\x98\x79\x1e\xf3\xbd\x67\xfc\xac\xb6\x15\ -\x4d\x13\x5c\x12\x43\xee\x85\x27\xf4\x5c\x86\x53\x87\x4a\x40\x65\ -\xfb\x35\x6c\xb8\xe7\x5e\xd2\x6d\x13\x8a\x73\x92\x65\x19\xcd\x66\ -\xb3\xc8\xf3\xbc\xd1\x55\x80\xce\xcc\xcc\xbc\x34\x39\x39\x79\x32\ -\x4d\xd3\x9e\x8d\x41\x10\x56\x47\x46\xd8\xf4\xde\xf7\x91\x0a\xcc\ -\xdd\x77\x1f\xed\x93\xc7\x11\x57\x78\x9a\x1c\xc5\xaa\x2f\x35\x05\ -\xf1\x09\x46\xee\x4d\xa1\x1e\x84\xf4\xf4\x44\x7e\xcd\x4f\x7d\x4d\ -\x61\xc4\x40\xa6\xf4\x07\x01\x83\x3d\x35\x24\xe8\x22\xb2\x10\x94\ -\x3d\x9e\x36\x2a\x01\xca\x74\x13\x16\xf5\xb3\x2e\x42\xd1\x2d\xd2\ -\x14\x12\x23\x6c\xae\xa4\x8c\x06\x09\xaa\x50\xc4\xd6\x27\x6d\x65\ -\x5f\xa1\xba\x6e\x06\xeb\xd0\x20\x22\xdd\x3a\xc1\xf0\xfb\x3e\x40\ -\xff\xaf\xbc\x07\xed\x1f\xa0\xd9\x6a\x32\x3b\x3b\x5b\x4c\x4e\x4e\ -\x9e\x9c\x99\x99\x79\x09\x9f\x9f\x91\x2c\x2d\x2d\x35\x92\x24\x89\ -\xa3\x28\xda\x98\x26\xc9\x50\xa5\x52\x91\xa0\x56\xd3\xca\xb6\x09\ -\x31\x81\xa1\x3d\x39\x45\xb1\xb4\x84\x2b\xac\xaf\x0f\x42\x5f\x57\ -\x28\xfe\x07\xd5\xe1\x5b\x5b\x04\x24\x12\x4c\x59\x9b\x14\x6d\x8f\ -\xc2\x9a\x79\xbe\x91\x08\x24\x36\x28\x50\xb4\x7c\x32\x53\xe4\x3e\ -\xbb\x33\x69\x49\x78\xa8\xc3\xe5\x8a\xcd\x1d\xd6\x2a\x2e\x73\xbe\ -\x49\x2a\x2a\xc1\xab\xbc\xde\x5a\x1f\x02\x25\x04\x82\x2e\xcd\xa5\ -\xd8\xc2\x41\x10\x92\x5e\xbd\x9d\x0d\xf7\xdc\x43\xff\x7b\xde\x83\ -\xeb\xeb\xd3\x4e\xa7\x23\x67\xcf\x9e\xd5\x43\x87\x0e\x1d\x79\xe6\ -\x99\x67\x1e\x7c\xec\xb1\xc7\x1e\x9b\x9d\x9d\x9d\x0f\x80\x60\x76\ -\x76\x36\x3f\x72\xe4\xc8\x5c\xa5\x52\x21\x8a\xa2\x91\x38\x8e\x07\ -\x7b\x7a\x7b\xc5\x54\x2a\x5a\x9d\xb8\x06\x11\x95\xec\xec\x34\xf9\ -\xc2\x22\x58\x77\x91\xdb\x2b\x57\x6a\x25\x10\x14\xf1\x40\xda\xf5\ -\x41\xeb\x97\xb3\x25\x64\xcd\x27\x11\x0f\x33\x2e\x2f\x41\x28\xea\ -\xc6\x64\x5d\x2b\xd5\xbb\x35\x88\x1a\x01\x51\x6c\xc1\x9a\x65\xd8\ -\xdc\xb7\xda\x69\xd9\x57\xe1\x4d\x1d\xd4\x09\xb6\xcc\x0f\x30\x01\ -\x95\x6d\x13\x0c\xbf\xff\xfd\x0c\xbe\xf7\xfd\xea\x7a\xfb\xc8\xad\ -\x95\xd3\xa7\x4e\x71\xe0\xc0\x81\x63\xdf\xfc\xe6\x37\x1f\xb8\xef\ -\xbe\xfb\x1e\x3a\x7d\xfa\xf4\x19\xa0\x15\x74\xd7\x67\x5a\xad\x56\ -\x7e\xf4\xe8\xd1\xf3\x49\x92\xb4\xe2\x38\xde\x14\xc7\xf1\x50\x5f\ -\x7f\x3f\x52\x49\xa9\xdd\x70\xa3\x18\x55\x3a\x93\xa7\xc9\xe6\x2e\ -\xac\x09\xae\x56\x3d\x6d\x66\xc0\x18\xf5\x1d\x23\xb9\x4f\x42\x5c\ -\xee\xdb\xe2\x24\x34\xe0\xb3\x68\x5c\xae\x14\x1d\x3f\x53\x12\x97\ -\x4d\x51\x52\x0a\x97\x95\x25\x73\xb9\x0e\x21\x21\x68\xd9\x03\x50\ -\x74\x1c\x45\xae\xb8\x52\x19\x84\x5d\xc1\xfd\x33\xbb\x33\xef\xd4\ -\x51\xd9\x3e\xc1\x86\x0f\x7c\x90\xc1\x0f\x7e\x08\x5b\xaf\x53\x58\ -\xcb\x89\xe3\xc7\xe5\xb9\xe7\x9e\x3b\xf2\x8d\x6f\x7c\xe3\x8b\x5f\ -\xf9\xca\x57\xbe\xb6\xb4\xb4\x34\x89\xe7\xac\x9b\xdd\x06\x09\x07\ -\xd8\x2c\xcb\xf2\x53\xa7\x4e\xcd\x85\x61\xb8\x9c\xa6\xe9\x58\x1c\ -\xc7\x43\xbd\xfd\xfd\x22\x49\xa2\x3d\x37\xbf\x1a\x51\xa4\x79\xf4\ -\x18\xf9\xfc\x05\x4c\x14\x96\x83\xd7\xb5\x19\x52\xe7\x85\x92\xd0\ -\xcf\x9e\x2b\xd4\x77\x7f\xba\x8b\x33\x29\x51\x49\x4b\x59\x20\xf4\ -\x94\x9b\xed\xf8\xf5\x3d\xc2\x12\xa8\x9d\xef\x1d\x76\x40\xd1\xb4\ -\xde\x52\x02\x59\x8b\xef\x5d\x58\x28\x0a\x8f\xf2\x2a\x8a\xed\x74\ -\x48\xc7\xaf\x66\xe4\xd7\x3f\xca\xf0\xaf\xff\xba\x16\x69\x4a\x6e\ -\xad\x74\x85\x7f\xea\xa9\xa7\xfe\xe6\x91\x47\x1e\xd9\xb9\xb2\xb2\ -\x32\x09\x2c\x02\x2d\xc0\x76\x2d\xc0\x89\x88\x05\x6c\xa7\xd3\xc9\ -\xce\x9f\x3f\xbf\x14\xc7\xf1\x6a\x9a\xa6\x9b\x2a\x69\x3a\x54\xad\ -\xd5\x24\xa8\x56\xa5\x76\xdd\x75\x1a\x55\x2a\xd2\x38\x74\x90\x6c\ -\x61\xbe\x64\x5f\x14\xe7\x04\x6b\x3d\xe5\x2c\xeb\x92\x0f\x97\x97\ -\xa0\x54\xb6\xbe\x11\x78\x41\xbd\x39\x7b\x8e\xc0\xe6\x1e\xb4\x24\ -\xf4\x1c\x84\x73\x4a\x51\x5c\xea\xeb\x5d\xc5\x38\xf5\xee\x51\xe4\ -\xba\x66\xf2\x8a\x62\xdb\x1d\xe2\xd1\x51\xc6\x7e\xf3\xb7\x19\xba\ -\xf7\x83\x6a\x6b\x35\x69\xb7\x5a\x32\x79\xe6\x0c\xcf\x3f\xff\xfc\ -\xe1\xa7\x9f\x7e\xfa\x0b\x3b\x76\xec\xd8\xbd\xb8\xb8\x78\x1a\x58\ -\x14\x91\x06\x90\xe3\xf9\x95\x8b\x15\x40\xa9\x04\xd7\x6a\xb5\x3a\ -\x33\x33\x33\x0b\x95\x4a\x25\x8b\xa2\x68\x43\x25\x4d\xfb\xd2\x38\ -\x0e\xe2\xa1\x21\xa9\x6c\xbd\x5a\xa3\x9e\x1e\x69\x1e\x3d\x4a\xbe\ -\xb0\xe0\x99\xf3\xb2\x5f\x68\xad\xde\xee\x22\xb2\x2b\xc1\xf2\x22\ -\xc3\xee\xf9\x46\xeb\xcf\xa9\x78\xcc\x70\x76\x5d\xfc\xb6\x25\x06\ -\x94\x4f\xb2\xa5\x85\x75\x85\x2f\xd7\x36\x7c\xc1\xe3\x7c\x5a\x9d\ -\x8e\x5f\xcd\x96\xdf\xfa\x1d\x06\xde\xfb\x5e\x65\x68\x48\x56\x17\ -\x17\x99\x9a\x9a\xca\x9f\x7f\xfe\xf9\x23\x7b\xf7\xee\xfd\xf2\xe3\ -\x8f\x3f\xfe\xc4\xdc\xdc\xdc\xa9\xae\xf0\xaa\x9a\x77\xd3\xb0\xe0\ -\xb2\x2c\x71\x4d\x09\x8d\x46\x23\x9b\x99\x99\xb9\x50\xa9\x54\x5c\ -\x1c\xc7\x43\x95\x4a\xa5\x2f\x0a\x82\x20\x1d\x1a\x96\xea\xf6\x6b\ -\x34\x88\x22\x69\x9d\x3e\x43\xbe\xbc\xe4\xeb\x70\xfc\xb4\xbb\x6e\ -\x58\x2a\x0f\xad\x37\x79\xe7\x74\x4d\x40\xa4\x34\x79\xf1\xdc\x83\ -\xb3\x9e\x2c\xed\x0a\x4f\xe8\xc3\xa2\x2d\x13\x1c\x57\x86\x38\xd5\ -\x12\x14\x71\x38\x0c\x95\xad\xdb\xd9\xfc\xd1\x7f\xc9\xd0\x3d\x1f\ -\x54\x06\x87\x64\xf9\xc2\x1c\x67\xcf\x9e\xcd\x0e\x1c\x38\x70\x74\ -\xdf\xbe\x7d\x0f\x3e\xf6\xd8\x63\x8f\x9e\x3f\x7f\xfe\xf4\x95\x84\ -\xbf\x92\x02\xba\x4a\x70\x7e\xb5\x79\xb5\x33\x37\x37\x37\x97\x24\ -\x89\x89\xe3\x78\x30\x4d\xd3\xbe\x24\x0c\x83\xa8\xb7\x57\x7a\x6e\ -\x7c\x95\xaa\x75\xd2\x99\x9e\x26\x5f\x5a\x42\x0b\xeb\x05\x2f\x53\ -\x4f\x5f\x72\x7a\x25\x38\x57\xe6\xfb\xee\x22\x25\xdd\x6d\x8b\x77\ -\x0e\x4f\x94\x96\xd7\xbb\x2e\x75\x8e\x77\x07\x6b\x75\xcd\x9a\xdc\ -\xc5\xe5\x6d\x34\x88\xa8\x6c\x9b\x60\xe4\xde\x0f\xb2\xf1\xc3\x1f\ -\x51\x5b\xab\xc9\xca\xc2\x02\x53\x53\x53\xd9\x0b\x2f\xbc\x70\x74\ -\xef\xde\xbd\x5f\xdb\xb1\x63\xc7\x23\xd3\xd3\xd3\xa7\x80\x05\x11\ -\x69\x5e\x2e\xfc\x2b\x29\xa0\x9b\xa5\x5b\xc0\x2e\x2f\x2f\xb7\x66\ -\x66\x66\xe6\xa2\x28\x92\x28\x8a\x86\xd2\x34\x1d\xa8\x56\xab\xc6\ -\x24\x09\xf5\x1b\x6f\x14\xa3\x8e\xf6\xe4\x14\xd9\xe2\x92\x6f\x50\ -\x30\xbe\x27\x00\x29\x73\x83\x12\xb8\x5c\xb9\xe6\xe8\x43\xa6\x9f\ -\x59\xd5\x75\x16\x51\xce\xb8\x67\x7a\xdc\xda\x71\x67\x3d\x76\x78\ -\x32\x44\xb1\xd6\xc7\xf9\xca\xc4\x04\x9b\xee\xb9\x97\x0d\xbf\xf6\ -\x6b\xd8\x34\xa5\xd5\x6c\xca\x99\x33\x67\x8a\x03\x07\x0e\x1c\xd9\ -\xb3\x67\xcf\x23\x3b\x76\xec\x78\x78\x6a\x6a\xea\x78\x09\x78\x0d\ -\xdf\xe5\xf0\xf2\xb6\x82\xef\xa7\x00\xd7\x7d\x7f\x61\x65\x65\xa5\ -\x31\x37\x37\x37\x17\x86\xa1\x0b\x82\x60\x43\x9a\xa6\xc3\x7d\x7d\ -\x7d\x62\x92\x44\xeb\xd7\x5e\x87\xc1\x48\x6b\x72\x92\xce\xc2\xfc\ -\x1a\xf3\xeb\x5c\x59\xfa\xae\x95\x18\xac\x2d\xbe\x6a\xd7\x15\xd6\ -\x7a\x11\xbc\xc7\x3b\x55\x6c\xd7\x55\xba\xee\xd4\xcd\xe9\x9d\x17\ -\x5e\x4d\x40\x75\xfb\xb5\x6c\xbe\xf7\x57\xd9\x70\xcf\x3d\xea\x6a\ -\x35\xf2\xa2\x90\x13\x27\x4e\xf0\xbd\xef\x7d\xef\xf0\xde\xbd\x7b\ -\xbf\xba\x73\xe7\xce\x47\xa6\xa7\xa7\x8f\x77\x43\x5d\x17\xf0\xae\ -\xf8\x1a\xda\x0f\x68\xa7\xef\x2a\xc1\xae\xac\xac\xb4\x2e\x5c\xb8\ -\x30\x63\x8c\xe9\xa8\xea\xc6\x30\x0c\x87\x87\x86\x86\x90\x34\xa5\ -\xb6\x7d\xbb\x04\x41\x40\x7b\x6a\x8a\xf6\xcc\x9c\x4f\x56\xba\xb4\ -\x9a\xf1\x4d\x53\x97\x08\xee\xca\xc6\xa6\xf2\xb5\x99\xae\x95\x58\ -\xab\x17\x5d\x48\x64\xcd\x0d\x9c\xfa\x64\xc9\x39\xa8\x5f\x77\x3d\ -\xa3\xbf\xfa\x21\x36\xbc\xef\x7d\x68\x6f\x2f\x85\xb5\x1c\x3c\x78\ -\x50\x9e\x7d\xf6\xd9\x43\xfb\xf6\xed\xbb\x7f\xf7\xee\xdd\x5f\x9b\ -\x9e\x9e\x3e\x09\x2c\x95\xc2\x67\xaf\x24\xfc\x0f\xa3\x80\xcb\x95\ -\xd0\x39\x7f\xfe\xfc\x9c\x31\x66\x25\x08\x82\xd1\x20\x08\x86\x07\ -\x07\x07\x25\xa8\xd5\xb4\xb6\x7d\xbb\x04\x61\x48\xeb\xc4\x71\x1a\ -\x8b\x8b\xd8\xf2\xfd\x87\xc2\x2a\x85\xf3\xbb\x75\x17\xbf\x17\xd6\ -\xef\xd6\x2a\x79\x79\x6e\xfd\xf9\xbc\x3c\x5f\xa8\x5f\x10\xb6\x40\ -\xef\xb6\xad\x6c\xf9\xc8\x47\xd9\xf0\x81\xf7\xa3\x7d\xfd\x9a\xe5\ -\xb9\xbc\xf8\xe2\x8b\xb2\x7f\xff\xfe\xc3\x7b\xf6\xec\xf9\xdb\x5d\ -\xbb\x76\x3d\xd1\x05\xbc\x32\xce\xe7\xdf\x4f\xf8\x1f\xf6\x8d\x11\ -\x05\x0a\x11\x69\xa9\x2a\x73\x73\x73\x6e\xf7\xee\xdd\x3b\xad\xb5\ -\xd6\x39\xf7\x11\xe0\xba\xeb\x6f\xb8\x41\xaa\x03\x03\x3a\xfc\x9e\ -\xf7\x30\x74\xfb\xed\xe2\x96\x97\xaf\xdc\x8f\x2f\xeb\x8f\xe8\x2b\ -\x74\xee\xeb\x25\x2f\x0d\x5d\xb2\x64\xd9\xdb\x8b\x6c\xde\xac\x32\ -\x30\x40\xab\xd9\x92\x43\x07\x0f\xf2\xec\xb3\xcf\x1e\xde\xb3\x67\ -\xcf\x67\xbf\xf1\x8d\x6f\xec\x9e\x9f\x9f\x3f\x0d\x2c\x97\x63\x2d\ -\x7e\x90\xf0\x3f\xca\x2b\x33\x4e\x55\x73\x11\xdf\x4c\x36\x3f\x3f\ -\x7f\x6a\xe7\xce\x9d\x4f\x1a\x63\x22\x11\xf9\xd5\x30\x0c\xaf\xd9\ -\xba\x6d\x9b\xe9\xdd\xb8\x91\x78\x7c\x5c\x83\x20\x90\x4b\x49\xd3\ -\xf5\x0b\x37\x3f\x68\x4c\xf2\xf2\x37\xad\x4a\xaa\xda\x5a\xab\x59\ -\xa7\x23\xcb\x8b\x8b\x9c\x3c\x71\xc2\xed\xdf\xbf\xff\xe8\xbe\x7d\ -\xfb\x3e\xbf\x73\xe7\xce\x27\x57\x57\x57\xcf\xfc\xa8\xc2\xff\xa8\ -\xaf\xce\xaa\xaa\xae\x59\xc2\xea\xea\xea\xe4\xe3\x8f\x3f\xfe\x68\ -\x10\x04\x49\x18\x86\xef\x06\xae\x19\xdb\xb2\x25\x4c\xd3\x6e\x91\ -\xaf\xfc\x54\x37\xaf\x50\x69\xb7\xdb\x4c\x9e\x39\x53\xec\xdf\xbf\ -\xff\xe8\x33\xcf\x3c\xf3\x95\xc7\x1f\x7f\xfc\xd1\x46\xa3\x31\xf5\ -\xe3\x08\xff\xe3\xbc\x3b\xac\xa5\x25\xa0\xaa\xd2\x68\x34\xd8\xb5\ -\x6b\xd7\x83\xc6\x18\x03\xbc\x73\x69\x69\x69\x6b\x4f\x4f\x4f\xa8\ -\xfa\xd3\x96\x7e\x6d\xcd\x52\x56\x56\x56\x8a\xe3\xc7\x8f\x9f\xdc\ -\xb7\x6f\xdf\x23\xbb\x76\xed\x7a\xf0\x32\xe1\xf3\x7f\x92\x77\x87\ -\xcb\x2d\x06\x52\xa0\x77\x6c\x6c\x6c\xeb\xeb\x5e\xf7\xba\x3b\xfb\ -\xfb\xfb\x5f\x15\x04\x41\xdd\x39\xa7\x3f\xe1\xb3\xaf\xa8\x7c\x63\ -\x8c\x58\x6b\x57\x17\x17\x17\x5f\xfc\xce\x77\xbe\xb3\x7b\x72\x72\ -\xf2\x24\xb0\x8c\x6f\xc7\xca\xfe\xc9\x5e\x9e\x5e\x77\x6f\x58\xf6\ -\x81\xd5\x81\x1e\xa0\x56\x2a\x26\x58\xf7\x2e\xe4\x4f\x45\xf8\x75\ -\xc9\x59\x56\x26\x36\x2b\xc0\x6a\x89\xf6\x3f\x92\xd9\xaf\xdf\xfe\ -\x1f\xba\xc9\xa0\xf1\xd3\x43\x85\x2f\x00\x00\x00\x00\x49\x45\x4e\ -\x44\xae\x42\x60\x82\ \x00\x00\x0c\x69\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -1508,446 +1948,6 @@ \x03\x00\x6b\xee\x3c\x46\xf3\xaf\x97\xb3\xf4\xd2\x13\x9c\xdc\xbd\ \x0c\x80\xff\x00\x1c\x7c\x06\xd9\x9b\xd6\x5b\xe7\x00\x00\x00\x00\ \x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x03\x30\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\x4d\x00\x00\x0e\x9c\ -\x01\xde\xf6\x9c\x57\x00\x00\x02\xd2\x49\x44\x41\x54\x38\x8d\x6d\ -\x93\x4d\x68\x5c\x55\x14\x80\xbf\x73\xdf\x9b\xe9\xc4\x21\xcc\x4c\ -\x4c\xc6\x2a\x22\xb6\xa9\x93\x44\x0c\xa3\x62\xc1\x2c\x14\x9d\xd2\ -\x12\x35\x85\x52\x5a\x11\x6c\xa5\x1b\x71\x57\xe8\xce\xc5\x74\x37\ -\x82\x2e\xa5\x4b\x05\xcb\x20\xc6\x45\xdd\x48\x4a\xf0\x27\xf1\x07\ -\x69\xa4\x86\xc2\x98\xd0\xc4\x50\x14\x1a\x4d\x9b\x57\xf3\x63\xe0\ -\xbd\xe4\xdd\xf7\xee\xbd\x2e\x06\xa7\xb1\x7a\x56\xe7\x1c\x38\x1f\ -\x87\xc3\x77\x84\x7b\x62\x69\x69\xc9\x69\xad\xef\x6d\x03\x90\xcd\ -\x66\xa9\x54\x2a\xb2\xbb\xe7\xef\x2e\x5a\xad\x96\xdb\xba\xd0\xc0\ -\x9f\xbe\x8c\x12\xc1\xcb\x08\xce\x82\xb5\x0e\xa7\x1c\x5b\xcf\x8f\ -\xd1\x6a\xb5\x5c\xb5\x5a\xed\x40\x3a\xc9\xcc\xcc\x8c\x53\xcd\x0b\ -\xdc\xf7\xed\x57\x78\x22\x74\xed\xf5\x31\xeb\x16\x44\xf0\xef\x57\ -\x6c\xdf\x4a\x30\xc6\x12\xd5\x0e\x63\x4e\x9f\x65\x64\x64\x44\x3a\ -\x80\xe9\xe9\x69\xe7\x35\x3f\xa0\x77\x76\x8a\x6c\xc6\xc3\xf7\x05\ -\x3f\xeb\xa1\x3c\x01\x0b\x56\x1c\x26\xb5\x24\x3b\x16\x9d\x1a\xd6\ -\x0e\x1e\x22\x3d\xf5\x26\xb5\x5a\x4d\x64\x62\x62\xc2\x75\x7d\xfa\ -\x11\xe5\xab\xdf\xb3\x99\x11\x36\x8d\x63\xef\x9e\x0c\x7b\xba\x3d\ -\x82\x6d\x8b\x00\xbd\x5d\x42\x12\x59\x56\xa2\x04\x8b\xa3\x94\x3a\ -\xf4\xb3\x2f\x12\xbf\x76\x06\x15\x04\x01\x3d\x3f\x7c\x83\x38\x21\ -\x1e\x3d\xc6\xd8\x42\xc0\xce\xcb\x27\x59\x13\xc7\xa1\xd9\xdf\x79\ -\xe1\xc7\xdf\x28\xbc\x7b\x91\x2b\x5b\x09\x47\x17\x02\x8e\xce\xdf\ -\x22\x7f\xfe\x3d\xf4\x77\x5f\xb3\xba\xba\x8a\x0a\xc3\x10\x25\xa0\ -\xb2\x42\xe1\xf1\xa7\xd8\xd9\xdc\xa0\xfb\x89\x2a\x6e\xbb\x7d\x9e\ -\xcf\xde\x38\xc6\xc3\x07\x9f\x23\xdf\xdf\x0f\xc0\xf8\xe9\x93\x3c\ -\xfd\xfa\x19\x36\x4a\xbd\x84\x61\xd8\x06\x58\x0b\x6b\x91\xa1\x6f\ -\xb8\x4a\xeb\xd2\x38\xbd\x83\xc3\xfc\xa9\x0c\x69\x9a\xf2\xcc\x5b\ -\xe7\xb8\x73\x63\x91\x70\xf9\x0f\xd2\x34\x25\xd7\x53\x20\x35\x06\ -\x67\xcc\x5d\x80\x01\xee\x28\x45\x71\x7f\x85\x6b\x1f\x5f\xa4\x7b\ -\x5f\x3f\xb7\xb7\x1c\x71\x1c\xb3\x7c\x6d\x96\x5c\xdf\x83\xa8\x62\ -\x81\x38\x8e\x39\xf2\xce\xfb\xfc\xd4\xfc\x90\xe2\xe6\x3a\x51\x14\ -\xe1\x87\x61\x48\x92\x18\xa2\x47\x2b\x58\xa5\x38\xde\xbc\x84\x01\ -\x72\xfb\x0f\xa0\xb5\xe6\xe7\x4f\x9a\x0c\xbe\x7a\x0a\x3f\x5f\x44\ -\x6b\xcd\xf8\x93\xfb\x18\x44\xe8\x43\xda\x1b\x44\x51\x84\x4e\x0c\ -\xde\xc0\x10\x2b\x73\x2d\xa6\xce\xbf\xcd\xed\xeb\xf3\x94\x2a\x43\ -\x68\xad\x39\xf1\xf9\x14\x37\xaf\x5e\x61\xe3\xfa\x3c\x5a\x6b\x4a\ -\x0a\xf2\x16\x92\x24\x25\x8a\x22\xa4\x5e\xaf\xbb\x07\xa6\x26\xc9\ -\x2d\x2d\xe0\x7b\x8a\x03\x39\x9f\x65\xe7\x40\x14\x4a\xb5\x45\xe9\ -\x51\x0a\x27\x8e\x20\x4a\x29\x88\xa3\xa8\x60\xee\x91\x01\x56\x6a\ -\xa3\x6d\x91\xea\xf5\xba\x2b\x7f\x39\x49\x75\xe5\x17\x24\x01\x25\ -\x42\xae\xe0\x63\x22\x07\x80\x97\x17\xe2\xbf\x0c\xd6\x39\x5c\xc6\ -\xd1\x7a\x68\x80\xd5\xc3\x2f\xd1\x68\x34\xa4\xa3\x72\xbd\x5e\x77\ -\xe5\x2f\x2e\x33\xf8\xeb\x02\x9e\x08\xa2\xa4\x6d\xa2\x03\xac\xc3\ -\xe2\x48\x8d\x63\xb1\x7f\x88\xe0\xc8\x2b\x34\x1a\x8d\xbb\x2a\xef\ -\x86\x94\x26\x27\x78\x6c\x71\x0e\x2f\xeb\xe1\x2c\xe0\x40\x7c\x30\ -\xb1\xe1\xc6\xd0\x30\xeb\xa3\x63\x9d\xe1\xff\x00\xfe\x81\x04\x41\ -\xf0\xbf\xef\x5c\x2e\x97\xff\x35\x0c\xf0\x37\x5c\xfc\x53\xd5\x3a\ -\x96\xb0\xec\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x03\xb1\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ -\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\x5e\x1a\ -\x91\x1c\x00\x00\x03\x56\x49\x44\x41\x54\x48\xc7\xdd\x95\x4d\x68\ -\x5c\x55\x14\xc7\x7f\xf7\xe3\xbd\x97\xe9\x34\x69\x5a\x93\x60\xdb\ -\x80\x60\xc1\x12\x9a\x20\x0d\x49\x88\x50\xca\x43\xbb\x70\x93\x85\ -\x62\x41\x2b\xea\x42\xb0\xb8\xb2\x20\x08\x6e\x64\xd0\x55\x4b\x2d\ -\x48\x37\x22\x48\x10\x8c\x20\xba\x09\x45\xa4\x12\xe2\x98\x8a\x29\ -\x1a\xa4\x92\x6a\x6d\x4a\x9b\xb4\x19\x9d\x98\xc4\xb1\xd3\x99\x79\ -\xf3\xde\x9b\xf7\xee\x75\x51\x2c\xe4\x63\x31\xc1\x6e\xf4\xec\xee\ -\xc7\x39\xbf\x7b\xee\xb9\xff\x73\xe1\xbf\x6e\xa2\x99\x4d\xfd\x9f\ -\x3e\xd4\xff\xdc\x23\x2f\x7d\x38\xbe\xf0\xc9\xa3\x8e\x94\xc1\xc1\ -\xae\xc1\xc9\xa1\xae\x43\x6f\x3c\xbb\xef\xd5\x5f\xb7\x04\xc8\xe7\ -\xf3\x76\xb3\x4d\x1f\x94\x4f\xf3\xee\x91\xf7\x99\x2d\xcd\x90\xda\ -\x98\x30\x89\x28\xdd\x5e\x65\xdf\x9d\x83\x9b\x06\xf5\x7d\xff\x5e\ -\x5c\xbd\x7e\x31\x9f\xcf\x6f\x70\xb8\xb6\x67\x8e\x6f\x0a\x13\x74\ -\x74\x08\x04\x29\x5e\xb5\x8d\xc9\xf9\x2f\x58\x9c\x2d\x6f\x16\x7c\ -\xcd\x58\x6f\x76\x82\x5c\x2e\xb7\x26\xb3\x87\x3f\xda\xf5\x43\x6c\ -\xa2\x81\xdf\x6a\xab\x08\x04\xd9\x44\x33\x2f\xaf\xce\x8c\xe5\x26\ -\x06\xd7\xf9\x6d\xb8\x01\xdd\x4c\x0d\x52\x63\x48\xad\x21\x6c\xc4\ -\x08\xa0\xc5\x1a\x8c\x69\xae\xc8\x4d\x01\x4c\x6a\x30\x58\x6a\x71\ -\x08\x08\xda\x74\x4a\x6a\xec\xfd\x03\x24\xc6\x24\xc6\x1a\xea\xc9\ -\xdd\x0c\x8c\x34\x24\xa9\x49\xb6\x04\x38\x3b\x73\xb6\xb7\x20\x0b\ -\x9c\xeb\x3c\x07\xa7\xf9\xde\xd3\x5a\x68\x29\xd1\x52\x26\x89\xb1\ -\x7d\x49\x9a\x12\x36\x42\xa4\x10\xc4\x6e\x8c\xc5\xf6\x0d\x7e\xde\ -\x3d\xed\x69\xad\x1d\xad\xd0\x12\xbb\xcc\x4f\xd4\xf6\xec\x67\xa2\ -\xf8\x59\xcf\x91\xdd\x47\xaf\xac\x01\xcc\xfd\x39\xf7\xde\xa9\xc7\ -\x4f\x51\x11\x65\x8e\xc6\x4f\x0f\x4a\x29\x11\xc2\x82\x00\x29\x04\ -\x59\x37\x63\x83\x30\x10\x00\x9e\xf2\xec\xf1\xde\xd7\xb3\x4a\xa8\ -\x61\x29\x24\x5a\x2a\xb6\x39\x59\xb6\xeb\xed\x34\x08\xf8\xea\xd6\ -\xd8\x3b\xc0\x33\x6b\x00\xa3\x97\x46\x87\x0f\x74\xf4\x70\xa3\x72\ -\x85\x62\x58\x44\x6a\x85\x52\xa0\x94\x44\x0b\xc9\x5c\x60\x44\xc3\ -\x84\x48\x01\xd3\x2b\x93\x42\x0b\x05\x48\x5a\x9d\x76\x8c\x51\xfc\ -\xb2\x74\x8d\x1b\xc5\x45\x5e\x1c\x1a\x61\x29\x28\x3c\xb9\xe1\x8a\ -\x82\x28\xb0\x97\x57\x7e\x26\x30\x65\x6a\x69\x1d\x65\x25\xca\x48\ -\x1c\xa3\x70\xd4\xdd\x6c\x94\x54\x78\xca\xa3\x45\xb5\xa0\x71\xa9\ -\xc4\x55\xbe\xfb\xe3\x22\xf3\xa5\x5b\x54\xc2\x90\xac\x69\xa7\xd6\ -\xa8\xd2\x30\xe9\xc6\x1a\x58\x63\xc7\xa7\x16\x2e\x1c\xeb\xe9\xec\ -\xc1\x53\x6d\x68\xa9\xf0\x94\x8b\x87\x8b\x46\xd1\xea\x64\xec\xc5\ -\xe5\xf3\xc2\xca\x98\xa1\xce\x27\x6c\x10\xd7\x85\x12\x9a\xbe\x07\ -\x0e\xd0\xb7\xab\x17\x8b\xc5\x95\x8a\x42\x78\x95\xc4\xa4\xe3\x9b\ -\x01\x4e\x64\xa2\xcc\xb1\xa9\xcb\x53\x14\xdd\xe2\x0c\x02\x90\x20\ -\x24\x89\xab\x54\xdf\x53\xfb\x47\xb2\x5a\x5b\x32\x6e\x96\xdb\xf5\ -\xbf\xc4\x97\x0b\xe7\x6b\x9e\x23\x67\x5d\xa5\xb4\xab\x14\xae\xd6\ -\xec\x8c\x3a\x06\xba\xdb\xbb\x89\x68\x9c\xd8\xf8\x4c\xdf\x66\xe5\ -\x64\xfe\x24\xf9\x7c\x9e\xdc\x9b\xb9\x7b\x0a\xb5\x80\x39\x63\xa7\ -\x83\x24\x18\xd6\x8e\xc4\xd3\x92\xba\x09\x48\x4c\x32\x7b\xf3\x85\ -\xca\x63\x6b\x95\xfc\xb2\xf5\x7d\x1f\xdf\xf7\x57\xfe\x99\x93\x4d\ -\x29\xd9\xa2\xab\x71\x15\x8b\x45\x29\x41\x64\x42\x52\xd3\x9c\x86\ -\x9a\x53\xb2\x35\x54\xa2\x0a\xa9\x13\x92\x71\x15\x51\x5c\x25\x69\ -\xb2\x57\x34\x05\xc0\xc0\x6a\xbd\x8c\x67\x22\xea\x8d\x06\x36\x89\ -\x48\xed\xbf\x00\xac\xef\x8a\x1f\xcb\x51\x5c\x62\x16\x4b\x15\x56\ -\x74\x8d\xbd\xdb\xba\xd9\x5b\xef\x1e\x78\x2d\xf7\xbc\xdd\x32\x60\ -\x7d\x3f\x07\x98\x5b\xfe\x1a\xe9\x2d\xb2\x50\x2d\x61\x52\x4d\x97\ -\xde\x8d\xd3\xea\xe0\xf7\xfb\xf7\xe7\xcb\x1c\x19\x7b\xf0\xd0\x1d\ -\xd4\x99\x0b\x4b\xbf\x0f\xb4\x7b\x3b\xea\x87\x77\x1e\xfe\xf6\xd2\ -\xf5\x1f\x5f\x59\x78\xab\x70\x93\xff\xbd\xfd\x0d\xf6\xbd\x75\x1d\ -\x3b\xea\x7e\x89\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\ -\x00\x00\x04\x2c\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ -\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x2e\x23\x00\x00\ -\x2e\x23\x01\x78\xa5\x3f\x76\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ -\xde\x03\x0c\x12\x06\x08\xae\xb5\x4a\x3d\x00\x00\x03\xb9\x49\x44\ -\x41\x54\x38\xcb\x5d\xcb\x5b\x4c\x5b\x75\x00\x07\xe0\xdf\xff\x9c\ -\xd3\x9e\x76\x6d\x69\xc1\x52\x84\xca\x40\x2e\x16\xc7\x9d\x31\x67\ -\x9c\x66\x03\x27\x73\x2f\x8a\x71\x2c\x12\x12\x12\x1f\xa6\x89\x2c\ -\x73\xc9\x36\x37\x13\x6f\x0f\x5e\xa2\xcc\x88\x0f\xb8\x87\x3d\x78\ -\x99\x09\x09\x4b\x34\xd1\x38\x86\x3a\xb9\x3a\x04\x06\x1d\x84\x6b\ -\xa1\x2d\xd0\x0b\xa5\xed\xa1\x17\x7a\x4a\xdb\x73\xf3\xc9\x17\xbf\ -\xf7\x8f\xe0\x7f\xea\x00\xac\xf6\x78\xb0\x7f\xb1\x10\x00\xd0\x07\ -\x50\xbf\x9d\x69\x36\x15\x55\xd5\x3f\x22\xe6\xab\xcd\xac\xbc\x64\ -\xcd\x65\x33\x82\x73\x79\x67\xa2\xa7\x7b\x36\xc8\xfc\x17\xaf\xff\ -\x74\x15\xee\x73\x9f\xe3\xd9\xf0\x3e\xd5\x4e\xb4\xf2\xbb\x57\x3a\ -\xcb\xac\x95\xcd\xaf\x2f\x14\x72\xf5\xad\x79\xe5\x15\xe1\x4c\xf2\ -\xf1\xd8\xf4\x10\x76\x84\x2d\x18\x92\x31\xec\x39\x82\xc3\x25\x96\ -\x83\x2d\x04\x00\x2e\x5f\xac\xc7\xf5\x1e\x3b\x00\xe0\x30\xa0\x39\ -\xd6\xf5\xd2\x25\x5e\x6f\x7c\x7f\x6e\x88\x66\x6d\x2f\x04\x51\x7b\ -\x54\xc0\xae\x5f\x40\x69\x41\x03\xbc\x53\x03\xd8\x18\xf7\x80\x4f\ -\x88\x23\xb6\x23\xc5\x2d\x14\x00\x68\xee\xd8\x71\xfe\xe7\x5e\xb4\ -\xb5\xe1\xc0\xe9\xdb\xbd\xb7\x72\x5a\xda\x3f\x76\xb8\xfd\x78\x30\ -\xf5\x9d\x1c\xe7\xb6\x51\x7a\x92\x81\x62\x52\x63\xda\x31\x89\xb9\ -\xbf\xfd\xf0\x2b\x40\xda\xc4\xc4\x3e\xb9\xb1\x92\xa1\x15\x1f\x8f\ -\xc1\x6c\x99\x4a\xda\x1a\xe9\x12\x53\xd5\x37\x74\x9e\xa5\xa3\xb1\ -\x22\x28\x91\x1c\x95\x8a\x11\x52\xe4\xe9\x4e\x03\x16\x07\x78\x84\ -\x97\x05\x78\xe7\x37\x40\xcb\xe9\x8c\x56\x94\x69\xa3\x4a\xee\x9e\ -\x73\x8a\x76\x82\xa1\x2f\x80\xa6\x77\xf0\xf5\xc4\xa7\x6f\xe9\x8a\ -\x6d\xbd\xae\xe1\x11\x29\x15\x72\xd0\xc9\x1d\x0e\x12\x05\x04\xdc\ -\x5e\x48\xfb\x09\xe8\xf2\x53\x70\xfc\xa9\xc8\x8f\xb2\x22\x65\xc8\ -\xa2\x6f\x5c\x7b\xbe\xbc\xab\xf1\xa3\x15\x85\x00\xc0\xbc\x32\x9a\ -\xfd\xfd\xef\x77\xdc\x81\x99\x87\x9a\x02\x36\xc2\xae\x8e\xfa\x90\ -\x65\x12\x11\xe6\x62\x30\x9b\x4f\x23\xbb\xf0\x14\x84\x3d\x23\x7c\ -\xbe\x10\x88\xb2\xb5\xb5\xe6\x2e\x6b\x5d\x9e\x79\xd3\xde\xda\x71\ -\x93\xd0\x00\xf0\x58\x53\xcb\xb5\x8d\x91\x6f\x4f\x1d\x88\x6d\x52\ -\xf6\xb1\x20\xd1\x54\x18\x91\x10\xd3\x38\x56\xdd\x83\x27\x6a\xda\ -\x50\x5d\x57\x8b\xd1\x87\x01\x94\x54\x14\x2b\x12\x2c\xc6\xd2\x43\ -\xe6\x8e\xe8\x5e\xcd\xf4\xc4\x1f\x17\x5c\x74\xdf\xe2\x6d\x53\x44\ -\xc5\xf6\x4c\xf5\xf5\x9b\xa3\x7e\x9e\x98\x73\x68\x44\x96\x7d\x28\ -\x50\xbf\x08\xe4\x34\xe1\xe5\xd6\x2a\xdc\x9b\x74\x81\x97\x15\x4c\ -\xce\x7b\xc9\x92\x33\x44\x68\x8d\x5a\xa5\xa5\x94\x13\x14\x9e\xfa\ -\x81\xa2\x8c\xf9\x15\x54\xc2\x63\x63\x58\x0d\x38\x5f\x1a\x9b\x0b\ -\x31\x68\x24\x82\x38\x7d\x1c\x95\x35\x79\x90\x28\x1a\x87\x8f\x94\ -\x40\x9d\x63\xc4\x1e\xab\x86\xd6\x92\x85\xcd\x9d\x38\x61\xb2\xb3\ -\x8a\xac\xe5\xb9\x8d\x54\x38\xb0\x5e\xe4\x78\x30\x02\x29\x1e\x05\ -\x51\x53\x90\x64\x05\xb1\x3d\x3d\x26\x96\x44\xc5\xbe\x16\x86\x27\ -\x18\xc7\x36\xc7\x43\xaf\x67\x90\x7b\xd0\x0c\xc5\xa8\x03\xa3\xd3\ -\x92\x86\xa3\x25\xe0\x79\xb1\x99\xe1\x9c\xc1\x48\x68\x66\x05\x11\ -\x2f\x0f\x0d\x14\x68\x55\x04\x1a\x35\x03\x5a\x21\xc4\xee\xe4\x94\ -\x8c\xd1\x43\x12\x94\x0a\x9b\xbc\x80\x24\xcb\x82\xe8\xb5\x60\x29\ -\x82\xd5\xb5\x20\x64\x31\x93\x62\xaa\xa4\xe8\xfd\x1d\x83\xe5\x33\ -\x29\x8f\xb7\xa6\x12\x9c\x64\xd0\xe8\x32\x3a\x2d\x1f\xdd\xd8\x4d\ -\xbc\x1d\x88\xa4\x35\x26\x5e\x42\x43\xa5\x05\x87\x74\x5a\x0c\xaf\ -\x85\x11\x57\x13\x45\xf0\xa4\xc9\xd2\xec\x3a\xb4\xa9\xf4\x10\x01\ -\x80\xfb\xeb\x23\x54\x55\x7e\x21\x9d\xda\xf5\xca\xf7\x06\x26\xa9\ -\xd7\x7e\xb9\x22\x9c\x4c\x5c\xfd\xd1\xa9\xb7\x75\xe8\x9f\xb4\x2a\ -\x6f\x9c\xad\x23\x65\x16\x13\xb8\xfd\x0c\xee\x8e\xaf\x63\x6c\x70\ -\x11\x8c\x2f\x3c\x4b\x85\x62\xc7\x19\xcf\xea\x2d\x7c\xf9\xd5\x7b\ -\x68\xef\x1f\x93\x18\x0a\xd0\xab\x21\xb5\x7b\x40\x14\xe5\xf2\x85\ -\x13\x67\x7e\x4d\x46\xf7\xd3\xe7\xc6\x1d\x1c\x5e\x6d\xb0\x60\x76\ -\x4b\xc4\x6e\x28\x01\x46\x10\x97\x52\xf1\x54\xa7\x7f\xed\xc3\x04\ -\x01\x00\x87\xeb\x2e\xb8\x40\x1c\xdb\xae\x05\xc4\xc2\x22\x3c\x3e\ -\x2b\x3e\xe8\xee\x02\x00\x3c\xf7\xca\xcd\x4a\xc5\x64\x38\x5b\x5d\ -\x5b\x58\xe0\xf2\x44\x64\xce\xbf\xfb\x17\xef\x0e\x0d\x2e\xff\x73\ -\x29\xfa\xcc\xf9\x7e\xfc\x0b\x0b\xb9\xbe\x45\x31\x2c\x8e\xcb\x00\ -\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x02\x4a\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ -\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ -\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x01\xc7\x49\x44\ -\x41\x54\x38\x8d\xa5\x93\xcd\x6a\x1a\x61\x14\x86\x1f\x33\x0e\x05\ -\x4d\x47\xda\x88\x64\x53\x14\x83\x43\x76\xc6\x95\x4c\x5d\xb9\x33\ -\x05\x17\xdd\x64\x99\x45\x2e\x20\xbd\x82\x76\x51\x7a\x03\xbd\x82\ -\x76\x93\x95\x0c\x82\x8b\xe2\x76\x32\xe8\x6a\x04\x85\x04\xa2\xd0\ -\xa2\x14\x84\x80\xc5\x9f\x5a\xb5\xf0\xa5\xa7\x1b\x2d\x93\xa1\x29\ -\x14\x0f\x9c\xcd\x39\xe7\x79\x39\x3f\xdf\x17\x12\x11\xb6\xb1\x9d\ -\xad\xe8\x07\x04\x12\x40\x1a\x88\xfa\x62\x51\xe0\x60\x9d\xfb\xa7\ -\xc0\x7e\x3e\x9f\x3f\xd6\x75\xfd\xa3\x6d\xdb\xe6\x1a\x8c\xda\xb6\ -\x6d\xea\xba\xfe\x21\x9f\xcf\x1f\x03\xfb\xf7\x08\x11\xd9\x78\xc2\ -\xb2\xac\x53\xa0\x0b\x5c\x69\x9a\x76\x59\xad\x56\x8f\xaa\xd5\xea\ -\x91\xa6\x69\x97\xc0\x15\xd0\xb5\x2c\xeb\x54\x44\x12\x1b\x2e\xe4\ -\x5b\x62\x3a\x95\x4a\xbd\x1f\x0c\x06\x4f\x00\x01\x1e\x85\xc3\xe1\ -\x39\x80\x52\x6a\x17\xf8\x09\x84\x92\xc9\xe4\xb8\xdf\xef\xbf\x02\ -\xbe\x04\x47\xb8\xf5\x3c\xef\x22\x93\xc9\x5c\x03\x0b\x60\xac\x94\ -\xd2\x94\x52\x1a\x30\x06\x16\x99\x4c\xe6\xda\xf3\xbc\x0b\xe0\x76\ -\x03\x85\x02\x67\x34\x46\xa3\xd1\x8b\x42\xa1\xf0\xbc\xd7\xeb\x3d\ -\xf3\x27\x4c\xd3\xfc\xda\x68\x34\x9a\xf1\x78\xfc\x13\x30\x7b\x68\ -\x89\x77\xad\x56\xab\xb7\x5c\x2e\xf7\xd6\x5d\xfc\xf1\xd5\x6a\xf5\ -\xb4\xdd\x6e\x77\x81\x3b\x3f\xe0\xef\x20\x5a\xaf\xd7\x0f\xca\xe5\ -\xf2\x6b\xa5\x94\x02\xe6\x01\xf1\x5d\x5d\xd7\xb5\x5a\xad\xf6\xae\ -\x54\x2a\x7d\x06\x7e\x04\x05\xd2\xb1\x58\xec\xcd\x6c\x36\xfb\x05\ -\x7c\x07\xc8\x66\xb3\xdf\x00\x3a\x9d\xce\xde\xba\xe6\xb1\x61\x18\ -\x3b\xd3\xe9\xf4\xed\xdf\x96\x38\xaf\x54\x2a\xcd\x48\x24\x32\x04\ -\x16\xb9\x5c\x6e\xe8\x38\xce\x8d\xe3\x38\x37\xb9\x5c\x6e\x08\x2c\ -\x22\x91\xc8\xb0\x52\xa9\x34\xef\x75\xe7\x7b\x07\x88\xc8\xa1\xeb\ -\xba\x67\xc5\x62\xf1\x7c\x32\x99\x9c\x88\x88\x21\x22\xc6\x64\x32\ -\x39\x29\x16\x8b\xe7\xae\xeb\x9e\x89\xc8\xa1\x9f\x09\x0a\x20\x22\ -\xa6\x88\xbc\x5c\xc3\x9b\x98\xb1\x8e\x99\xc1\xfa\xe0\x19\xff\xdb\ -\xb6\xfe\x8d\xbf\x01\x7c\x52\x08\x38\x8e\xd7\x1d\xc8\x00\x00\x00\ -\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x03\x16\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ -\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ -\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x02\x93\x49\x44\ -\x41\x54\x38\x8d\x95\x91\xbd\x4f\x1b\x41\x10\xc5\x67\xe1\x96\xbb\ -\xf3\x25\xd8\x46\xe1\x82\x20\x91\x2c\x45\x38\x42\x51\x94\x02\x19\ -\x21\x04\x1d\xa2\xa3\x80\xa3\x30\x05\x25\x12\x15\x32\x14\x44\x48\ -\xfc\x05\x54\x96\x28\x29\x4c\x45\x0f\xae\xa0\xc0\x20\x0a\x7a\xa0\ -\x20\x46\x48\x24\x0e\x8e\xb1\x8d\xe3\x23\xb7\xc7\xde\xde\xee\x5e\ -\x8a\xc4\x16\x1f\x49\xc1\x2b\x67\xde\xfc\xf4\x66\x06\x65\xb3\xd9\ -\x81\x20\x08\x52\x08\xa1\x38\x3c\x43\x41\x10\xe4\x11\x42\x69\xc5\ -\xf7\xfd\x85\x91\x91\x91\x01\xc3\x30\xd4\xe7\x00\x08\x21\xd1\xc3\ -\xc3\xc3\x05\x45\x4a\x19\x07\x80\x6a\xbd\x5e\x77\x9f\x03\xc0\x18\ -\x87\xa4\x94\x71\x85\x52\x0a\x94\xd2\x27\xc3\xb9\x5c\x2e\xba\xb7\ -\xb7\xf7\x2a\x16\x8b\xb9\xc9\x64\xb2\x64\x18\x86\xb8\xdf\x17\x42\ -\xb8\x94\xd2\x76\x85\x73\x8e\x82\x20\x68\x36\x6a\xb5\x9a\x92\x4a\ -\xa5\x3e\x5e\x5c\x5c\x84\x55\x55\x85\x83\x83\x03\xd8\xd8\xd8\x78\ -\x37\x3f\x3f\xff\x65\x6a\x6a\xea\xfa\x3e\x84\x73\x8e\x14\xc6\x18\ -\xe2\x9c\x37\x8b\x2b\x2b\x2b\x1f\x6e\x6f\x6f\xdb\x97\x96\x96\x2a\ -\x63\x63\x63\x2e\x00\xc0\xc9\xc9\x49\x5b\x22\x91\x70\xe6\xe6\xe6\ -\x3e\x25\x93\xc9\x6f\xc3\xc3\xc3\x3f\x01\x00\x18\x63\xa8\x85\x73\ -\x8e\xa4\x94\x20\xa5\x84\xb3\xb3\x33\xa3\x5c\x2e\x47\xa7\xa7\xa7\ -\x6b\x96\x65\x5d\xa9\xaa\x5a\x50\x55\xf5\x6a\x68\x68\xe8\x47\x26\ -\x93\xe9\xa8\x56\xab\xd1\xf5\xf5\xf5\xf7\x9e\xe7\x21\x29\x25\x70\ -\xce\x51\x0b\x63\x0c\x49\x29\x61\x7b\x7b\xbb\x6b\x6b\x6b\xeb\xad\ -\x69\x9a\x80\x31\xf6\x8e\x8e\x8e\x24\x63\x8c\x33\xc6\xd8\xf1\xf1\ -\x31\xdf\xdd\xdd\x8d\x99\xa6\x09\x9a\xa6\x69\xe9\x74\x3a\x2e\xa5\ -\x6c\x26\x00\x29\x25\x10\x42\xc2\xf9\x7c\xbe\x4b\xd7\x75\xd8\xd9\ -\xd9\x31\x4d\xd3\x0c\x1a\xc9\x84\x10\x6d\xcb\xcb\xcb\x15\x5d\xd7\ -\x61\x76\x76\xf6\x7a\x7c\x7c\xdc\xfd\x9b\x00\x94\xc6\x0a\x33\x33\ -\x33\x25\x00\x78\x71\x7e\x7e\xfe\x72\x71\x71\xb1\x18\x8d\x46\x5d\ -\x29\x25\x00\x00\xf4\xf6\xf6\x3a\x99\x4c\x46\xd5\x75\x1d\xfa\xfa\ -\xfa\xca\xba\xae\x13\xc6\xd8\x9f\x23\x36\x00\xae\xeb\xda\x96\x65\ -\x95\x4e\x4f\x4f\xef\x22\x91\x48\x79\x6d\x6d\x2d\xde\xdf\xdf\x5f\ -\xc1\x18\xcb\x5c\x2e\xf7\xc6\x71\x9c\xc8\xc4\xc4\x44\x05\x63\x5c\ -\xa7\x94\x8a\xe6\x17\xee\x1f\x11\x63\x5c\x1e\x1c\x1c\xbc\xcb\x66\ -\xb3\x86\x6d\xdb\x1d\x9b\x9b\x9b\xaf\x01\x00\x4c\xd3\x04\xcb\xb2\ -\x2a\x89\x44\xa2\xe4\x38\x8e\x78\xf0\x46\xdf\xf7\x51\x23\xaa\xe7\ -\x79\xbe\xe7\x79\xb5\xd1\xd1\x51\x6d\x72\x72\xf2\xeb\xcd\xcd\x0d\ -\xb6\x6d\x5b\xe9\xe9\xe9\xf1\x11\x42\xbf\x6c\xdb\xae\x35\xbc\x00\ -\x00\xbe\xef\x3f\x04\x34\x44\x08\xa1\x84\x90\xef\x9a\xa6\x69\x9d\ -\x9d\x9d\xd8\xb6\xed\x3b\x21\x04\x87\x47\xf2\x7d\x1f\x29\x00\x70\ -\x59\x28\x14\xc2\xdd\xdd\xdd\xec\xb1\x81\x10\x42\x01\x80\x3e\xae\ -\x03\x00\x14\x8b\xc5\x36\x00\xb8\x54\x42\xa1\xd0\xea\xfe\xfe\xfe\ -\x67\x21\x44\xec\x5f\xc6\xff\xa9\xb5\xb5\xf5\x32\x1c\x0e\xaf\xfe\ -\x06\x47\x78\x84\x8a\xac\x27\x36\x0e\x00\x00\x00\x00\x49\x45\x4e\ -\x44\xae\x42\x60\x82\ -\x00\x00\x07\x84\ -\x47\ -\x49\x46\x38\x39\x61\x36\x00\x37\x00\xf3\x00\x00\xff\xff\xff\x00\ -\x00\x00\x78\x78\x78\x1c\x1c\x1c\x0e\x0e\x0e\xd8\xd8\xd8\x54\x54\ -\x54\xdc\xdc\xdc\xc4\xc4\xc4\x48\x48\x48\x8a\x8a\x8a\x00\x00\x00\ -\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x21\xff\x0b\x4e\ -\x45\x54\x53\x43\x41\x50\x45\x32\x2e\x30\x03\x01\x00\x00\x00\x21\ -\xfe\x1a\x43\x72\x65\x61\x74\x65\x64\x20\x77\x69\x74\x68\x20\x61\ -\x6a\x61\x78\x6c\x6f\x61\x64\x2e\x69\x6e\x66\x6f\x00\x21\xf9\x04\ -\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\ -\xcc\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\ -\x9e\x25\x92\x10\x44\x82\xa0\xa7\xc2\xce\x84\x02\x93\x08\x4d\xbf\ -\x77\xb8\xea\xac\x44\x2f\x04\xa4\x0d\x41\xc5\xd9\xf1\xf3\x03\x0a\ -\x97\x9d\x5c\x91\x77\x2c\x18\x58\x86\x02\x46\xa6\xb3\x2d\x0b\x03\ -\xda\x40\x7b\x51\x05\xa9\x16\xc1\x60\x20\x18\x5d\x75\x06\x93\x80\ -\xd6\x26\x16\x4d\xe1\xd9\x40\x94\xc4\x8b\x45\x6f\x34\x71\x25\x73\ -\x33\x75\x20\x07\x79\x2c\x03\x07\x27\x6a\x6c\x24\x07\x6f\x06\x8d\ -\x50\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x1c\x8f\x87\x96\xa1\x1a\ -\x85\x2c\xa2\x47\xa6\x04\xa8\x14\x8a\x04\x7b\x96\xae\xb0\x17\xb2\ -\x97\xb5\x18\xaa\xac\x3d\xb9\xa5\x6b\xba\x43\xa4\x9f\xc2\xc3\xc4\ -\xc5\xc6\xc7\xc8\x9b\xc1\x8e\xbe\x24\xbc\x72\x74\x23\xb7\x25\xd3\ -\x20\xd5\xd2\x7f\x22\xcf\x84\xd1\x23\xcb\x72\xcd\xc9\x9e\xdf\xc5\ -\xdb\xc5\xd7\xc3\xe8\xc2\xe6\xe5\xe1\xe2\xef\x3d\x11\x00\x21\xf9\ -\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\ -\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\ -\x69\x9e\x68\xaa\x16\x06\x41\x18\x85\x5a\x16\x83\xeb\x0e\xb1\x2c\ -\xb6\xb6\x6b\xe8\xa2\x5e\x0f\x18\x12\xda\x88\x20\x5e\xef\x87\xf4\ -\x1c\x6a\xb6\xc1\xe1\x82\x48\xb8\x12\x88\xa6\xe4\xc0\x33\x4c\x2d\ -\x0a\xa3\x62\x24\x18\x0c\x04\x26\x84\xd1\x95\x05\x09\x7a\x68\x92\ -\x75\x9d\x08\x41\x6f\xa5\xf5\x11\x74\x27\x0c\xf2\x7a\x04\x21\x6f\ -\x36\x71\x23\x73\x46\x75\x83\x66\x86\x23\x6a\x6b\x6d\x5a\x1a\x61\ -\x42\x63\x92\x1c\x55\x57\x91\x97\x9c\x9d\x9e\x9f\xa0\xa1\x6e\x8c\ -\x97\x65\x67\x1a\x84\x2e\x8d\x40\xa9\x04\xab\x14\x7d\x7f\x4d\xb1\ -\x19\xb4\xb3\x3d\xb2\x17\xad\xaf\x32\xbb\xa8\xa4\x92\xa6\xbc\xa2\ -\xc4\xc5\xc6\xc7\xc8\xc9\xca\x27\xc2\x29\xcd\x64\x70\xcc\xd1\x22\ -\xb6\x25\xd5\x7c\xb8\x27\xd7\x1f\xbe\x26\xdd\x22\xcf\xcc\xc0\xcb\ -\x9e\xe1\xc7\xdf\xc6\xdb\xc4\xea\xa2\xe8\xc6\xe6\xe4\xf1\x27\x11\ -\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\ -\x37\x00\x00\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\ -\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\x0a\x44\x4d\ -\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\x86\x1f\x17\ -\x0c\x99\x2b\x18\x6a\x86\x02\x49\x79\x24\x15\x76\xb6\x81\x34\x54\ -\xac\x55\x45\x4f\x1e\xc1\x00\xcc\x9a\xc4\xb6\x72\x4d\x48\x42\xd7\ -\x44\xdd\x9b\x29\xcc\x23\xc3\x5f\x5f\xd1\x01\xbb\x3e\x30\x3b\x07\ -\x61\x06\x7e\x7f\x85\x86\x87\x88\x89\x8a\x12\x08\x09\x35\x09\x08\ -\x8b\x15\x0a\x68\x0a\x19\x54\x43\x08\x6e\x04\x91\x16\x71\x79\x29\ -\x8e\x6e\x09\x17\x7c\x3d\x3f\x9b\x6f\x16\xa6\x6c\x2c\xa9\x04\x17\ -\x9f\x3f\xa2\x68\xa4\xb1\x78\x99\x9b\x9d\x92\x94\x62\x96\x92\x13\ -\x8d\x8f\xbb\xc0\xc5\xc6\xc7\xc8\xc9\x13\x98\x28\xcc\x70\x3c\xa0\ -\x44\xd0\x23\xac\x27\xd5\x6a\xa7\x26\xd7\x5c\xd3\x26\xb2\x23\xce\ -\xde\xb8\xca\x88\xe1\xc5\xdf\xc6\xdb\xc5\xea\xc0\xe8\xc6\xe6\xe4\ -\xf1\x26\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\ -\x00\x36\x00\x37\x00\x00\x04\xcd\x10\xc8\x49\xab\xbd\x38\xeb\xcd\ -\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\ -\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\ -\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\x8a\x35\ -\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\xea\x09\ -\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\xbc\xaa\x60\xa8\ -\x19\x0a\x1a\x71\x3f\x05\x67\x80\x17\x6c\x5a\x29\x7d\x3c\x04\x06\ -\x18\x67\x43\x8c\x36\x8f\x41\x91\x92\x04\x18\x88\x43\x8b\x3c\x8e\ -\x99\x52\x48\x07\x67\x07\x7a\x13\x07\x8b\x06\xa4\xa5\xab\xac\xad\ -\xae\x27\x08\x09\x35\x09\x08\xac\x0a\x92\x0a\x23\x82\x23\x08\x97\ -\x04\xb5\x54\x46\x25\xb2\x97\x09\x21\x90\x24\xbe\x35\xc7\x95\xc9\ -\xca\x21\x9a\x24\xc4\x92\xc6\xd0\xa0\x25\xbd\x97\xc0\x79\xb7\x8c\ -\xb9\x48\xbb\x15\xb1\xb3\xdb\x3f\xd1\xab\xc8\xe8\xcd\xab\xe7\xec\ -\xd7\xaf\xf0\x2b\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ -\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcb\x10\xc8\x49\xab\xbd\x38\ -\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ -\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ -\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ -\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ -\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ -\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ -\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x99\x4c\x05\ -\x06\x35\x06\x05\x6e\x52\x27\x05\x67\xa0\x21\x8f\x23\x9d\x3c\x04\ -\x06\x40\x5d\x26\xab\x36\xae\x61\xb0\xb1\x04\x57\x6a\x25\xaa\x3c\ -\xad\x57\xa2\x19\x08\x09\x35\x09\x08\x17\x07\x67\x07\x43\x0a\xb1\ -\x0a\xc6\xaa\x06\xc9\x3f\x08\xb6\x04\xc5\x79\xc2\xb6\x09\x7a\xd4\ -\x35\xdb\xdc\x7a\xd8\xb1\xda\x79\xd3\xb6\xd6\x79\xcb\xab\xcd\x95\ -\xc1\xc3\xe7\x22\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ -\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\x38\ -\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ -\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ -\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ -\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ -\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ -\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ -\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x00\x08\x09\ -\x35\x09\x08\x96\x0a\x3c\x35\x0a\x94\x08\xa2\x36\x9f\x33\x52\x22\ -\x9c\xa7\x04\x09\x33\x6a\x20\xae\x36\x5f\x41\x21\xb4\x35\xb6\x5d\ -\x21\xad\xa7\xb0\x6e\xb2\x1f\xa6\xae\xa9\x6e\xab\x22\xa1\xa2\xa4\ -\x17\x05\x06\x35\x06\x05\x48\x9b\x9d\xc6\x15\x05\x67\xd2\x94\xcf\ -\xa2\x06\x95\xb4\xdf\xae\x95\xdc\x3c\xde\x94\x07\x67\x07\x96\x07\ -\xdc\x06\xea\x99\x28\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\ -\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\ -\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\ -\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\ -\x44\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\ -\x8a\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\ -\xc9\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\x22\x44\ -\xa2\x96\x40\xe0\x2b\x0a\x3c\x35\x0a\x7f\x12\x08\x82\x36\x7e\x3f\ -\x71\x16\x7b\x88\x04\x09\x8b\x6a\x16\x8f\x36\x3f\x67\x17\x95\x35\ -\x97\x41\x17\x8e\x88\x91\x39\x6c\x5a\x87\x8f\x8a\xa2\x52\x19\x81\ -\x82\x84\x85\x86\x8e\x7d\xae\xb2\xb3\xb4\xb5\x4c\x05\x06\x35\x06\ -\x05\xb3\x05\x67\xbc\x51\x4b\x22\xb9\x82\x06\x4e\x93\x20\x95\x26\ -\x98\x21\xca\x5f\x9d\x21\xc4\x3c\xc6\x33\xc8\x1f\x07\x67\x07\x6b\ -\xa9\x23\x07\xc4\x06\xda\xb6\x1d\x8c\xb2\xa3\xb4\xcc\xb2\xe8\xae\ -\xe6\xb4\xe4\xe2\xef\x27\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\ -\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\ -\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\ -\x30\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\ -\x0f\x44\xb3\xe1\x7e\x88\x44\x2d\x81\xd0\xb8\x60\x43\x80\x82\x57\ -\x53\x44\x39\x08\xaa\xad\x39\x7b\x1d\x3f\x4a\x2d\x21\x31\xe3\x7d\ -\x3b\x62\x5b\x69\x67\x13\x7e\xd2\xb5\x75\x30\x14\xd6\x92\x49\xc5\ -\xda\x19\x9b\xe6\xe2\xbd\x23\x53\x54\x56\x57\x58\x61\x4c\x85\x89\ -\x8a\x8b\x8c\x8d\x57\x05\x06\x35\x06\x05\x8e\x16\x05\x6c\x35\x03\ -\x94\x43\x4f\x7b\x13\x91\x54\x06\x9c\x66\x18\x69\x43\x98\x3d\xa5\ -\x62\xa7\x73\x17\xa0\x3c\xa2\x3f\x79\x37\x18\x07\xa8\x03\x07\x51\ -\x9d\x1a\x07\xa0\x06\xb9\x95\xc1\xc2\xc3\xc4\xc5\xc6\xc7\x1d\xbb\ -\x28\xca\x22\xb3\x9e\x44\xa4\x40\x6d\x27\xb7\x23\xd5\x26\xd7\x21\ -\xce\x27\xdb\x23\xcc\x26\xdf\xc8\x89\xe1\xc2\xdd\xc4\xd9\xc3\xe8\ -\xe5\xd1\xc5\xe4\xe2\xef\x25\x11\x00\x3b\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\ -\x00\x00\x02\x73\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ -\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ -\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x01\xf0\x49\x44\ -\x41\x54\x38\x8d\xa5\x92\x4f\x6b\x1a\x61\x10\xc6\x7f\xae\x8a\x55\ -\x8a\xed\xcd\x20\x14\xb2\x87\x88\x87\x42\x4d\x3c\x49\x3d\xec\x25\ -\x64\x03\x7b\xc9\xc1\xdc\x3c\xf5\xb0\xb7\xc6\x9b\x5f\x20\x1f\x40\ -\xea\xb9\x9f\xc0\xe0\xa9\x37\x21\x14\x12\x59\x58\xd8\x84\x42\xa1\ -\xe0\x69\x89\x60\x4c\x2f\x49\xb5\xa8\xc4\x3f\xd3\x43\xde\xb5\x26\ -\x48\x28\x74\xe0\x85\x79\x67\x9e\x79\x98\x99\x67\x42\x22\xc2\xff\ -\x58\xe4\x99\x5c\x1a\x78\xa9\xfc\xdf\x40\x6f\x2d\x4a\x44\x56\xdf\ -\x2b\x11\xd1\x45\x24\x6d\x59\xd6\x01\x70\x03\xdc\x58\x96\x75\x20\ -\x22\x69\x11\xd9\x54\x98\x65\xcd\xa3\x62\xdb\xb6\x77\x43\xa1\x90\ -\x97\x4a\xa5\x8e\x63\xb1\xd8\x09\x70\x09\x5c\xc6\x62\xb1\x93\x54\ -\x2a\x75\x1c\x0e\x87\x1d\xdb\xb6\x77\x57\x49\x42\x2b\x3b\xd8\x8c\ -\x46\xa3\x9f\x67\xb3\x59\x52\xb5\x3e\x01\xc6\x2a\x17\x07\x5e\x00\ -\xa3\x48\x24\x72\x37\x9d\x4e\x3f\x00\x3e\x80\xb6\x32\xcd\x7d\xb9\ -\x5c\xfe\x02\x0c\x81\x6b\xe0\x56\x91\x4c\x94\x7f\x0d\xfc\x52\x98\ -\xfb\xa7\x4b\x4c\x97\x4a\xa5\x9d\x56\xab\xb5\xa5\x0a\x48\x26\x93\ -\x77\x95\x4a\xe5\x1b\x40\xad\x56\x7b\x37\x18\x0c\x5e\x03\x34\x9b\ -\xcd\xad\xe1\x70\xb8\xd3\x68\x34\x00\x7a\xc1\xfc\x19\xe0\x02\x68\ -\x01\x4d\xa0\x59\xad\x56\x8f\x44\x64\x5b\x44\xb6\xab\xd5\xea\x51\ -\x10\x57\x98\x0b\x11\xc9\x88\xc8\x5f\x19\x35\x4d\xfb\xb1\x58\x2c\ -\x42\xc1\xbf\xdd\x6e\x0f\x80\xfe\x8a\x3f\x51\xa9\x89\xa6\x69\x3f\ -\x97\x75\x81\xce\xae\xeb\x9e\x19\x86\xd1\x09\xe6\x76\x1c\x67\x5f\ -\xd7\xf5\x43\x5d\xd7\x0f\x1d\xc7\xd9\x0f\xe2\x86\x61\x74\x5c\xd7\ -\x3d\x53\xb7\xb1\x24\xe8\xe5\xf3\xf9\xd3\x6c\x36\x7b\x15\x00\xe7\ -\xf3\xf9\xc0\xf7\xfd\x3d\xdf\xf7\xf7\xe6\xf3\x79\xd0\xc1\x24\x9b\ -\xcd\x5e\xe5\xf3\xf9\x53\xd4\x61\x3d\x92\x31\x91\x48\x7c\x1c\x8f\ -\x03\xe5\xd6\x5b\x3c\x1e\x67\x34\x1a\x7d\x62\x8d\x8c\xb7\x9e\xe7\ -\xb9\xb9\x5c\xae\x5f\xaf\xd7\x3b\xa6\x69\x76\x79\xb8\x83\xb1\x69\ -\x9a\xdd\x7a\xbd\xde\xc9\xe5\x72\x7d\xcf\xf3\x5c\x1e\x64\xe5\x69\ -\x07\x00\x1b\xc0\x7b\xa0\xeb\x38\x4e\xba\x58\x2c\xbe\x05\x38\x3f\ -\x3f\xff\x5e\x28\x14\x7a\xc0\x1b\xa0\x1d\x2c\x77\x1d\xc1\xaa\x65\ -\x00\x43\xf9\x5f\x81\xce\x3a\xd0\x73\x04\xff\x64\x7f\x00\x19\x1e\ -\x09\x5d\x0e\xd9\xff\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\ -\x60\x82\ " qt_resource_name = b"\ @@ -1955,74 +1955,74 @@ \x00\x6f\xa6\x53\ \x00\x69\ \x00\x63\x00\x6f\x00\x6e\x00\x73\ -\x00\x14\ -\x0b\x6a\x55\xa7\ -\x00\x62\ -\x00\x6f\x00\x78\x00\x2d\x00\x62\x00\x6f\x00\x72\x00\x64\x00\x65\x00\x72\x00\x2d\x00\x73\x00\x6d\x00\x61\x00\x6c\x00\x6c\x00\x2e\ -\x00\x70\x00\x6e\x00\x67\ \x00\x0b\ -\x00\xbd\xc0\x27\ -\x00\x73\ -\x00\x65\x00\x74\x00\x74\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x0e\ -\x05\x17\xcb\xe7\ -\x00\x62\ -\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x6e\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x11\ -\x0c\x49\x94\x07\ -\x00\x61\ -\x00\x64\x00\x42\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x50\x00\x6c\x00\x75\x00\x73\x00\x36\x00\x34\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\ +\x00\xb0\xe2\x96\ +\x00\x6c\ +\x00\x6f\x00\x61\x00\x64\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x67\x00\x69\x00\x66\ \x00\x0d\ -\x0c\x7a\x4d\x87\ +\x0c\x56\x4d\x87\ \x00\x65\ -\x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x0a\ +\x05\x78\x4f\x27\ +\x00\x72\ +\x00\x65\x00\x6c\x00\x6f\x00\x61\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x11\ \x0c\x97\x94\x07\ \x00\x61\ \x00\x64\x00\x42\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x50\x00\x6c\x00\x75\x00\x73\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\ \ -\x00\x08\ -\x03\xc6\x59\xa7\ -\x00\x70\ -\x00\x6c\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x0d\ -\x0c\x56\x4d\x87\ -\x00\x65\ -\x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x09\ \x06\x98\x83\x27\ \x00\x63\ \x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x0a\ -\x05\x78\x4f\x27\ -\x00\x72\ -\x00\x65\x00\x6c\x00\x6f\x00\x61\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x0b\ -\x00\xb0\xe2\x96\ -\x00\x6c\ -\x00\x6f\x00\x61\x00\x64\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x67\x00\x69\x00\x66\ \x00\x08\ \x0b\x07\x5a\x27\ \x00\x65\ \x00\x64\x00\x69\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x08\ +\x03\xc6\x59\xa7\ +\x00\x70\ +\x00\x6c\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x0b\ +\x00\xbd\xc0\x27\ +\x00\x73\ +\x00\x65\x00\x74\x00\x74\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x11\ +\x0c\x49\x94\x07\ +\x00\x61\ +\x00\x64\x00\x42\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x50\x00\x6c\x00\x75\x00\x73\x00\x36\x00\x34\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\ +\x00\x14\ +\x0b\x6a\x55\xa7\ +\x00\x62\ +\x00\x6f\x00\x78\x00\x2d\x00\x62\x00\x6f\x00\x72\x00\x64\x00\x65\x00\x72\x00\x2d\x00\x73\x00\x6d\x00\x61\x00\x6c\x00\x6c\x00\x2e\ +\x00\x70\x00\x6e\x00\x67\ +\x00\x0e\ +\x05\x17\xcb\xe7\ +\x00\x62\ +\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x6e\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x0d\ +\x0c\x7a\x4d\x87\ +\x00\x65\ +\x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ " qt_resource_struct_v1 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x02\ -\x00\x00\x01\x54\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x81\ -\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x0b\x31\ -\x00\x00\x00\xec\x00\x00\x00\x00\x00\x01\x00\x00\x60\x34\ -\x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x0f\xb4\ -\x00\x00\x01\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x6a\x67\ -\x00\x00\x01\x22\x00\x00\x00\x00\x00\x01\x00\x00\x68\x19\ -\x00\x00\x01\x70\x00\x00\x00\x00\x00\x01\x00\x00\x75\x09\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x30\x69\ -\x00\x00\x01\x02\x00\x00\x00\x00\x00\x01\x00\x00\x63\xe9\ -\x00\x00\x00\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x50\x93\ -\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x5d\x00\ +\x00\x00\x00\xd2\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x80\ +\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x16\xcb\ +\x00\x00\x01\x44\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x5e\ +\x00\x00\x00\x4c\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xb8\ +\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x12\x06\ +\x00\x00\x00\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x14\x54\ +\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x3f\x2d\ +\x00\x00\x00\xee\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x03\ +\x00\x00\x00\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x07\x88\ +\x00\x00\x01\x66\x00\x00\x00\x00\x00\x01\x00\x00\x6b\x13\ +\x00\x00\x00\x66\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xd2\ " qt_resource_struct_v2 = b"\ @@ -2030,30 +2030,30 @@ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x02\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x01\x54\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x81\ -\x00\x00\x01\x6a\x36\x3b\x51\xed\ -\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x0b\x31\ -\x00\x00\x01\x6a\x36\x3b\x51\xc4\ -\x00\x00\x00\xec\x00\x00\x00\x00\x00\x01\x00\x00\x60\x34\ -\x00\x00\x01\x6a\x36\x3b\x52\xb3\ -\x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x0f\xb4\ -\x00\x00\x01\x6a\x36\x3b\x51\xc2\ -\x00\x00\x01\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x6a\x67\ -\x00\x00\x01\x6a\x36\x3b\x52\x37\ -\x00\x00\x01\x22\x00\x00\x00\x00\x00\x01\x00\x00\x68\x19\ -\x00\x00\x01\x6a\x36\x3b\x52\x21\ -\x00\x00\x01\x70\x00\x00\x00\x00\x00\x01\x00\x00\x75\x09\ -\x00\x00\x01\x6a\x36\x3b\x51\xc5\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x6a\x36\x3b\x52\x35\ -\x00\x00\x00\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x30\x69\ -\x00\x00\x01\x6a\x36\x3b\x52\xb2\ -\x00\x00\x01\x02\x00\x00\x00\x00\x00\x01\x00\x00\x63\xe9\ -\x00\x00\x01\x6a\x36\x3b\x52\x01\ -\x00\x00\x00\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x50\x93\ -\x00\x00\x01\x6a\x36\x3b\x51\xef\ -\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x5d\x00\ -\x00\x00\x01\x6a\x36\x3b\x51\xeb\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\xd2\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x80\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x16\xcb\ +\x00\x00\x01\x71\xda\xe0\x03\xd7\ +\x00\x00\x01\x44\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x5e\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\x4c\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xb8\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x12\x06\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x14\x54\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x3f\x2d\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ +\x00\x00\x00\xee\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x03\ +\x00\x00\x01\x71\xda\xe0\x03\xd7\ +\x00\x00\x00\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x07\x88\ +\x00\x00\x01\x71\xda\xe0\x04\x1b\ +\x00\x00\x01\x66\x00\x00\x00\x00\x00\x01\x00\x00\x6b\x13\ +\x00\x00\x01\x71\xda\xe0\x03\xeb\ +\x00\x00\x00\x66\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xd2\ +\x00\x00\x01\x71\xda\xe0\x03\xcf\ " qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/eric6/WebBrowser/data/javascript_rc.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/WebBrowser/data/javascript_rc.py Sun May 31 17:26:14 2020 +0200 @@ -2,13 +2,255 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.10.0) +# Created by: The Resource Compiler for PyQt5 (Qt v5.14.2) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ +\x00\x00\x0e\xf5\ +\x00\ +\x00\x39\x5f\x78\x9c\xcd\x1b\xed\x6e\xdb\x46\xf2\xbf\x9f\x62\x23\ +\x14\xad\x9c\xc8\xb4\x9d\xb4\xf7\x21\x5f\x0e\xe7\x38\x8e\xe1\xab\ +\xe3\x38\x17\xa7\x2d\xe0\x1a\xc6\x4a\x5c\x49\xac\x29\x92\x5d\x92\ +\x56\x74\x89\xde\xe6\xde\xe4\x5e\xec\x66\xf6\x7b\xc9\xa5\xa4\x14\ +\xb9\xa2\x42\x10\x45\xdc\xd9\x99\xd9\xf9\x9e\x59\x66\xff\xf1\xce\ +\x63\xfc\x43\x4e\xf2\x62\xc9\x93\xe9\xac\x22\xfd\x93\x5d\xf2\xf4\ +\xe0\xf0\x3b\x72\x3d\x63\xe4\x6d\x05\x2b\xf3\x82\x66\x4b\x72\x51\ +\xc5\x51\x10\xf2\x5b\xf2\x7d\x4a\xf9\x7f\xff\x93\x3e\xc4\x34\x65\ +\x59\x49\x5e\xd2\x8a\xde\xe7\x59\x59\xa7\x15\x39\x7e\x31\x20\x94\ +\x7c\xff\xf2\xf8\x05\x39\xe3\x79\x5d\x90\xb1\x44\x37\x20\x49\x36\ +\xc9\xff\x71\x1f\xd3\x51\x04\x8f\x00\xa8\xae\x66\x39\x27\xaf\x93\ +\x34\xa1\x19\xf9\x31\x4f\x27\x13\xf2\xb7\xb9\xf8\x15\x2d\xf0\x97\ +\x81\xfd\xbb\xe4\x22\xab\xe8\xb8\x1a\x92\x59\x55\x15\xc3\xfd\xfd\ +\xc5\x62\x11\xfd\x5a\x45\x49\xbe\x9f\x26\x63\x60\x22\xc9\xa6\xfb\ +\xea\x68\xd7\xb3\xa4\x24\x93\x24\x65\x04\xbe\x0b\xca\x2b\x92\x4f\ +\x48\x25\x0e\xf7\x23\x1b\x9d\xcc\x68\x96\xb1\x94\xcc\xf3\xb8\x06\ +\x10\xb3\x44\xae\xf3\x3c\xbd\x4f\xaa\x48\x61\xf9\xea\xed\xf5\xdd\ +\x8b\xd3\xb3\xf3\xcb\xbb\x8b\xf3\x93\xd3\xcb\x77\xa7\xc3\x8b\xb3\ +\xab\x8b\xa7\x87\x5f\x49\x6e\xe6\x73\xc6\xc7\x09\x4d\xc9\x85\x20\ +\xcf\xc8\xfb\x92\x4e\x19\xae\xa9\x07\xac\x24\xb3\x3c\x8d\x81\x2f\ +\xf2\x40\xd3\x24\x46\x41\xe8\x3d\x40\x4d\x72\x0d\x40\x73\xba\x24\ +\x35\xec\xaf\x2c\xd7\x19\xa2\xa1\xe3\x71\xce\x63\x9a\x8d\x19\x59\ +\x24\xd5\x4c\x70\xe9\xa0\x50\xfb\x09\x9d\x72\xc6\xe6\x2c\xab\x48\ +\xc1\xf3\x87\x24\x66\xb1\x01\x47\x2c\xef\xf2\x49\xb5\xa0\x1c\xce\ +\xc9\x41\xe4\x69\xc5\x78\x46\xab\xe4\x81\xa5\x42\x21\x41\x22\x00\ +\x33\x2f\x81\x14\xc8\x3b\xc9\x00\x9d\x62\x87\x2c\x78\x52\x55\x2c\ +\x73\x28\x8e\x58\xb5\x60\xf0\x64\x99\xd7\x84\x66\x71\xc3\x80\x22\ +\xf2\x0a\xf4\x6b\xb4\x23\xf1\x0a\x54\x19\x0a\x23\x8b\x93\x2a\x01\ +\xa3\x21\x20\xaa\xb6\x52\x05\xf0\x9e\x85\x92\xc8\x26\x35\x07\x0e\ +\x39\x22\x41\x6b\xe2\x73\x8a\x8b\x4a\x7c\x4c\xf2\x3c\xae\x08\xae\ +\x10\x5a\xb5\xb1\x2a\x80\xbd\xba\xd4\x5a\x3e\xbb\x7c\x4f\x2e\x58\ +\x59\x32\x4e\xce\x58\xc6\x38\x48\xf6\xaa\x1e\x01\xd3\x6d\xbd\x1e\ +\xfb\xd2\xb3\xfa\x42\x0d\x8e\x18\x72\x11\x93\x3a\x8b\x01\x95\x15\ +\xa3\x32\x2f\x4b\x46\x10\x0d\x53\x7a\x60\xbc\xc4\xe3\x3c\x8d\x0e\ +\x41\x5d\xe6\xe7\x33\x42\xc1\x8c\x11\xb4\x9c\x01\x85\xd1\x52\x60\ +\x7c\x05\x4a\xf0\x14\xfc\x2a\x07\xda\x52\x1e\x28\x60\x5a\x14\x8c\ +\x72\x94\x3b\xa8\x19\x37\x08\x56\x95\x29\x47\x68\xca\x0f\x4f\x0f\ +\x11\x52\x98\xac\xfb\xf8\x19\xec\x18\xa7\x75\x2c\x54\x2f\xb6\x16\ +\x74\x7c\x4f\xa7\x88\x4b\x1c\x47\x9d\x3b\x22\x57\x29\xa3\xc0\x37\ +\x67\x0f\x09\x5b\x68\x8b\x9b\xe4\x69\x9a\x2f\x24\x61\xab\xa2\x2a\ +\x27\x70\xc6\x9a\xb3\x86\x38\x3a\x64\x81\x88\x38\xfb\xb5\x4e\xb8\ +\xb0\xb4\x12\xac\x33\x4d\x51\xc8\x73\xa6\x42\x40\xa9\x14\x3b\xcd\ +\xea\x28\xe7\xd3\x7d\xed\x4f\xfb\xe9\xb4\x48\xa3\x59\x35\x4f\xf5\ +\xe1\x1c\x2b\x68\x01\x83\x83\xee\x79\x3b\xf7\x40\xf8\x62\xb7\x36\ +\x90\xe3\x12\x4c\xbf\x2c\x98\x70\x3a\xf6\x61\xcc\x0a\x3c\xcf\xa0\ +\x19\x2c\xa7\x60\x15\xa5\x70\x84\x31\xe3\xe8\x38\x84\xc6\xd2\x74\ +\x69\x2a\x0e\x83\x01\x14\xac\x18\xb6\xa1\xc4\xc4\x2f\x82\x6a\x8b\ +\x59\x39\xe6\xc9\x48\x0a\xbb\x19\x81\x41\x1d\xe4\x54\xd3\x44\x34\ +\xda\x26\x0e\xa3\xc3\x41\x4b\x4d\x52\xc3\xb0\xe7\xee\xf4\xa7\x93\ +\xd3\xab\xeb\xf3\x37\x97\x51\xf5\xa1\x92\xcb\x22\x14\xa2\x1a\x99\ +\x1b\xe0\x4e\x2f\x5f\xea\xf0\xf6\x95\x78\xbc\xbf\xb3\xd3\x43\x77\ +\x2a\x2b\x9e\x8c\xab\xde\xd1\xce\xce\x03\xe5\xe4\xad\x8d\x9b\xaf\ +\x41\x6d\x80\xe4\x7a\x59\xc0\x79\x9f\x93\x8f\x3b\x04\x3e\x65\x32\ +\x85\x73\x0e\xc9\xe1\x40\xfc\x84\x48\x54\x80\x14\x96\xef\x0b\x30\ +\x48\x36\x24\x4f\xe5\xe3\x24\x4b\x40\x79\xcf\xd4\x8f\x38\x85\x95\ +\x6f\xe5\x8f\x98\x8d\xea\xe9\x90\x7c\xa7\xe1\x1e\xf2\x7b\xf6\x9a\ +\x41\x7e\x88\x87\xe4\x4f\xf2\x21\xb8\x6e\xc6\xc6\xd5\x75\xfe\x4e\ +\xd1\xfa\xb3\xda\x9a\x94\x6a\xe9\x15\xcf\xe7\x7a\xf1\x2f\x72\xb1\ +\x64\xd5\x95\xe2\x65\x48\xfe\x2a\x9f\x71\x56\x16\x10\x50\x80\xf8\ +\xe1\xc1\x60\x67\xd5\x3e\x21\x9c\x6a\x52\x67\x63\x14\x79\xbf\xe2\ +\x34\x03\x70\x5e\x0d\x04\xf7\x27\x34\x4d\x47\x20\xc5\xdd\x1d\x79\ +\xee\x64\x42\xfa\x15\x48\x02\xdd\x42\x43\x92\x47\xcf\x9f\x93\x5e\ +\x3e\xfa\x05\x58\xea\x91\x4f\x9f\x48\x13\x20\x2a\x19\xf8\xa7\x80\ +\xd2\x74\x7a\xbb\x4a\x90\xea\xa4\x65\x0e\xee\xc5\x38\xcf\x79\xbf\ +\x27\x6c\xc2\xe1\x8e\x7d\x00\x63\x44\xe3\x71\x48\x4a\x6a\x32\x84\ +\x83\xb5\x22\x7e\x8d\x5a\x04\x83\x3c\x9b\x4b\xb5\x91\xb1\x3a\x81\ +\xd1\x51\xd4\x23\x4f\x0c\x69\xff\xd3\x23\x67\x60\xd5\x19\x64\xd1\ +\xa1\xa5\x35\x84\xc7\x4f\xd4\x99\xac\x78\x76\xe1\x59\x6f\xd0\x38\ +\x63\x18\x54\x2c\xed\xee\x1e\x19\xa2\x9c\x55\x35\xcf\xe4\xef\xd5\ +\x8e\xf8\x42\x8d\x8c\x8d\x36\xd0\x78\xe5\x32\xfe\x2b\xb2\xc7\x7e\ +\x6e\x09\x1e\xed\x58\x00\x71\x7e\x47\x89\x60\x84\x74\x57\x2c\x5b\ +\x21\x5b\xcd\xc9\x65\xa9\x0f\xb4\xfa\x6c\xea\x69\x43\xd8\x18\x40\ +\x00\xc2\x7f\xbe\x03\x87\x92\x20\xc9\x64\x29\xf7\xd9\x63\xac\xac\ +\x02\x25\xe7\x91\x7f\x64\x17\x7e\xb5\x13\x38\x4e\x64\xb5\xe4\x30\ +\xaf\x1e\x35\xf9\x47\x09\x29\xb6\x14\x44\x84\x3f\x8f\x02\x07\x54\ +\x70\x5b\x9e\x0f\xea\xa5\x92\x75\x9f\xad\x04\x1b\x1b\xcf\x88\x00\ +\x88\x10\x7f\x13\xd7\x18\x33\x42\x47\xbc\x88\x54\x9c\x68\xd9\x9b\ +\x96\x18\x7c\x41\x58\x90\x4e\xdc\xe4\x41\x7f\x46\x9c\xd1\xfb\xa3\ +\xed\x69\x1a\x7f\xdf\x40\xf5\x5f\x0a\xee\x4b\xd1\x6d\x04\xc1\x0d\ +\xd4\xaf\x3c\xe8\xcf\xe0\x21\x66\x13\x0a\x75\x77\x00\xbf\x1f\x46\ +\x20\xa8\x8a\x2a\x54\x9b\x18\x67\x63\x06\xde\x1d\x0f\xc1\x6d\x5d\ +\x0b\xda\x4c\x75\xd5\x32\x61\xf6\x81\x8d\x75\x68\x14\x49\x61\x75\ +\xe4\x2f\x9e\xa3\x3f\x1e\x34\x1e\x36\x5d\x74\x60\x82\x53\xc8\x59\ +\x1f\x99\xc5\x86\xc1\xed\xef\xe3\x7a\x96\xdb\xd0\x06\xa9\x0e\xd3\ +\x31\x24\x69\x11\x09\x62\x28\x22\xc6\x55\xba\xf4\x55\xa7\xa4\xdf\ +\xf4\x4c\xfd\x71\x83\x92\x3d\xb4\x66\x46\xef\xd6\x67\x03\xdf\xba\ +\xac\xe7\x23\xc6\xa3\xd7\xc7\x3f\xdd\xfd\x70\x7c\xf1\xfe\x34\xc0\ +\xe6\x82\xd3\x22\xc8\x84\x11\x91\x46\x02\x4d\x87\x40\xd2\x45\x5f\ +\x78\xdf\x8c\x96\x6f\x16\x99\x36\x1c\xd0\x70\xdc\xdb\x6d\x79\xa3\ +\x6f\x04\x27\x40\x2f\xaf\x88\x90\xbe\x36\x04\x91\x34\xb4\xb1\x42\ +\x5a\x96\x51\x3b\x14\xeb\xb6\x16\x91\x60\x2f\xc1\x03\xf9\x27\x7c\ +\xf2\xc4\x42\xbb\x2b\xc6\x76\x6e\xd4\xce\x5b\xdc\xaa\x1e\xb6\xb7\ +\xb4\xa2\xa9\x1b\xfc\x65\x2a\xd4\x56\x68\x9f\xbb\xa1\x65\xcb\xf8\ +\xaa\xb2\xaa\x3d\x85\xc2\x7d\xa3\xfd\x45\xfe\xbe\xf5\x83\xae\x7c\ +\xd8\x54\x84\x7c\xaa\x02\xe0\xe9\x1c\x3b\xa9\x58\xd3\x56\x4f\xad\ +\x1f\x52\x3e\x2d\xdd\xe8\x4b\x58\x0a\x81\x26\xac\x59\xa8\xfd\xb3\ +\x7e\xef\x7d\x26\xcf\x17\x9b\x52\x0c\x95\xe8\xf3\x89\x29\x7a\x38\ +\x74\x9f\x4b\xd8\x56\x9c\x5f\xb5\xc4\xa6\x63\xe3\x16\x82\x13\xbe\ +\xaa\x09\xfc\x06\x13\x3d\x57\x71\x4a\x87\xed\x76\xc0\xc2\x42\xa3\ +\x61\x9e\x9a\x97\xad\x2d\x34\x6c\x7d\x9a\x6d\x30\xc0\x7e\x47\x4c\ +\x8c\x59\xca\x2a\xb6\x79\x7f\x3b\xcf\x87\xe2\xfc\x16\xf2\x84\x16\ +\x8a\xf4\xd1\x1a\x13\xac\xe3\x3d\xae\x1a\x82\xec\x28\x09\x6e\x92\ +\xdb\xa3\x16\x5c\xa7\x69\x0b\x07\x6c\xd9\xf5\x7a\xdb\x76\xec\xbb\ +\x68\xa7\x31\x65\x65\xe5\x40\x86\x05\x05\x91\xb0\xb2\xa1\xac\xa0\ +\x95\xbb\x06\xd2\xb4\x74\x13\xb3\x6a\xd5\x66\xa0\x69\x3b\xfc\x5b\ +\x7b\x77\xd8\x68\x12\xdd\x60\x1b\xfd\x8f\x58\xe3\x0c\x3b\x93\x3c\ +\x76\x31\xab\x40\x51\x27\x1a\x9a\x2d\xb4\xeb\x85\xb4\x0d\xb4\x04\ +\x4e\x29\xc5\xa1\xd6\xf0\xaa\x11\x02\x3f\x8b\x77\x68\x68\x56\x83\ +\x46\x99\x1c\xb2\x3c\x29\xce\x4b\x3a\xc7\xd1\x14\xe9\x32\x3d\x63\ +\x52\x19\x5b\x90\xb7\x6f\xc4\xaf\xbe\xdd\x2a\x19\xbf\xb1\x0f\x6e\ +\x07\x9a\xdb\x60\xa1\x09\xf9\x32\xcb\x17\xa4\xce\x30\x6b\x12\x6b\ +\x35\x03\xb2\x98\x25\x50\x81\xce\xc5\x44\x92\xb3\x09\xe3\x0c\xc7\ +\x57\x39\x0e\x86\xe0\xf7\x34\x29\x2b\x78\x14\x2b\x7e\xca\x4d\xc7\ +\x69\x38\x40\x2b\x3a\x35\xfc\xc3\xe1\x3f\x92\xbc\x5d\x19\xd6\xfa\ +\xc1\x83\xa0\xdf\x78\xbd\x63\x83\x82\xbb\xd6\x5f\x27\x91\xdf\x6c\ +\x97\xf0\x8d\xf6\x61\x3a\x42\xad\x9c\xcc\xa8\x05\x84\x6a\xf0\xe8\ +\xde\x56\xd8\xf1\xdd\x5d\x12\xdf\xdd\xa1\x52\x01\x56\xa2\xb3\x90\ +\x46\x28\xb8\x78\x6b\x1a\xb5\x1d\xa5\xbe\x0b\xd0\x04\x0e\x8c\xc6\ +\xa6\x32\xac\x66\xb4\x22\x53\x56\xa9\x0e\x3f\x06\xcf\x05\x76\xa4\ +\x63\x12\x36\x4f\x4a\x9c\x6d\xb8\xc4\x25\x01\x99\xb4\x4b\xc1\x87\ +\x49\xea\x40\xe0\x84\x8e\x67\x62\x80\x0b\x04\x3c\x0b\x91\x01\x21\ +\x06\x4b\xc1\x71\x25\xd8\x51\x05\x49\x42\xd3\x81\xea\x90\xc9\xfc\ +\xeb\x52\xd2\xc1\x44\xe0\xf4\x29\x79\xc6\xed\x1f\x71\xef\x8b\x7c\ +\x9c\xb8\x21\x4d\x4a\x29\xc8\x8d\x1f\x3a\x1d\x86\xd2\xad\x49\x95\ +\x49\x56\x56\x38\xcb\x05\x91\x1c\x73\x4e\x97\x81\x1a\xb4\xac\x0b\ +\xd1\x3a\xa7\x4a\x39\x4d\x2f\xd1\x07\x86\xd4\xa9\x5c\x59\x60\x32\ +\x34\xa2\x94\x65\xd3\x6a\xd6\x08\xa3\x4e\x92\xc2\x3a\x1f\xbe\xfe\ +\x46\x1a\x3b\x8e\xc8\x93\x27\x49\x28\x73\x00\x25\x48\x51\xb0\x4f\ +\xa5\x10\x4f\x04\x86\x2e\x80\x74\x86\x6e\x85\x05\x52\x3d\x7e\x75\ +\xf9\xe0\x23\x8d\xca\xdb\xf7\xe9\x13\x31\x0b\x37\xbd\xbb\x3b\x45\ +\xf7\xf1\xdd\x5d\xef\xb6\x09\x68\x4e\x94\xc8\x92\x1f\x67\xbd\x13\ +\x1c\x91\x37\x8f\x65\x98\x91\xf0\x2e\x47\x81\x02\x53\x54\xfe\x0e\ +\x6e\xbf\x9c\x0c\xb8\x9b\xde\x76\xbb\x1b\xa2\xba\x6e\xc3\xd1\x4e\ +\x58\x24\xc1\x7a\x22\xdc\x3b\xa8\x80\x5c\x67\xf7\x10\x9e\x4d\x2c\ +\x11\xb9\xd7\x1c\x07\x12\xaf\x68\x2b\xf2\xba\x92\xb9\xb7\xb7\xb1\ +\x30\xf3\xe4\xf2\xeb\x9b\x50\x2e\x31\xf8\x07\xc4\xe3\xdb\x0d\x5e\ +\xc4\x21\xa4\xb0\x40\xde\x84\x42\x31\x5f\xb2\x38\x52\x83\xc2\xbe\ +\xf1\xaa\x56\x2c\xde\x20\x70\xa1\x76\x85\x37\x64\xcb\xaa\x3a\x5c\ +\xaf\x82\xe6\x26\xf0\x4a\x38\x0f\xf8\x1b\xce\x70\x31\xe7\x49\x2c\ +\xb1\x91\x6d\x95\x13\x9a\x41\xd0\x2a\xa0\xd6\xf9\xb8\x52\x62\x08\ +\xa1\xf9\xa5\x06\xa7\xa6\x25\x06\x3a\x9c\xbf\x03\x2c\xea\x60\x3a\ +\x23\x8b\xbc\x4e\x63\x8c\x83\x64\x46\x1f\xe4\x08\x1e\xa4\x92\x60\ +\x9a\x64\x93\x09\x60\x1b\x90\x51\x2d\x18\x08\xa1\x1d\xb1\x14\xb8\ +\x82\x08\xac\x67\xf8\xa5\x88\xb8\xec\x83\xb8\x0f\x49\x6d\x12\x56\ +\x63\x7a\xbc\xd0\x41\x12\x92\xe3\x79\xa3\xe9\x55\x48\x2f\xdf\x5c\ +\x9f\x0e\xe5\x5c\x3a\x66\x55\x5e\x73\x0c\xcc\xa0\x1d\xcc\x62\x7c\ +\x89\x67\x5e\xe4\xfc\x9e\x72\xbc\xd5\x20\x6f\xaf\x5f\xbc\x3f\xdb\ +\xfb\xf6\xe0\xe0\xe9\x61\x0b\x17\x1a\x8c\x8e\xde\x98\x97\xb1\xf5\ +\xbb\x09\x88\xd9\xc4\x28\x17\x18\x2b\x80\x35\xfa\xc4\x8f\x87\x3b\ +\x2a\xea\x72\xd6\x77\x1f\x05\xe6\x25\xab\x6e\xda\x49\xfc\x01\x49\ +\x7a\x38\xbb\x08\x2b\x63\x52\xec\xdd\x78\x7b\x6e\x00\xd1\x6d\xe0\ +\x90\xab\x8e\x10\xb9\x72\xd8\x04\xe1\x43\xa9\x84\x56\x2a\x2e\x20\ +\x68\xca\x19\x8d\x97\xa2\x0e\x49\xa0\xf5\xfa\x37\x03\x07\xc3\xa1\ +\x71\x35\xab\x4b\x32\x47\x93\xd2\x13\x14\xed\xfc\xe2\x4e\xc8\xe4\ +\xdb\x96\xc3\xad\xab\x8b\x54\x90\x52\xa0\xed\xc2\xb9\xb9\xd7\xcd\ +\x81\x9d\xad\x91\x16\xcd\xb9\x94\xae\x4a\x24\xad\xa4\xde\xd1\x93\ +\xb7\xe0\x6e\x1c\x7c\x9d\x89\x69\xab\xcd\x5d\xad\xb5\x1d\xce\xc7\ +\xb1\x9a\x76\xca\xea\xe4\xa5\x88\x67\x49\xa9\xdb\xc4\x4b\x51\xba\ +\x48\x90\xd0\x88\x42\xee\x12\x96\xfc\x9c\x58\x14\x37\x07\x8e\x6d\ +\x58\xb8\x73\x48\x58\x1f\x7c\xc0\x43\x07\x50\x1e\xe9\xc6\xe2\xbc\ +\x35\x17\x3c\xfa\xa3\x22\xe8\xd0\x2a\xa5\x6b\x2c\x87\x1f\x67\xc8\ +\x6e\xc1\xba\x2f\x3e\x1a\x84\xdc\xe4\xf3\x82\xc6\x76\xbe\x27\x86\ +\x7b\x18\x21\x14\x37\xf8\x4f\x55\xdc\x61\x1a\xb2\xfc\x07\x7c\xd3\ +\xda\x60\xc8\x79\xba\xda\xda\x56\x25\x7a\xe3\x08\xd4\x31\x91\x0d\ +\x70\x50\x43\x84\x22\xd3\x56\x9b\x65\xe4\x31\x62\x3c\x6a\xf3\x2a\ +\x32\x7a\xd8\x74\xc8\xd7\x5f\xbb\xa6\x22\x54\x60\xd2\x62\xa7\x0e\ +\x20\x50\xe4\x19\x78\xbd\xba\x88\x8d\x85\xc3\xf5\x0a\x48\x00\x3d\ +\x62\x9a\x7a\x33\x77\x62\x05\xe5\x50\x75\x03\x3c\x82\xd9\xf0\xe0\ +\xc6\x3b\x39\x16\xe8\x22\x26\x32\x0c\x24\x29\x26\x1b\x05\x8c\x4f\ +\xe9\x82\x2e\x4b\xd1\x32\x88\x22\x3e\x01\x42\x74\x94\xcb\x54\x45\ +\xcc\x09\x14\x37\x41\xbc\x4e\x2e\x96\x8d\x53\x10\x0a\x3f\xeb\x3b\ +\xaa\xc6\xfd\xe3\xa0\x13\x8d\x54\xe2\xd0\x6a\x15\x3b\xa8\x6e\x70\ +\x3d\xaf\x73\x74\x1d\x84\x5d\x6d\x4c\x34\x2b\x9f\x88\xbd\x18\xfd\ +\x83\x78\xab\x65\x88\x4c\x78\x3e\xff\x42\x2e\xdb\x7c\xf2\xbb\x78\ +\xac\x4e\xe5\x5b\xa2\x89\x12\xfc\x7a\x33\x71\xdd\x37\x24\x7d\x81\ +\x12\x04\xbe\x77\xb8\xa5\xa0\x55\x4d\x0e\x4d\x48\xac\x83\x21\x66\ +\x15\xe8\xeb\x82\xc2\x15\x85\x39\x68\x02\x9f\x6a\x56\xa2\xec\x77\ +\x93\x7a\x54\x16\xf8\xae\x05\x1e\x73\x40\x0e\x3b\x64\xb0\x26\x82\ +\x6d\x47\x44\xb6\x9b\x42\x8e\x07\x7f\x88\xc8\xf6\xa5\x22\x50\xe8\ +\x4d\x87\x3f\x62\x18\xb2\x25\x8f\x57\xde\xed\x3f\x7e\x2c\x57\x1e\ +\x93\x73\x31\xfe\x91\x5d\x84\x9d\x0e\xa1\x70\x31\xac\xcb\x80\x21\ +\x19\x41\xe3\x8c\xc8\x31\x26\x06\x6c\x07\x4a\x57\x03\x4b\x3d\xd8\ +\x31\x28\x22\x45\x60\xdf\x2f\xb2\xe4\xb4\x49\x0a\xcc\x0c\xeb\xfb\ +\xd6\x2d\x06\x8a\xd8\x31\x5e\xbb\x04\x8a\x2c\xeb\x59\xe5\x66\x8f\ +\x17\x75\x93\xdf\xc2\x3b\xfb\x03\x3d\xb6\x5e\x8a\xe0\x68\xa7\x50\ +\x43\xf6\xb7\x0a\xd6\xc6\x7d\x69\x51\xa4\x4b\x03\xea\x1d\xa5\x31\ +\x2f\x59\x7b\xcf\x53\x74\xde\x4b\x18\x7f\xd0\x20\xaf\x69\xd1\x94\ +\x12\xf8\x93\x9c\xb9\x59\xdd\x8c\xb1\x1c\x5e\x53\xaa\x8b\x52\xd4\ +\x71\x20\xc4\x1a\x98\x2a\xeb\xe5\x1f\x68\x5a\x23\x5b\x0e\xf8\x8d\ +\x87\xab\x11\xa5\x37\x97\xe7\x3a\x11\x78\x14\x82\x23\x09\xc3\xbc\ +\x13\x49\x13\x6d\xa1\x2d\x95\x82\x2c\xa4\x7d\xfb\xe6\x3d\xc0\xb7\ +\xf8\xfc\xeb\xbf\x5d\x12\xe7\xe0\x05\x60\xc5\x91\x7c\x67\x55\x77\ +\xd7\xcd\x3e\x1c\x50\xfa\x72\xc5\x5e\x59\x0f\x39\x47\x0c\xf8\x53\ +\xef\x3f\x1a\x5f\xc2\xc6\x4e\x0d\x59\xa3\xc6\xb4\x79\x3b\x5f\x28\ +\x5d\x73\x5e\x6b\x39\xde\x99\xda\x86\xb3\xc9\xc1\x3e\xcb\x39\xbd\ +\x80\xe2\x36\x51\xf2\x65\xb1\xfe\x5c\x7c\xbd\x0c\xbc\xef\x83\xea\ +\x93\xab\xaa\x59\xb2\xa0\xad\x66\x49\x2e\x9d\x8b\xfc\xee\x80\x05\ +\x5a\x25\x8b\xf1\xd6\x6b\x54\x03\x86\x8c\x77\xba\x81\xc9\x84\x88\ +\x2f\xad\x9b\x6e\xcf\xea\x9c\x99\x2a\x20\xa9\xc5\xfb\x90\x9b\x86\ +\xaa\xce\xdb\x3f\x66\x8f\x98\xb2\xfa\xe5\x5c\xb8\xc6\xd0\x95\xdb\ +\x73\x6f\x6f\x3b\xee\xe3\x7d\x5d\x10\x03\x9e\x55\xf6\x2b\x2e\x82\ +\xd6\xfc\xd6\xfb\xb9\x39\x4b\xf6\xf0\x40\xbd\x75\xf7\x59\xf6\xb5\ +\xc1\x76\xa2\xd3\x6f\xe4\x6d\xcc\x88\x3d\xa9\xd4\xde\xd0\xda\x41\ +\x00\x08\x8f\x08\x20\xf8\xd5\x28\xc2\x03\x33\xfb\x0e\x05\x99\xb9\ +\xfd\xa3\x75\xc3\x64\xfd\x91\x53\x79\xf1\x8e\xfd\x86\x59\x79\x47\ +\x35\x27\x52\xd1\x9a\x94\xa2\x3f\x16\xa8\x2f\xe9\x75\xe0\x6b\x57\ +\x81\x8d\x42\xc0\x0d\x1b\x61\xcf\x1d\x41\xe1\x7a\xc6\x20\x70\xf0\ +\x77\xe2\xef\xbe\x8d\xce\x93\x3c\xe4\xc2\x7e\xfa\x78\x4e\x5c\xf8\ +\x96\x1f\x7b\x83\xbe\x06\xec\x61\x03\x36\x73\x6a\xcd\x97\xf2\x12\ +\xdd\x83\x7f\xea\xc0\xe3\x1b\x47\x66\x58\xd6\x8c\xcc\xe2\x75\x9a\ +\x71\xcd\x39\xbe\x20\xff\x80\x39\xc5\xdd\x27\xa7\x9e\x89\x7a\x8b\ +\x1a\xfe\x50\x3d\xae\x1a\x90\xa4\x12\x23\xd0\xbc\x35\x6f\x2b\xb0\ +\xeb\x2d\x71\x5d\x5c\x7a\xba\xf8\x9a\xf7\x9f\x66\x64\xac\x1a\xe8\ +\x58\x34\xd4\x04\x67\xf5\x64\xc9\xaa\x46\xfc\xfa\x9c\xf4\x28\xa4\ +\xf0\xac\x79\x83\xd0\x14\x5b\x68\xa0\xde\x84\x01\x3d\x89\x38\x14\ +\x6c\x72\xf0\x8a\x4a\x16\xfc\x99\x48\xb3\x25\xc9\x8b\x2a\x99\xe3\ +\x54\x92\xd0\x05\x5d\xe2\xec\x1f\x9b\xa0\x8a\xd7\x63\x39\x05\xa0\ +\xe3\xaa\x56\xe0\x2d\x6c\x41\xd2\xbe\x5d\x40\x4b\x84\xc1\x64\xca\ +\xe2\xde\xba\xfb\x25\x3b\xa8\x6b\xe2\xc4\xb7\x5e\x6b\xb6\x1b\xac\ +\x1c\xcc\x0d\x04\x7a\xb6\x79\x0d\x46\x2b\xdc\xe5\x63\xd0\x2e\x0c\ +\x27\xc9\xb4\xe6\x74\x84\xaf\x49\x23\x05\x3f\x08\x4d\x99\xd3\xd6\ +\x93\x56\xc6\xc1\x4f\xa8\x7c\xda\x52\xef\xe1\xd6\xac\x81\x6c\x9b\ +\xa0\x05\xea\x14\x95\x4d\x39\xc3\x1b\x88\xec\x1b\xbc\x80\x00\x7b\ +\xce\xd6\x36\xb7\xfa\x45\x0f\x85\x5b\x7a\x91\x5b\x2b\x2a\x57\xf3\ +\x7a\x81\x9f\x7b\xd8\xd5\x36\x55\xfb\x73\xcf\x0e\x84\x9d\x3b\x2a\ +\x15\xfc\x83\xbd\x4c\xeb\x91\x1a\x59\x77\xd4\x89\x62\x93\xaf\x9b\ +\xd2\xd5\x4d\x5f\x70\xdf\x95\x02\x1e\xb6\x17\xa5\x2f\x1d\x6d\x4c\ +\x48\x0c\x02\xa7\x6c\x60\x03\x02\x10\xd9\x5c\xff\x9f\xa0\xda\x17\ +\xe9\xa3\xe6\xb5\x9c\x7f\xe2\xcf\xea\xfb\x37\xc6\x91\x87\xb6\xd8\ +\xf0\xb3\x5d\x73\xbc\x29\xf5\x3b\xef\xf9\x87\x5b\xdc\xad\xb3\xbf\ +\x00\xd6\xcc\x03\xb8\x77\x8e\x0e\x70\x71\x34\x80\xf5\xa3\xbd\x11\ +\x5a\xf7\x2b\x47\x7a\x8a\xbb\xfa\xbf\xbc\x50\x20\x6e\x5e\x65\x0d\ +\x63\x9b\x4b\x53\x2b\x6b\xda\x8d\x97\xb2\x0c\x60\x33\x35\x7b\xf0\ +\xaa\x47\x68\xb7\xac\xea\x25\x2b\xf2\xb1\x75\xb3\x01\x75\x11\xec\ +\x80\x38\x69\x8f\x6d\x2a\xdc\xcc\x79\xb5\x28\x62\x59\x3d\xf7\x9a\ +\x2a\x55\x6b\xeb\x97\x4c\x2c\x90\x7c\xa4\x2b\x0b\x10\xe2\xfe\xbe\ +\x37\xd0\xc1\xff\xc7\x22\xec\x3e\xcb\x63\xf6\x4b\xb9\xe3\x14\xc5\ +\xea\x3f\xff\xa1\xe3\x7d\x23\xf1\x7f\xa3\x49\xca\x25\xb0\x46\x7c\ +\x4f\xa2\xf4\x6e\x40\x1c\xf3\xf3\x6c\x51\x72\x70\x04\x2c\xfc\x0f\ +\xef\xa9\xe8\x1b\ \x00\x00\x24\x34\ \x00\ \x00\x86\x68\x78\x9c\xd5\x7d\xfb\x73\xdb\x38\xd2\xe0\xcf\xa7\xbf\ @@ -591,248 +833,6 @@ \xd5\x5f\xb6\xa5\xc4\x7a\x7c\x4d\x56\x65\xea\x73\x49\x25\x45\xbc\ \xb7\xfb\x42\xef\x99\xfb\x0e\xbd\xa1\xee\x54\x9e\x5c\xff\x7f\x2f\ \x2e\x80\x20\ -\x00\x00\x0e\xf5\ -\x00\ -\x00\x39\x5f\x78\x9c\xcd\x1b\xed\x6e\xdb\x46\xf2\xbf\x9f\x62\x23\ -\x14\xad\x9c\xc8\xb4\x9d\xb4\xf7\x21\x5f\x0e\xe7\x38\x8e\xe1\xab\ -\xe3\x38\x17\xa7\x2d\xe0\x1a\xc6\x4a\x5c\x49\xac\x29\x92\x5d\x92\ -\x56\x74\x89\xde\xe6\xde\xe4\x5e\xec\x66\xf6\x7b\xc9\xa5\xa4\x14\ -\xb9\xa2\x42\x10\x45\xdc\xd9\x99\xd9\xf9\x9e\x59\x66\xff\xf1\xce\ -\x63\xfc\x43\x4e\xf2\x62\xc9\x93\xe9\xac\x22\xfd\x93\x5d\xf2\xf4\ -\xe0\xf0\x3b\x72\x3d\x63\xe4\x6d\x05\x2b\xf3\x82\x66\x4b\x72\x51\ -\xc5\x51\x10\xf2\x5b\xf2\x7d\x4a\xf9\x7f\xff\x93\x3e\xc4\x34\x65\ -\x59\x49\x5e\xd2\x8a\xde\xe7\x59\x59\xa7\x15\x39\x7e\x31\x20\x94\ -\x7c\xff\xf2\xf8\x05\x39\xe3\x79\x5d\x90\xb1\x44\x37\x20\x49\x36\ -\xc9\xff\x71\x1f\xd3\x51\x04\x8f\x00\xa8\xae\x66\x39\x27\xaf\x93\ -\x34\xa1\x19\xf9\x31\x4f\x27\x13\xf2\xb7\xb9\xf8\x15\x2d\xf0\x97\ -\x81\xfd\xbb\xe4\x22\xab\xe8\xb8\x1a\x92\x59\x55\x15\xc3\xfd\xfd\ -\xc5\x62\x11\xfd\x5a\x45\x49\xbe\x9f\x26\x63\x60\x22\xc9\xa6\xfb\ -\xea\x68\xd7\xb3\xa4\x24\x93\x24\x65\x04\xbe\x0b\xca\x2b\x92\x4f\ -\x48\x25\x0e\xf7\x23\x1b\x9d\xcc\x68\x96\xb1\x94\xcc\xf3\xb8\x06\ -\x10\xb3\x44\xae\xf3\x3c\xbd\x4f\xaa\x48\x61\xf9\xea\xed\xf5\xdd\ -\x8b\xd3\xb3\xf3\xcb\xbb\x8b\xf3\x93\xd3\xcb\x77\xa7\xc3\x8b\xb3\ -\xab\x8b\xa7\x87\x5f\x49\x6e\xe6\x73\xc6\xc7\x09\x4d\xc9\x85\x20\ -\xcf\xc8\xfb\x92\x4e\x19\xae\xa9\x07\xac\x24\xb3\x3c\x8d\x81\x2f\ -\xf2\x40\xd3\x24\x46\x41\xe8\x3d\x40\x4d\x72\x0d\x40\x73\xba\x24\ -\x35\xec\xaf\x2c\xd7\x19\xa2\xa1\xe3\x71\xce\x63\x9a\x8d\x19\x59\ -\x24\xd5\x4c\x70\xe9\xa0\x50\xfb\x09\x9d\x72\xc6\xe6\x2c\xab\x48\ -\xc1\xf3\x87\x24\x66\xb1\x01\x47\x2c\xef\xf2\x49\xb5\xa0\x1c\xce\ -\xc9\x41\xe4\x69\xc5\x78\x46\xab\xe4\x81\xa5\x42\x21\x41\x22\x00\ -\x33\x2f\x81\x14\xc8\x3b\xc9\x00\x9d\x62\x87\x2c\x78\x52\x55\x2c\ -\x73\x28\x8e\x58\xb5\x60\xf0\x64\x99\xd7\x84\x66\x71\xc3\x80\x22\ -\xf2\x0a\xf4\x6b\xb4\x23\xf1\x0a\x54\x19\x0a\x23\x8b\x93\x2a\x01\ -\xa3\x21\x20\xaa\xb6\x52\x05\xf0\x9e\x85\x92\xc8\x26\x35\x07\x0e\ -\x39\x22\x41\x6b\xe2\x73\x8a\x8b\x4a\x7c\x4c\xf2\x3c\xae\x08\xae\ -\x10\x5a\xb5\xb1\x2a\x80\xbd\xba\xd4\x5a\x3e\xbb\x7c\x4f\x2e\x58\ -\x59\x32\x4e\xce\x58\xc6\x38\x48\xf6\xaa\x1e\x01\xd3\x6d\xbd\x1e\ -\xfb\xd2\xb3\xfa\x42\x0d\x8e\x18\x72\x11\x93\x3a\x8b\x01\x95\x15\ -\xa3\x32\x2f\x4b\x46\x10\x0d\x53\x7a\x60\xbc\xc4\xe3\x3c\x8d\x0e\ -\x41\x5d\xe6\xe7\x33\x42\xc1\x8c\x11\xb4\x9c\x01\x85\xd1\x52\x60\ -\x7c\x05\x4a\xf0\x14\xfc\x2a\x07\xda\x52\x1e\x28\x60\x5a\x14\x8c\ -\x72\x94\x3b\xa8\x19\x37\x08\x56\x95\x29\x47\x68\xca\x0f\x4f\x0f\ -\x11\x52\x98\xac\xfb\xf8\x19\xec\x18\xa7\x75\x2c\x54\x2f\xb6\x16\ -\x74\x7c\x4f\xa7\x88\x4b\x1c\x47\x9d\x3b\x22\x57\x29\xa3\xc0\x37\ -\x67\x0f\x09\x5b\x68\x8b\x9b\xe4\x69\x9a\x2f\x24\x61\xab\xa2\x2a\ -\x27\x70\xc6\x9a\xb3\x86\x38\x3a\x64\x81\x88\x38\xfb\xb5\x4e\xb8\ -\xb0\xb4\x12\xac\x33\x4d\x51\xc8\x73\xa6\x42\x40\xa9\x14\x3b\xcd\ -\xea\x28\xe7\xd3\x7d\xed\x4f\xfb\xe9\xb4\x48\xa3\x59\x35\x4f\xf5\ -\xe1\x1c\x2b\x68\x01\x83\x83\xee\x79\x3b\xf7\x40\xf8\x62\xb7\x36\ -\x90\xe3\x12\x4c\xbf\x2c\x98\x70\x3a\xf6\x61\xcc\x0a\x3c\xcf\xa0\ -\x19\x2c\xa7\x60\x15\xa5\x70\x84\x31\xe3\xe8\x38\x84\xc6\xd2\x74\ -\x69\x2a\x0e\x83\x01\x14\xac\x18\xb6\xa1\xc4\xc4\x2f\x82\x6a\x8b\ -\x59\x39\xe6\xc9\x48\x0a\xbb\x19\x81\x41\x1d\xe4\x54\xd3\x44\x34\ -\xda\x26\x0e\xa3\xc3\x41\x4b\x4d\x52\xc3\xb0\xe7\xee\xf4\xa7\x93\ -\xd3\xab\xeb\xf3\x37\x97\x51\xf5\xa1\x92\xcb\x22\x14\xa2\x1a\x99\ -\x1b\xe0\x4e\x2f\x5f\xea\xf0\xf6\x95\x78\xbc\xbf\xb3\xd3\x43\x77\ -\x2a\x2b\x9e\x8c\xab\xde\xd1\xce\xce\x03\xe5\xe4\xad\x8d\x9b\xaf\ -\x41\x6d\x80\xe4\x7a\x59\xc0\x79\x9f\x93\x8f\x3b\x04\x3e\x65\x32\ -\x85\x73\x0e\xc9\xe1\x40\xfc\x84\x48\x54\x80\x14\x96\xef\x0b\x30\ -\x48\x36\x24\x4f\xe5\xe3\x24\x4b\x40\x79\xcf\xd4\x8f\x38\x85\x95\ -\x6f\xe5\x8f\x98\x8d\xea\xe9\x90\x7c\xa7\xe1\x1e\xf2\x7b\xf6\x9a\ -\x41\x7e\x88\x87\xe4\x4f\xf2\x21\xb8\x6e\xc6\xc6\xd5\x75\xfe\x4e\ -\xd1\xfa\xb3\xda\x9a\x94\x6a\xe9\x15\xcf\xe7\x7a\xf1\x2f\x72\xb1\ -\x64\xd5\x95\xe2\x65\x48\xfe\x2a\x9f\x71\x56\x16\x10\x50\x80\xf8\ -\xe1\xc1\x60\x67\xd5\x3e\x21\x9c\x6a\x52\x67\x63\x14\x79\xbf\xe2\ -\x34\x03\x70\x5e\x0d\x04\xf7\x27\x34\x4d\x47\x20\xc5\xdd\x1d\x79\ -\xee\x64\x42\xfa\x15\x48\x02\xdd\x42\x43\x92\x47\xcf\x9f\x93\x5e\ -\x3e\xfa\x05\x58\xea\x91\x4f\x9f\x48\x13\x20\x2a\x19\xf8\xa7\x80\ -\xd2\x74\x7a\xbb\x4a\x90\xea\xa4\x65\x0e\xee\xc5\x38\xcf\x79\xbf\ -\x27\x6c\xc2\xe1\x8e\x7d\x00\x63\x44\xe3\x71\x48\x4a\x6a\x32\x84\ -\x83\xb5\x22\x7e\x8d\x5a\x04\x83\x3c\x9b\x4b\xb5\x91\xb1\x3a\x81\ -\xd1\x51\xd4\x23\x4f\x0c\x69\xff\xd3\x23\x67\x60\xd5\x19\x64\xd1\ -\xa1\xa5\x35\x84\xc7\x4f\xd4\x99\xac\x78\x76\xe1\x59\x6f\xd0\x38\ -\x63\x18\x54\x2c\xed\xee\x1e\x19\xa2\x9c\x55\x35\xcf\xe4\xef\xd5\ -\x8e\xf8\x42\x8d\x8c\x8d\x36\xd0\x78\xe5\x32\xfe\x2b\xb2\xc7\x7e\ -\x6e\x09\x1e\xed\x58\x00\x71\x7e\x47\x89\x60\x84\x74\x57\x2c\x5b\ -\x21\x5b\xcd\xc9\x65\xa9\x0f\xb4\xfa\x6c\xea\x69\x43\xd8\x18\x40\ -\x00\xc2\x7f\xbe\x03\x87\x92\x20\xc9\x64\x29\xf7\xd9\x63\xac\xac\ -\x02\x25\xe7\x91\x7f\x64\x17\x7e\xb5\x13\x38\x4e\x64\xb5\xe4\x30\ -\xaf\x1e\x35\xf9\x47\x09\x29\xb6\x14\x44\x84\x3f\x8f\x02\x07\x54\ -\x70\x5b\x9e\x0f\xea\xa5\x92\x75\x9f\xad\x04\x1b\x1b\xcf\x88\x00\ -\x88\x10\x7f\x13\xd7\x18\x33\x42\x47\xbc\x88\x54\x9c\x68\xd9\x9b\ -\x96\x18\x7c\x41\x58\x90\x4e\xdc\xe4\x41\x7f\x46\x9c\xd1\xfb\xa3\ -\xed\x69\x1a\x7f\xdf\x40\xf5\x5f\x0a\xee\x4b\xd1\x6d\x04\xc1\x0d\ -\xd4\xaf\x3c\xe8\xcf\xe0\x21\x66\x13\x0a\x75\x77\x00\xbf\x1f\x46\ -\x20\xa8\x8a\x2a\x54\x9b\x18\x67\x63\x06\xde\x1d\x0f\xc1\x6d\x5d\ -\x0b\xda\x4c\x75\xd5\x32\x61\xf6\x81\x8d\x75\x68\x14\x49\x61\x75\ -\xe4\x2f\x9e\xa3\x3f\x1e\x34\x1e\x36\x5d\x74\x60\x82\x53\xc8\x59\ -\x1f\x99\xc5\x86\xc1\xed\xef\xe3\x7a\x96\xdb\xd0\x06\xa9\x0e\xd3\ -\x31\x24\x69\x11\x09\x62\x28\x22\xc6\x55\xba\xf4\x55\xa7\xa4\xdf\ -\xf4\x4c\xfd\x71\x83\x92\x3d\xb4\x66\x46\xef\xd6\x67\x03\xdf\xba\ -\xac\xe7\x23\xc6\xa3\xd7\xc7\x3f\xdd\xfd\x70\x7c\xf1\xfe\x34\xc0\ -\xe6\x82\xd3\x22\xc8\x84\x11\x91\x46\x02\x4d\x87\x40\xd2\x45\x5f\ -\x78\xdf\x8c\x96\x6f\x16\x99\x36\x1c\xd0\x70\xdc\xdb\x6d\x79\xa3\ -\x6f\x04\x27\x40\x2f\xaf\x88\x90\xbe\x36\x04\x91\x34\xb4\xb1\x42\ -\x5a\x96\x51\x3b\x14\xeb\xb6\x16\x91\x60\x2f\xc1\x03\xf9\x27\x7c\ -\xf2\xc4\x42\xbb\x2b\xc6\x76\x6e\xd4\xce\x5b\xdc\xaa\x1e\xb6\xb7\ -\xb4\xa2\xa9\x1b\xfc\x65\x2a\xd4\x56\x68\x9f\xbb\xa1\x65\xcb\xf8\ -\xaa\xb2\xaa\x3d\x85\xc2\x7d\xa3\xfd\x45\xfe\xbe\xf5\x83\xae\x7c\ -\xd8\x54\x84\x7c\xaa\x02\xe0\xe9\x1c\x3b\xa9\x58\xd3\x56\x4f\xad\ -\x1f\x52\x3e\x2d\xdd\xe8\x4b\x58\x0a\x81\x26\xac\x59\xa8\xfd\xb3\ -\x7e\xef\x7d\x26\xcf\x17\x9b\x52\x0c\x95\xe8\xf3\x89\x29\x7a\x38\ -\x74\x9f\x4b\xd8\x56\x9c\x5f\xb5\xc4\xa6\x63\xe3\x16\x82\x13\xbe\ -\xaa\x09\xfc\x06\x13\x3d\x57\x71\x4a\x87\xed\x76\xc0\xc2\x42\xa3\ -\x61\x9e\x9a\x97\xad\x2d\x34\x6c\x7d\x9a\x6d\x30\xc0\x7e\x47\x4c\ -\x8c\x59\xca\x2a\xb6\x79\x7f\x3b\xcf\x87\xe2\xfc\x16\xf2\x84\x16\ -\x8a\xf4\xd1\x1a\x13\xac\xe3\x3d\xae\x1a\x82\xec\x28\x09\x6e\x92\ -\xdb\xa3\x16\x5c\xa7\x69\x0b\x07\x6c\xd9\xf5\x7a\xdb\x76\xec\xbb\ -\x68\xa7\x31\x65\x65\xe5\x40\x86\x05\x05\x91\xb0\xb2\xa1\xac\xa0\ -\x95\xbb\x06\xd2\xb4\x74\x13\xb3\x6a\xd5\x66\xa0\x69\x3b\xfc\x5b\ -\x7b\x77\xd8\x68\x12\xdd\x60\x1b\xfd\x8f\x58\xe3\x0c\x3b\x93\x3c\ -\x76\x31\xab\x40\x51\x27\x1a\x9a\x2d\xb4\xeb\x85\xb4\x0d\xb4\x04\ -\x4e\x29\xc5\xa1\xd6\xf0\xaa\x11\x02\x3f\x8b\x77\x68\x68\x56\x83\ -\x46\x99\x1c\xb2\x3c\x29\xce\x4b\x3a\xc7\xd1\x14\xe9\x32\x3d\x63\ -\x52\x19\x5b\x90\xb7\x6f\xc4\xaf\xbe\xdd\x2a\x19\xbf\xb1\x0f\x6e\ -\x07\x9a\xdb\x60\xa1\x09\xf9\x32\xcb\x17\xa4\xce\x30\x6b\x12\x6b\ -\x35\x03\xb2\x98\x25\x50\x81\xce\xc5\x44\x92\xb3\x09\xe3\x0c\xc7\ -\x57\x39\x0e\x86\xe0\xf7\x34\x29\x2b\x78\x14\x2b\x7e\xca\x4d\xc7\ -\x69\x38\x40\x2b\x3a\x35\xfc\xc3\xe1\x3f\x92\xbc\x5d\x19\xd6\xfa\ -\xc1\x83\xa0\xdf\x78\xbd\x63\x83\x82\xbb\xd6\x5f\x27\x91\xdf\x6c\ -\x97\xf0\x8d\xf6\x61\x3a\x42\xad\x9c\xcc\xa8\x05\x84\x6a\xf0\xe8\ -\xde\x56\xd8\xf1\xdd\x5d\x12\xdf\xdd\xa1\x52\x01\x56\xa2\xb3\x90\ -\x46\x28\xb8\x78\x6b\x1a\xb5\x1d\xa5\xbe\x0b\xd0\x04\x0e\x8c\xc6\ -\xa6\x32\xac\x66\xb4\x22\x53\x56\xa9\x0e\x3f\x06\xcf\x05\x76\xa4\ -\x63\x12\x36\x4f\x4a\x9c\x6d\xb8\xc4\x25\x01\x99\xb4\x4b\xc1\x87\ -\x49\xea\x40\xe0\x84\x8e\x67\x62\x80\x0b\x04\x3c\x0b\x91\x01\x21\ -\x06\x4b\xc1\x71\x25\xd8\x51\x05\x49\x42\xd3\x81\xea\x90\xc9\xfc\ -\xeb\x52\xd2\xc1\x44\xe0\xf4\x29\x79\xc6\xed\x1f\x71\xef\x8b\x7c\ -\x9c\xb8\x21\x4d\x4a\x29\xc8\x8d\x1f\x3a\x1d\x86\xd2\xad\x49\x95\ -\x49\x56\x56\x38\xcb\x05\x91\x1c\x73\x4e\x97\x81\x1a\xb4\xac\x0b\ -\xd1\x3a\xa7\x4a\x39\x4d\x2f\xd1\x07\x86\xd4\xa9\x5c\x59\x60\x32\ -\x34\xa2\x94\x65\xd3\x6a\xd6\x08\xa3\x4e\x92\xc2\x3a\x1f\xbe\xfe\ -\x46\x1a\x3b\x8e\xc8\x93\x27\x49\x28\x73\x00\x25\x48\x51\xb0\x4f\ -\xa5\x10\x4f\x04\x86\x2e\x80\x74\x86\x6e\x85\x05\x52\x3d\x7e\x75\ -\xf9\xe0\x23\x8d\xca\xdb\xf7\xe9\x13\x31\x0b\x37\xbd\xbb\x3b\x45\ -\xf7\xf1\xdd\x5d\xef\xb6\x09\x68\x4e\x94\xc8\x92\x1f\x67\xbd\x13\ -\x1c\x91\x37\x8f\x65\x98\x91\xf0\x2e\x47\x81\x02\x53\x54\xfe\x0e\ -\x6e\xbf\x9c\x0c\xb8\x9b\xde\x76\xbb\x1b\xa2\xba\x6e\xc3\xd1\x4e\ -\x58\x24\xc1\x7a\x22\xdc\x3b\xa8\x80\x5c\x67\xf7\x10\x9e\x4d\x2c\ -\x11\xb9\xd7\x1c\x07\x12\xaf\x68\x2b\xf2\xba\x92\xb9\xb7\xb7\xb1\ -\x30\xf3\xe4\xf2\xeb\x9b\x50\x2e\x31\xf8\x07\xc4\xe3\xdb\x0d\x5e\ -\xc4\x21\xa4\xb0\x40\xde\x84\x42\x31\x5f\xb2\x38\x52\x83\xc2\xbe\ -\xf1\xaa\x56\x2c\xde\x20\x70\xa1\x76\x85\x37\x64\xcb\xaa\x3a\x5c\ -\xaf\x82\xe6\x26\xf0\x4a\x38\x0f\xf8\x1b\xce\x70\x31\xe7\x49\x2c\ -\xb1\x91\x6d\x95\x13\x9a\x41\xd0\x2a\xa0\xd6\xf9\xb8\x52\x62\x08\ -\xa1\xf9\xa5\x06\xa7\xa6\x25\x06\x3a\x9c\xbf\x03\x2c\xea\x60\x3a\ -\x23\x8b\xbc\x4e\x63\x8c\x83\x64\x46\x1f\xe4\x08\x1e\xa4\x92\x60\ -\x9a\x64\x93\x09\x60\x1b\x90\x51\x2d\x18\x08\xa1\x1d\xb1\x14\xb8\ -\x82\x08\xac\x67\xf8\xa5\x88\xb8\xec\x83\xb8\x0f\x49\x6d\x12\x56\ -\x63\x7a\xbc\xd0\x41\x12\x92\xe3\x79\xa3\xe9\x55\x48\x2f\xdf\x5c\ -\x9f\x0e\xe5\x5c\x3a\x66\x55\x5e\x73\x0c\xcc\xa0\x1d\xcc\x62\x7c\ -\x89\x67\x5e\xe4\xfc\x9e\x72\xbc\xd5\x20\x6f\xaf\x5f\xbc\x3f\xdb\ -\xfb\xf6\xe0\xe0\xe9\x61\x0b\x17\x1a\x8c\x8e\xde\x98\x97\xb1\xf5\ -\xbb\x09\x88\xd9\xc4\x28\x17\x18\x2b\x80\x35\xfa\xc4\x8f\x87\x3b\ -\x2a\xea\x72\xd6\x77\x1f\x05\xe6\x25\xab\x6e\xda\x49\xfc\x01\x49\ -\x7a\x38\xbb\x08\x2b\x63\x52\xec\xdd\x78\x7b\x6e\x00\xd1\x6d\xe0\ -\x90\xab\x8e\x10\xb9\x72\xd8\x04\xe1\x43\xa9\x84\x56\x2a\x2e\x20\ -\x68\xca\x19\x8d\x97\xa2\x0e\x49\xa0\xf5\xfa\x37\x03\x07\xc3\xa1\ -\x71\x35\xab\x4b\x32\x47\x93\xd2\x13\x14\xed\xfc\xe2\x4e\xc8\xe4\ -\xdb\x96\xc3\xad\xab\x8b\x54\x90\x52\xa0\xed\xc2\xb9\xb9\xd7\xcd\ -\x81\x9d\xad\x91\x16\xcd\xb9\x94\xae\x4a\x24\xad\xa4\xde\xd1\x93\ -\xb7\xe0\x6e\x1c\x7c\x9d\x89\x69\xab\xcd\x5d\xad\xb5\x1d\xce\xc7\ -\xb1\x9a\x76\xca\xea\xe4\xa5\x88\x67\x49\xa9\xdb\xc4\x4b\x51\xba\ -\x48\x90\xd0\x88\x42\xee\x12\x96\xfc\x9c\x58\x14\x37\x07\x8e\x6d\ -\x58\xb8\x73\x48\x58\x1f\x7c\xc0\x43\x07\x50\x1e\xe9\xc6\xe2\xbc\ -\x35\x17\x3c\xfa\xa3\x22\xe8\xd0\x2a\xa5\x6b\x2c\x87\x1f\x67\xc8\ -\x6e\xc1\xba\x2f\x3e\x1a\x84\xdc\xe4\xf3\x82\xc6\x76\xbe\x27\x86\ -\x7b\x18\x21\x14\x37\xf8\x4f\x55\xdc\x61\x1a\xb2\xfc\x07\x7c\xd3\ -\xda\x60\xc8\x79\xba\xda\xda\x56\x25\x7a\xe3\x08\xd4\x31\x91\x0d\ -\x70\x50\x43\x84\x22\xd3\x56\x9b\x65\xe4\x31\x62\x3c\x6a\xf3\x2a\ -\x32\x7a\xd8\x74\xc8\xd7\x5f\xbb\xa6\x22\x54\x60\xd2\x62\xa7\x0e\ -\x20\x50\xe4\x19\x78\xbd\xba\x88\x8d\x85\xc3\xf5\x0a\x48\x00\x3d\ -\x62\x9a\x7a\x33\x77\x62\x05\xe5\x50\x75\x03\x3c\x82\xd9\xf0\xe0\ -\xc6\x3b\x39\x16\xe8\x22\x26\x32\x0c\x24\x29\x26\x1b\x05\x8c\x4f\ -\xe9\x82\x2e\x4b\xd1\x32\x88\x22\x3e\x01\x42\x74\x94\xcb\x54\x45\ -\xcc\x09\x14\x37\x41\xbc\x4e\x2e\x96\x8d\x53\x10\x0a\x3f\xeb\x3b\ -\xaa\xc6\xfd\xe3\xa0\x13\x8d\x54\xe2\xd0\x6a\x15\x3b\xa8\x6e\x70\ -\x3d\xaf\x73\x74\x1d\x84\x5d\x6d\x4c\x34\x2b\x9f\x88\xbd\x18\xfd\ -\x83\x78\xab\x65\x88\x4c\x78\x3e\xff\x42\x2e\xdb\x7c\xf2\xbb\x78\ -\xac\x4e\xe5\x5b\xa2\x89\x12\xfc\x7a\x33\x71\xdd\x37\x24\x7d\x81\ -\x12\x04\xbe\x77\xb8\xa5\xa0\x55\x4d\x0e\x4d\x48\xac\x83\x21\x66\ -\x15\xe8\xeb\x82\xc2\x15\x85\x39\x68\x02\x9f\x6a\x56\xa2\xec\x77\ -\x93\x7a\x54\x16\xf8\xae\x05\x1e\x73\x40\x0e\x3b\x64\xb0\x26\x82\ -\x6d\x47\x44\xb6\x9b\x42\x8e\x07\x7f\x88\xc8\xf6\xa5\x22\x50\xe8\ -\x4d\x87\x3f\x62\x18\xb2\x25\x8f\x57\xde\xed\x3f\x7e\x2c\x57\x1e\ -\x93\x73\x31\xfe\x91\x5d\x84\x9d\x0e\xa1\x70\x31\xac\xcb\x80\x21\ -\x19\x41\xe3\x8c\xc8\x31\x26\x06\x6c\x07\x4a\x57\x03\x4b\x3d\xd8\ -\x31\x28\x22\x45\x60\xdf\x2f\xb2\xe4\xb4\x49\x0a\xcc\x0c\xeb\xfb\ -\xd6\x2d\x06\x8a\xd8\x31\x5e\xbb\x04\x8a\x2c\xeb\x59\xe5\x66\x8f\ -\x17\x75\x93\xdf\xc2\x3b\xfb\x03\x3d\xb6\x5e\x8a\xe0\x68\xa7\x50\ -\x43\xf6\xb7\x0a\xd6\xc6\x7d\x69\x51\xa4\x4b\x03\xea\x1d\xa5\x31\ -\x2f\x59\x7b\xcf\x53\x74\xde\x4b\x18\x7f\xd0\x20\xaf\x69\xd1\x94\ -\x12\xf8\x93\x9c\xb9\x59\xdd\x8c\xb1\x1c\x5e\x53\xaa\x8b\x52\xd4\ -\x71\x20\xc4\x1a\x98\x2a\xeb\xe5\x1f\x68\x5a\x23\x5b\x0e\xf8\x8d\ -\x87\xab\x11\xa5\x37\x97\xe7\x3a\x11\x78\x14\x82\x23\x09\xc3\xbc\ -\x13\x49\x13\x6d\xa1\x2d\x95\x82\x2c\xa4\x7d\xfb\xe6\x3d\xc0\xb7\ -\xf8\xfc\xeb\xbf\x5d\x12\xe7\xe0\x05\x60\xc5\x91\x7c\x67\x55\x77\ -\xd7\xcd\x3e\x1c\x50\xfa\x72\xc5\x5e\x59\x0f\x39\x47\x0c\xf8\x53\ -\xef\x3f\x1a\x5f\xc2\xc6\x4e\x0d\x59\xa3\xc6\xb4\x79\x3b\x5f\x28\ -\x5d\x73\x5e\x6b\x39\xde\x99\xda\x86\xb3\xc9\xc1\x3e\xcb\x39\xbd\ -\x80\xe2\x36\x51\xf2\x65\xb1\xfe\x5c\x7c\xbd\x0c\xbc\xef\x83\xea\ -\x93\xab\xaa\x59\xb2\xa0\xad\x66\x49\x2e\x9d\x8b\xfc\xee\x80\x05\ -\x5a\x25\x8b\xf1\xd6\x6b\x54\x03\x86\x8c\x77\xba\x81\xc9\x84\x88\ -\x2f\xad\x9b\x6e\xcf\xea\x9c\x99\x2a\x20\xa9\xc5\xfb\x90\x9b\x86\ -\xaa\xce\xdb\x3f\x66\x8f\x98\xb2\xfa\xe5\x5c\xb8\xc6\xd0\x95\xdb\ -\x73\x6f\x6f\x3b\xee\xe3\x7d\x5d\x10\x03\x9e\x55\xf6\x2b\x2e\x82\ -\xd6\xfc\xd6\xfb\xb9\x39\x4b\xf6\xf0\x40\xbd\x75\xf7\x59\xf6\xb5\ -\xc1\x76\xa2\xd3\x6f\xe4\x6d\xcc\x88\x3d\xa9\xd4\xde\xd0\xda\x41\ -\x00\x08\x8f\x08\x20\xf8\xd5\x28\xc2\x03\x33\xfb\x0e\x05\x99\xb9\ -\xfd\xa3\x75\xc3\x64\xfd\x91\x53\x79\xf1\x8e\xfd\x86\x59\x79\x47\ -\x35\x27\x52\xd1\x9a\x94\xa2\x3f\x16\xa8\x2f\xe9\x75\xe0\x6b\x57\ -\x81\x8d\x42\xc0\x0d\x1b\x61\xcf\x1d\x41\xe1\x7a\xc6\x20\x70\xf0\ -\x77\xe2\xef\xbe\x8d\xce\x93\x3c\xe4\xc2\x7e\xfa\x78\x4e\x5c\xf8\ -\x96\x1f\x7b\x83\xbe\x06\xec\x61\x03\x36\x73\x6a\xcd\x97\xf2\x12\ -\xdd\x83\x7f\xea\xc0\xe3\x1b\x47\x66\x58\xd6\x8c\xcc\xe2\x75\x9a\ -\x71\xcd\x39\xbe\x20\xff\x80\x39\xc5\xdd\x27\xa7\x9e\x89\x7a\x8b\ -\x1a\xfe\x50\x3d\xae\x1a\x90\xa4\x12\x23\xd0\xbc\x35\x6f\x2b\xb0\ -\xeb\x2d\x71\x5d\x5c\x7a\xba\xf8\x9a\xf7\x9f\x66\x64\xac\x1a\xe8\ -\x58\x34\xd4\x04\x67\xf5\x64\xc9\xaa\x46\xfc\xfa\x9c\xf4\x28\xa4\ -\xf0\xac\x79\x83\xd0\x14\x5b\x68\xa0\xde\x84\x01\x3d\x89\x38\x14\ -\x6c\x72\xf0\x8a\x4a\x16\xfc\x99\x48\xb3\x25\xc9\x8b\x2a\x99\xe3\ -\x54\x92\xd0\x05\x5d\xe2\xec\x1f\x9b\xa0\x8a\xd7\x63\x39\x05\xa0\ -\xe3\xaa\x56\xe0\x2d\x6c\x41\xd2\xbe\x5d\x40\x4b\x84\xc1\x64\xca\ -\xe2\xde\xba\xfb\x25\x3b\xa8\x6b\xe2\xc4\xb7\x5e\x6b\xb6\x1b\xac\ -\x1c\xcc\x0d\x04\x7a\xb6\x79\x0d\x46\x2b\xdc\xe5\x63\xd0\x2e\x0c\ -\x27\xc9\xb4\xe6\x74\x84\xaf\x49\x23\x05\x3f\x08\x4d\x99\xd3\xd6\ -\x93\x56\xc6\xc1\x4f\xa8\x7c\xda\x52\xef\xe1\xd6\xac\x81\x6c\x9b\ -\xa0\x05\xea\x14\x95\x4d\x39\xc3\x1b\x88\xec\x1b\xbc\x80\x00\x7b\ -\xce\xd6\x36\xb7\xfa\x45\x0f\x85\x5b\x7a\x91\x5b\x2b\x2a\x57\xf3\ -\x7a\x81\x9f\x7b\xd8\xd5\x36\x55\xfb\x73\xcf\x0e\x84\x9d\x3b\x2a\ -\x15\xfc\x83\xbd\x4c\xeb\x91\x1a\x59\x77\xd4\x89\x62\x93\xaf\x9b\ -\xd2\xd5\x4d\x5f\x70\xdf\x95\x02\x1e\xb6\x17\xa5\x2f\x1d\x6d\x4c\ -\x48\x0c\x02\xa7\x6c\x60\x03\x02\x10\xd9\x5c\xff\x9f\xa0\xda\x17\ -\xe9\xa3\xe6\xb5\x9c\x7f\xe2\xcf\xea\xfb\x37\xc6\x91\x87\xb6\xd8\ -\xf0\xb3\x5d\x73\xbc\x29\xf5\x3b\xef\xf9\x87\x5b\xdc\xad\xb3\xbf\ -\x00\xd6\xcc\x03\xb8\x77\x8e\x0e\x70\x71\x34\x80\xf5\xa3\xbd\x11\ -\x5a\xf7\x2b\x47\x7a\x8a\xbb\xfa\xbf\xbc\x50\x20\x6e\x5e\x65\x0d\ -\x63\x9b\x4b\x53\x2b\x6b\xda\x8d\x97\xb2\x0c\x60\x33\x35\x7b\xf0\ -\xaa\x47\x68\xb7\xac\xea\x25\x2b\xf2\xb1\x75\xb3\x01\x75\x11\xec\ -\x80\x38\x69\x8f\x6d\x2a\xdc\xcc\x79\xb5\x28\x62\x59\x3d\xf7\x9a\ -\x2a\x55\x6b\xeb\x97\x4c\x2c\x90\x7c\xa4\x2b\x0b\x10\xe2\xfe\xbe\ -\x37\xd0\xc1\xff\xc7\x22\xec\x3e\xcb\x63\xf6\x4b\xb9\xe3\x14\xc5\ -\xea\x3f\xff\xa1\xe3\x7d\x23\xf1\x7f\xa3\x49\xca\x25\xb0\x46\x7c\ -\x4f\xa2\xf4\x6e\x40\x1c\xf3\xf3\x6c\x51\x72\x70\x04\x2c\xfc\x0f\ -\xef\xa9\xe8\x1b\ \x00\x01\x6e\xac\ \x2f\ \x2a\x21\x20\x6a\x51\x75\x65\x72\x79\x20\x76\x31\x2e\x37\x2e\x31\ @@ -6709,14 +6709,14 @@ \x08\x94\x81\xf4\ \x00\x6a\ \x00\x61\x00\x76\x00\x61\x00\x73\x00\x63\x00\x72\x00\x69\x00\x70\x00\x74\ +\x00\x0e\ +\x0e\x3a\xd6\x33\ +\x00\x71\ +\x00\x77\x00\x65\x00\x62\x00\x63\x00\x68\x00\x61\x00\x6e\x00\x6e\x00\x65\x00\x6c\x00\x2e\x00\x6a\x00\x73\ \x00\x0c\ \x06\x7a\xfc\x33\ \x00\x6a\ \x00\x71\x00\x75\x00\x65\x00\x72\x00\x79\x00\x2d\x00\x75\x00\x69\x00\x2e\x00\x6a\x00\x73\ -\x00\x0e\ -\x0e\x3a\xd6\x33\ -\x00\x71\ -\x00\x77\x00\x65\x00\x62\x00\x63\x00\x68\x00\x61\x00\x6e\x00\x6e\x00\x65\x00\x6c\x00\x2e\x00\x6a\x00\x73\ \x00\x09\ \x0b\xc9\x66\x13\ \x00\x6a\ @@ -6726,9 +6726,9 @@ qt_resource_struct_v1 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x02\ -\x00\x00\x00\x1a\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ +\x00\x00\x00\x3c\x00\x01\x00\x00\x00\x01\x00\x00\x0e\xf9\ \x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x33\x31\ -\x00\x00\x00\x38\x00\x01\x00\x00\x00\x01\x00\x00\x24\x38\ +\x00\x00\x00\x1a\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ " qt_resource_struct_v2 = b"\ @@ -6736,16 +6736,16 @@ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x02\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x1a\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\x3c\x00\x01\x00\x00\x00\x01\x00\x00\x0e\xf9\ +\x00\x00\x01\x71\xda\xe0\x04\x1b\ \x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x33\x31\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\x38\x00\x01\x00\x00\x00\x01\x00\x00\x24\x38\ -\x00\x00\x01\x5d\xd1\x1e\xd5\x9a\ +\x00\x00\x01\x71\xda\xe0\x03\xeb\ +\x00\x00\x00\x1a\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ +\x00\x00\x01\x71\xda\xe0\x03\xd3\ " -qt_version = QtCore.qVersion().split('.') -if qt_version < ['5', '8', '0']: +qt_version = [int(v) for v in QtCore.qVersion().split('.')] +if qt_version < [5, 8, 0]: rcc_version = 1 qt_resource_struct = qt_resource_struct_v1 else:
--- a/eric6/eric6.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/eric6.py Sun May 31 17:26:14 2020 +0200 @@ -293,6 +293,14 @@ if "__PYVENV_LAUNCHER__" in os.environ: del os.environ["__PYVENV_LAUNCHER__"] + # make sure our executable directory (i.e. that of the used Python + # interpreter) is included in the executable search path + pathList = os.environ["PATH"].split(os.pathsep) + exeDir = os.path.dirname(sys.executable) + if exeDir not in pathList: + pathList.insert(0, exeDir) + os.environ["PATH"] = os.pathsep.join(pathList) + from Toolbox import Startup # set the library paths for plugins Startup.setLibraryPaths()
--- a/eric6/i18n/eric6_cs.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_cs.ts Sun May 31 17:26:14 2020 +0200 @@ -375,7 +375,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Přidat záložku</translation> </message> @@ -1831,32 +1831,32 @@ <translation>Přidat s&ložku</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>&Otevřít</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Otevřít v novém &tabu</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Editovat &název</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation>Editovat &adresu</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation>Editovat &adresu</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Smazat</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Nová složka</translation> </message> @@ -1866,25 +1866,40 @@ <translation>Stisknout pro smazání vybraných položek</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation type="unfinished">&Natavení...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2945,15 +2960,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3337,137 +3357,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation type="unfinished">Nevkládat soubory:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished">Zadejte patterny jmen souborů oddělené čárkami, které se nemají vkládat</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3475,52 +3495,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation type="unfinished">Soubor/Řádek</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation type="unfinished">Kód</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation type="unfinished">Zpráva</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation type="unfinished">Zobrazit</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation type="unfinished">Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> @@ -3530,290 +3550,310 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation type="unfinished">Žádné problémy nenalezeny.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished">Chyby</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished">Autor:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished">&Start</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished">Stisknout pro smazání vybraných položek</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished">Konfigurovat</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10599,12 +10639,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -11233,7 +11273,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -11323,187 +11363,187 @@ <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Přidat soubory...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Přidat zástupce souboru...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -11523,12 +11563,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -11598,7 +11638,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -11608,12 +11648,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -11653,32 +11693,32 @@ <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -11708,22 +11748,22 @@ <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11748,27 +11788,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11793,7 +11833,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p> {0}?} {6.?}</translation> </message> @@ -11818,22 +11858,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11863,12 +11903,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -17532,17 +17572,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -17560,12 +17600,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -17590,7 +17630,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -17600,47 +17640,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17673,20 +17713,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -40407,6 +40462,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -46327,27 +46390,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -46905,7 +46968,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -46934,32 +46997,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished">Vložit</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -46968,212 +47031,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished">Spustit skript</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Python soubory (*.py);;Všechny soubory (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47188,50 +47251,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished">Konfigurovat</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -49063,50 +49146,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished">Akce&ptovat natrvalo</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished">Akcep&tovat dočasně</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished">&Odmítnout</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"><b>Zadejte uživatelské jméno a heslo pro {0}', realm '{1}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b>Zadejte uživatelské jméno a heslo pro '{0}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -52574,17 +52657,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -61708,17 +61791,17 @@ <translation><b>Konfigurovat Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Qt nástroje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Příklad kompletního jména nástroje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation></translation> </message> @@ -61728,7 +61811,7 @@ <translation><font color="#FF0000"><b>Poznámka:</b> Tato nastavení budou aktivována až po novém spuštění aplikace.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Spustitelný nástroj je složen z prefixu, jména nástroje a postfixu. Pro win je extenze připojena automaticky.</translation> </message> @@ -61743,62 +61826,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -61808,7 +61881,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -61818,35 +61891,40 @@ <translation type="unfinished">Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -63673,6 +63751,21 @@ <source><b>Configure security settings</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -65628,52 +65721,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished">Kopírovat cestu obrázku do schránky</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation type="unfinished">Uložit obrázek</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation type="unfinished">Všechny soubory (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -65688,25 +65781,30 @@ <translation type="obsolete">Cesta:</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished">Načítám...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -65716,60 +65814,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -77949,7 +78052,7 @@ <translation><b>Klávesové zkratky</b><p>Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Exportovat klávesové zkratky</translation> </message> @@ -77969,7 +78072,7 @@ <translation><b>Export klávesových zkratek</b><p>Exportují se klávesové zkratky z aplikace.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Import klávesových zkratek</translation> </message> @@ -78094,7 +78197,7 @@ <translation>Nastavení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Nápověda</translation> </message> @@ -78109,7 +78212,7 @@ <translation type="obsolete"><h3>Čísla verzí</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -78139,62 +78242,62 @@ <translation type="obsolete">V aktuálním projektu není definován hlavní skript. Zrušeno</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problém</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Aktuálně není vybrán žádný prohlížeč. Prosím otevřete Nastavení a nějaký vyberte.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Nemohu spustit prohlížeč nápovědy.<br>Ověřte jestli je dostupný jako <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Dokumentace chybí</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>Počátek dokumentace PySide nebyl nastaven.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Uložit úlohy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Načíst úlohy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Chyba během zjišťování aktualizací</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Byla nalezena aktualizace</translation> </message> @@ -78209,17 +78312,17 @@ <translation>Zobrazit externí nás&troje</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Kontrolu updatů nelze provést.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Zrušit</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Spuštěno poprvé</translation> </message> @@ -78314,7 +78417,7 @@ <translation>Zobrazit dostupné verze ke stažení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Dostupné verze</h3><table></translation> </message> @@ -78394,7 +78497,7 @@ <translation>Obnovit manažer nástrojových lišt...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Externí nástroje</translation> </message> @@ -78409,12 +78512,12 @@ <translation>Prohlížeč &multiprojektu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Načíst relaci</translation> </message> @@ -78646,7 +78749,7 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt 3 support</source> - <translation>Qt 3 podpora</translation> + <translation type="obsolete">Qt 3 podpora</translation> </message> <message> <location filename="../UI/UserInterface.py" line="2870"/> @@ -78684,106 +78787,106 @@ <translation>Externí nástroje/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Soubor <b>{0}</b> neexistuje nebo má nulovou délku.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Qt-Designer.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Qt-Linguist.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Qt-Assistant.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit aktuální prohlížeč.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit UI Previewer.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Previewer překladů.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nelze spustit SQL Browser.<br>Ujistěte se, že je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>V externím nástroji '{0}' ve skupině '{1}' nebyl záznam nástroje nalezen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation>Skupina nástrojů '{0}' nenalezena. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>Spouštím proces '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Nemohu spustit příkaz <b>{0}</b><br>Ověřte jestli je dostupný jako <b>{1}</b>. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>Proces '{0}' byl ukončen. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Adresář dokumentace "<b>{0}</b>" nebyl nalezen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru s úlohami <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s úlohami <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Zápis do souboru relace session <b>{0}</b> se nezdařil.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor relace session <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation>Zkouším host {0}</translation> </message> @@ -78818,7 +78921,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -78858,27 +78961,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -78964,12 +79067,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -79334,7 +79437,7 @@ <translation type="unfinished">Otevřít PyQt4 dokumentaci {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>Adresář PyQt4 dokumentace není nakonfigurován.</p> {5 ?}</translation> </message> @@ -79344,7 +79447,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -79364,7 +79467,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -79436,25 +79539,25 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt v.3 is not supported by eric6.</source> - <translation type="unfinished">Qt v.3 není podporováno v eric5. {3 ?} {6.?}</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <translation type="obsolete">Qt v.3 není podporováno v eric5. {3 ?} {6.?}</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished">Aktualizace <b>{0}</b> eric5 je připravena na <b>{1}</b>. Chcete ji stáhnout a nainstalovat? {0}?} {6 ?} {1}?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric5 je aktuální {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation type="unfinished">Používáte poslední verzi eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric5 nebyl ještě nakonfigurován. Bude spuštěn konfigurační dialog. {6 ?}</translation> </message> @@ -79474,7 +79577,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79519,7 +79622,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished">Načíst relaci</translation> </message> @@ -79534,17 +79637,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -79559,17 +79662,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -79624,7 +79727,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -79700,17 +79803,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -79809,6 +79912,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>Čísla verzí</h3><table> {2>?} {2>?}</translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -85640,37 +85758,37 @@ <translation type="obsolete">Vybrat barvu pozadí pro bezpečné URL.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished">Obrázky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished">Vybrat pro nahrání obrázků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished">Nahrát obrázky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished">Uživatelský list stylů:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished">Zadejte jméno souboru uživatelských stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished">Taby</translation> </message> @@ -85680,12 +85798,12 @@ <translation type="obsolete">Zobrazit pouze jedno tlačítko Zavřít místo jednoho v každém tabu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> @@ -85705,37 +85823,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"><font color="#FF0000"><b>Poznámka:</b> Tato nastavení budou aktivována až po novém spuštění aplikace.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished">Lišty nástrojů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -85745,13 +85863,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -87023,27 +87176,27 @@ <translation type="unfinished">...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished">Načítám...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished">Načteno</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished">Načtení selhalo</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -87053,22 +87206,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished">&Konec</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -89962,12 +90115,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation type="unfinished">Generování hlavního okna...</translation> </message>
--- a/eric6/i18n/eric6_de.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_de.ts Sun May 31 17:26:14 2020 +0200 @@ -352,7 +352,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> @@ -1817,32 +1817,32 @@ <translation>&Ordner hinzufügen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>Ö&ffnen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>In neuem &Register öffnen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>&Namen editieren</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation>&Adresse editieren</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation>&Adresse editieren</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Löschen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Neuer Ordner</translation> </message> @@ -1852,25 +1852,40 @@ <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>&Eigenschaften …</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation>In neuem &Fenster öffnen</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation>In neuem &Fenster öffnen</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation>In neuem &privaten Fenster öffnen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation>In neuem &Hintergrundregister öffnen</translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation>&Neuer Ordner...</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation>Neuer Lesezeichenordner</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation>Gib den Titel des neuen Lesezeichenordners ein:</translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2912,15 +2927,20 @@ <translation>CircuitPython Firmwaredateien (*.uf2);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation>Wähle den Pfad zum Gerät</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation><p>Der Datenträger des Gerätes <b>{0}</b> konnte nicht gefunden werden. Ist das Gerät im'Bootloader' Modus und eingehängt?</p><p>Wähle alternativ den Eintrag "Manuelle Auswahl" und gib unten den Pfad zum Gerät ein.</p></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation>Manuelle Auswahl</translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3287,137 +3307,137 @@ Zeile und Position.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation>Ignoriere Dateien:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation>Drücken, um die Quelltextstil-Prüfung zu starten</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation>Drücken, um die ausgewählten Probleme zu beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation>Drücken, um Standarwerte zu laden</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation>Drücken, um die aktuellen Werte als Standard zu speichern</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation>Drücken, um die Standardeinstellungen zurückzusetzen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation>Ignorierte Nachrichten:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Gib die Nachrichtenschlüssel oder -kategorien für auszuschließende Nachrichten durch Kommata getrennt ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation>Drücken, um die Nachrichtenschlüssel aus einer Liste zu wählen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation>Ausgewählte Nachrichten:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Gib die Nachrichtenschlüssel oder -kategorien für ausgewählte Nachrichten durch Kommata getrennt ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation>Zu behebende Probleme:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Geben Sie die Nachrichtenschlüssel für automatisch zu behebende Probleme ein (leer lassen, um alle zu beheben)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation>Nicht zu behebende Probleme:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation>Geben Sie die Nachrichtenschlüssel für nicht automatisch zu behebende Probleme ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation>Max. Zeilenlänge:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>Gib die maximal zulässige Zeilenlänge ein (PEP-8: 79 Zeichen)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation>Docstring Typ:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation>Wähle den Regelsatz für Docstrings</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation>Auswählen, um hängende schließende Klammern zuzulassen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation>Hängende schließende Klammern zulassen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation>Auswählen, um Wiederholungen eines Nachrichtentyps zuzulassen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation>Nachrichten wiederholen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation>Auswählen, um ausgewählte Probleme zu beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation>Probleme automatisch beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3428,52 +3448,52 @@ Zeile und Position.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation>Datei/Zeile</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation>Code</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation>Nachricht</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation>PEP-257</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation>PEP-257</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation>Statistik...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation>Drücken, um eine Statistik für den letzten Lauf zu zeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation>Zeige</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -3483,290 +3503,310 @@ <translation>Lösung: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation>Zeigt den Fortschritt der Quelltextstil-Prüfung an</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation>%v/%m Dateien</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation>Auswählen, um ignorierte Probleme anzuzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation>Ignorierte anzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation>{0} (ignoriert)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation>Bereite Dateien vor...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation>Gib die maximal erlaubte Codekomplexität ein (McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation>Übertrage Daten...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation>Globale Optionen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation>Spezifische Optionen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation>Quelltextstil</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation>Dokumentationsstil</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation>Kodierungszeile</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation>Zulässige Kodierungen:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation>Gib die zulässigen Kodierungen durch Komma getrennt ein (leer lassen, um Standardwerte zu verwenden)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation>Min. Dateigröße:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation>Gib die Mindestdateigröße ein, ab der eine Datei geprüft wird (0 für alle Dateien)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation>Autor:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation>Gib einen Copyright Autornamen ein, der überprüft werden soll (leer lassen, um diese Prüfung zu überspringen)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation>Future Imports</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation>Erwartete Imports:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation>Code-Komplexität</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation>&Starten</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation>Ausgewählte &beheben</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation>Standards &laden</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation>Standards s&peichern</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation>Standards lösc&hen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation>Keine Dateien gefunden (überprüfe die Ignorierliste).</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation>Built-in Zuweisung ignorieren</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation>Drücken, um eine zu ignorierende Built-in Zuweisung hinzuzufügen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation>Max. McCabe Komplexität:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation>Max. Komplexität pro Zeile:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation>Gib die maximal zulässige Komplexitäte einer Zeile an (Anzahl Instruktionen)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation>Max. mittlere Komplexität:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation>Gib den maximal zulässigen Wert für die mittlere Zeilenkomplexität ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation>Leerzeilen vor</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation>Klassen und Funktionen der obersten Ebene:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation>Gib die Anzahl Leerzeilen vor Klassen und Funktionen der obersten Ebene ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation>Methoden und geschachtelte Klassen und Funktionen:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation>Gib die Anzahl Leerzeilen vor Methoden und geschachtelten Klassen und Funktionen ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation>Max. Dokumentationszeilenlänge:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation>Auskommentierter Code</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation>Auswählen, um agressiver nach auskommentiertem Code zu suchen. Dies erhöhte die Rate fehlerhafter Erkennungen.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation>Agressive Suche</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation>Typannotationen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation>Mindestabdeckung:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation>Gib den Mindestprozentsatz für Typannotationen ein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation>aus</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation>Max. Komplexität:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation>Gib die maximale Komplexität von Typannotationen ein</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation>Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation>Ausführung</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation>Drücken, um die Quelltextstil-Prüfung erneut zu starten</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation>Neu starten</translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10368,12 +10408,12 @@ <translation>&Alle entfernen</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation>Eintrag hinzufügen</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation>Gib den hinzuzufügenden Eintrag ein:</translation> </message> @@ -10862,7 +10902,7 @@ <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -10927,57 +10967,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -11027,32 +11067,32 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> @@ -11092,7 +11132,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -11102,12 +11142,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -11137,17 +11177,17 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> @@ -11157,22 +11197,22 @@ <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -11212,82 +11252,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Ressourcen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Dateien hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Aliased-Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -11337,12 +11377,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -11417,7 +11457,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -11427,12 +11467,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -11477,22 +11517,22 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> @@ -11517,27 +11557,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -11562,7 +11602,7 @@ <translation>Öffnen mit Kodierung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation> </message> @@ -11587,22 +11627,22 @@ <translation>Der Provider für automatische Vervollständigungen namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation>Calltipps-Provider</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Calltipps-Provider namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation>Maus Klick Handler registrieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Ein Maus Klick Handler für "{0}" wurde bereits durch "{1}" registriert. Die Anfrage durch "{2}" wird abgebrochen...</translation> </message> @@ -11632,12 +11672,12 @@ <translation>Auswahl in Konsole ausführen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation>EditorConfig Eigenschaften</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Die EditorConfig Eigenschaften für die Datei <b>{0}</b> konnten nicht geladen werden.</p></translation> </message> @@ -16999,17 +17039,17 @@ <translation>Gib den Pfad der Firmwaredatei ein</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation>Firmwaredateien (*.img);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation>Firmware sichern</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation>Firmware zurückspielen</translation> </message> @@ -17027,12 +17067,12 @@ <translation>Flash löschen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation>MicroPython Firmware flashen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation>Zusätzliche Firmware flashen</translation> </message> @@ -17057,7 +17097,7 @@ <translation>Chiptyp '{0}' wird nicht unterstützt.</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation>Ausgabe von 'esptool write_flash'</translation> </message> @@ -17067,47 +17107,47 @@ <translation>Gerät zurücksetzen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation>Firmware sichern</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation>Firmware zurückspielen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation>Chip ID anzeigen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation>Flash ID anzeigen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation>MAC Adresse anzeigen</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation>Ausgabe von 'esptool read_flash'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation>Ausgabe von 'esptool chip_id'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation>Ausgabe von 'esptool flash_id'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation>Ausgabe von 'esptool read_mac'</translation> </message> @@ -17140,20 +17180,35 @@ <translation>Gib den Pfad der Firmwaredatei ein</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation>Adresse:</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation>Gib die Flash Speicheradresse in Hexadezimalform ein</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation>Firmwaredateien (*.bin);;Alle Dateien (*)</translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation>Flash Modus:</translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation>Wähle den Flashmodus aus</translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation>Leer lassen, um den Standardmodus zu verwenden.</translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -37558,6 +37613,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation>Ignorierte Serielle Geräte</translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -43350,27 +43413,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation>Nicht unterstütztes Gerät</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <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="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <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="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <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="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation>Der Dateimanager wird von diesem Gerät nicht unterstützt.</translation> </message> @@ -43928,7 +43991,7 @@ <translation>Drücken, um ein Chartfenster zur Darstellung der vom ausgewählten Gerät empfangenen Daten zu öffnen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation>Drücken, um eine Verbindung mit den ausgewählten Gerät herzustellen</translation> </message> @@ -43956,32 +44019,32 @@ <translation>Keine unterstützten Geräte gefunden.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation>Einfügen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation>Drücken, um die Verbindung zum aktuelle Geräte zu trennen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation>Kein Gerät angeschlossen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -43994,212 +44057,212 @@ Drücke zum Abschluss den Resetknopf des Gerätes und warte ein paar Sekunden vor einem neuen Versuch.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation>REPL starten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Die Eingabeaufforderung kann nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation>Serielle Verbindung</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation><p>Kann keine Verbindung zum Gerät an der seriellen Schnittstelle <b>{0}</b> herstellen.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation>Skript ausführen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation>Es ist kein Editor offen. Abbruch...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation>Der aktuelle Editortext enthält kein Skript. Abbruch...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation><p>Das Skript kann nicht ausgeführt werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation>Pythondatei öffnen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation>Python3 Dateien (*.py);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation>Chart starten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Das Chart kann nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation>Nich gesicherte Chart Daten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation>Das Chart enthält ungesicherte Daten.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation>Dateimanager starten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Der Dateimanager kann nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation>Version anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation>Implementierung anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation>Zeit synchronisieren</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation>Gerätezeit anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation>Lokale Zeit anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation>Python Datei übersetzen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation>Aktuellen Editor übersetzen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation><h3>Versionsinformationen des Gerätes</h3></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation>Keine Versionsinformationen verfügbar.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation>Versionsinformationen des Gerätes</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation>Informationen zur Implementierung</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation><h3>Informationen zur Implementierung</h3><p>Dieses Gerät enthält <b>{0} {1}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation><p>Die Zeit des angeschlossenen Gerätes wurde mit der lokalen Zeit synchronisiert.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Datum und Zeit des Gerätes</h3><table><tr><td><b>Datum</b></td><td>{0}</td></tr><tr><td><b>Zeit</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation><h3>Datum und Zeit des Gerätes</h3><p>{0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation>Datum und Zeit des Gerätes</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation>Lokales Datum und Zeit</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Lokales Datum und Zeit</h3><table><tr><td><b>Datum</b></td><td>{0}</td></tr><tr><td><b>Zeit</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation>Fehler bei Gerätekommunikation</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation><p>Es trat ein Fehler bei der Kommunikation mit dem Gerät auf.</p><p>Methode: {0}</p><p>Nachricht: {1}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation>Der MicroPython Crosscompiler <b>mpy-cross</b> kann nicht gefunden werden. Stelle sicher, dass er im Suchpfad liegt oder konfiguriere ihn auf der MicroPython Konfigurationsseite.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Python-Dateien (*.py);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation>Die Python Datei <b>{0}</b> existiert nicht. Abbruch...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation>'mpy-cross' Ausgabe</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation>Der aktuelle Editortext enthält keine Pythondatei. Abbruch...</translation> </message> @@ -44214,50 +44277,70 @@ <translation>Drücken, um einen Dateimanager zum ausgewählten Gerät zu öffnen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation>µPy Chart</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation>µPy Dateien</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation>Dokumentation anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation>Zeit anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation>Firmware herunterladen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation>Datum und Zeit</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation><table><tr><th></th><th>Lokales Datum und Zeit</th><th>Datum und Zeit des Gerätes</th></tr><tr><td><b>Datum</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Zeit</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation><table><tr><th>Lokales Datum und Zeit</th><th>Datum und Zeit des Gerätes</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation>Unbekanntes MicroPython Gerät</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation><p>Diese ubekannten seriellen Geräte wurden erkannt.</p><ul><li>{0}</li></ul><p>Falls es sich um ein MicroPython Board handelt, melden sie es bitte zusammen mit dem Boardnamen und einer Kurzbeschreibung an <a href="mailto:eric-bugs@eric-ide.python-projects.org"> die eric Fehlermitteilungsemailadresse</a>.</p></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation>{0} ({1:04x}/{2:04x})</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation>Ignorierte Serielle Geräte</translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -46084,50 +46167,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation>SSL Zertifikatsfehler</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation><b>{0}</b><p>Die Seite, auf die zugegriffen werden soll, besitzt Fehler in ihrem SSL Zertifikat.</p><ul><li>{1}</li></ul><p>Soll eine Ausnahme erstellt werden?</p></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation>&Immer akzeptieren</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation>&Vorläufig akzeptieren</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation>&Ablehnen</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Gib Nutzernamen und Kennwort für „{0}“ und Realm „{1}“ ein</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Gib Nutzernamen und Kennwort für „{0}“ ein</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation>Authentisierung erforderlich</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation>Eine Authentisierung ist zum Zugriff auf diese URL erforderlich:</translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation><b>{0}</b><p>Der Server <b>{1}</b>, auf den zugegriffen werden soll, besitzt Fehler im SSL Zertifikat.</p><ul><li>{1}</li></ul><p>Soll eine Ausnahme erstellt werden?</p></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -49510,17 +49593,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> @@ -58631,17 +58714,17 @@ <translation><b>Qt-Einstellungen</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Qt-Werkzeuge</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Dies gibt ein Beispiel für den vollständigen Werkzeugnamen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>designer</translation> </message> @@ -58651,7 +58734,7 @@ <translation><font color="#FF0000"><b>Hinweis:</b> Diese Einstellung wird erst beim nächsten Programmstart aktiv.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Der Werkzeugname wird aus dem Präfix, dem Werkzeugnamen und dem Anhängsel gebildet. Bei Windows wird die Erweiterung automatisch angehängt.</translation> </message> @@ -58666,67 +58749,52 @@ <translation>Gib den Pfad des Qt-Übersetzungenverzeichnisses ein.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation><b>Hinweis:</b> Lassen Sie diesen Eintrag leer, um eine Umgebungsvariable oder den in die Qt Bibliothek eincompilierten Pfad zu verwenden. Unterstützte Umgebungsvariablen sind -<ul> -<li>QT4TRANSLATIONSDIR für Qt4</li> -<li>QT5TRANSLATIONSDIR für Qt5</li> -<li>QTTRANSLATIONSDIR für eine beliebige Qt Variante</li> -</ul></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation>Qt-Präfix:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation>Gib das Präfix für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation>Qt-Anhängsel:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation>Gib das Anhängsel für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation>Einrückungstiefe:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation>Wähle die Einrücktiefe (Standard: 4)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation>Erzeuge Imports relativ zu '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation>Verzeichnis:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Gib den Pfad des Verzeichnisses mit den Qt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation>Gib den Pfad des Verzeichnisses mit den PyQt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> @@ -58736,7 +58804,7 @@ <translation>Beispiel: {0}designer{1}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation>Gib den Pfad des Verzeichnisses mit den PySide2-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> @@ -58746,35 +58814,40 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation>PyQt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation>pyuic Optionen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation>Auswählen, um zusätzlichen Code zum Testen und Anzeigen des Formulars zu erzeugen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation>Zusätzlichen Testcode erzeugen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation>PySide2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation>pyside2-uic Optionen</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation><b>Hinweis:</b> Lassen Sie diesen Eintrag leer, um den in die Qt Bibliothek eincompilierten Pfad zu verwenden.</translation> + </message> </context> <context> <name>Queues</name> @@ -60636,6 +60709,21 @@ <source><b>Configure security settings</b></source> <translation><b>Sicherheitseinstellungen</b></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation>Zertifikatsfehler</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation>Auswählen, um alle Webseiten mit Zertifikatsfehlern abzulehnen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation>URLs mit Zertifikatsfehlern immer ablehnen</translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -62599,75 +62687,80 @@ <translation><b>Sicherheitsinformationen</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation>Bilder</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation>Bild</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation>Bildadresse</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation><b>Vorschau</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation>Vorschau nicht verfügbar.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation>Bildadresse in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation>Bildbezeichnung in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation>Bild speichern</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation><p>In die Datei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation>Lade...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation><p>Diese Vorschau ist nicht verfügbar.</p></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation><b>Verbindung ist verschlüsselt.</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation><b>Verbindung ist nicht verschlüsselt.</b></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation><b>Verbindung ist verschlüsselt aber möglicherweise unsicher.</b></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -62677,60 +62770,65 @@ <translation><b>Web-Site {0}</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation>Ihre Verbindung zu dieser Web-Site ist <b>sicher</b>.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation>Ihre Verbindung zu dieser Web-Site ist <b>nicht sicher</b>.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation>Dies ist ihr <b>{0}.</b> Besuch dieser Web-Site.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation>Sie haben diese Web-Site <b>niemals</b> zuvor besucht.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation>erster</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation>zweiter</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation>dritter</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation>Dies ist ihr <b>{0}</b> Besuch dieser Web-Site.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation>Als <b>{0}</b> Links-Handler registrieren.</translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation>Als <b>{0}</b> Links-Handler registrieren.</translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation>Registrieren</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation>Mehr...</translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation>Ihre Verbindung zu dieser Web-Site ist <b>möglicherweise nicht sicher</b>.</translation> + </message> </context> <context> <name>SnapWidget</name> @@ -74499,7 +74597,7 @@ <translation>Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Hilfe</translation> </message> @@ -74509,7 +74607,7 @@ <translation>&Werkzeugleisten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problem</translation> </message> @@ -74529,7 +74627,7 @@ <translation>&Was ist das?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -74619,7 +74717,7 @@ <translation><b>Fehler berichten...</b><p>Öffnet einen Dialog zum Senden eines Fehlerberichtes.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle exportieren</translation> </message> @@ -74639,7 +74737,7 @@ <translation><b>Tastaturkurzbefehle exportieren</b><p>Exportiert die Tastaturkurzbefehle der Applikation.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle importieren</translation> </message> @@ -74794,7 +74892,7 @@ <translation><b>Dateien Seite an Seite vergleichen</b><p>Öffnet einen Dialog zum Vergleich zweier Dateien und zur Anzeige des Ergebnisse Seite an Seite.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Drop-Fehler</translation> </message> @@ -74864,32 +74962,32 @@ <translation><b>Ansichtenprofile</b><p>Ansichtenprofile konfigurieren. Mit diesem Dialog kann die Sichtbarkeit der verschiedenen Fenster für die vorbestimmten Ansichtenprofile eingestellt werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Die Datei <b>{0}</b> existiert nicht oder hat die Größe Null.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Qt-Designer konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Qt-Linguist konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Qt-Assistant konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Der Werkzeugeeintrag <b>{0}</b> konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{1}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -74914,7 +75012,7 @@ <translation><b>UI-Vorschau</b><p>Starte die UI-Vorschau.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Die UI-Vorschau konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -74939,7 +75037,7 @@ <translation><b>Übersetzungsvorschau</b><p>Dies startet das Programm zur Vorschau von Übersetzungen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Die Übersetzungsvorschau konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -74979,42 +75077,42 @@ <translation>Aufgabenanzeige</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Aufgaben speichern</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Aufgaben lesen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Momentan ist kein Betrachter angegeben. Bitte benutzen Sie den Einstellungsdialog, um einen festzulegen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Der Betrachter konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Dokumentation fehlt</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Der Dokumentationsstartpunkt „<b>{0}</b>“ konnte nicht gefunden werden.</p></translation> </message> @@ -75114,7 +75212,7 @@ <translation>Öffne die Eric-API-Dokumentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Die Hilfeanzeige konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>hh</b> verfügbar ist.</p></translation> </message> @@ -75195,41 +75293,41 @@ <translation>&Eingebaute Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>Starte Prozess „{0} {1}“. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>Prozess „{0}“ ist beendet. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Dokumentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>Der PyQt4-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Fehler während der Aktualisierungsprüfung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Aktualisierung verfügbar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -75254,22 +75352,22 @@ <translation>Zeige externe &Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Konnte keine Aktualisierungsprüfung durchführen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Abbrechen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation>Prüfe Host {0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Erstmalige Nutzung</translation> </message> @@ -75364,7 +75462,7 @@ <translation>Zeige die verfügbaren eric-Versionen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Verfügbare Versionen</h3><table></translation> </message> @@ -75449,17 +75547,17 @@ <translation>Externe Werkzeuge/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Externe Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Kein Eintrag für das externe Werkzeug „{0}“ in der Gruppe „{1}“ gefunden.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation>Kein Werkzeuggruppeneintrag „{0}“ gefunden.</translation> </message> @@ -75474,22 +75572,22 @@ <translation>&Mehrfachprojektanzeige</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Sitzung speichern</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Die Sitzungsdatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Sitzung lesen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Die Sitzungsdatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> @@ -75709,7 +75807,7 @@ <translation><b>SQL-Browser</b><p>Erforsche eine SQL-Datenbank.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Der SQL-Browser konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -75724,11 +75822,6 @@ <translation>&Icon-Editor...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt 3 support</source> - <translation>Qt3-Unterstützung</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2870"/> <source>PySide Documentation</source> <translation>PySide-Dokumentation</translation> @@ -75774,7 +75867,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Tastaturkurzbefehlsdatei (*.e4k)</translation> </message> @@ -75814,27 +75907,27 @@ <translation><b>Python 2-Dokumentation</b><p>Zeigt die Python 2-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 2-Dokumentation gesucht wird, unter Windows das Verzeichnis <i>doc</i> unter dem Verzeichnis, in dem der konfigurierte Python 2-Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html/python-docs-html</i>. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON2DOCDIR setzen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation>Fehler beim Herunterladen der Versionsinformationen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>Die Versionsinformationen konnten nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation>Browser starten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation>Der Systemwebbrowser konnte nicht gestartet werden</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>Die Versionsinformationen konnten seit 7 Tagen nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -75920,12 +76013,12 @@ <translation><b>Bildschirmfoto</b><p>Dies öffnet einen Dialog, um ein Bildschirmfoto aufzunehmen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Die Bildschirmfotoanwendung konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation>Wähle Arbeitsverzeichnis</translation> </message> @@ -76290,7 +76383,7 @@ <translation>Öffne die PyQt5-Dokumentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><p>Der PyQt5-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> @@ -76300,7 +76393,7 @@ <translation><b>Python 3-Dokumentation</b><p>Zeigt die Python 3-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 3-Dokumentation gesucht wird, unter Windows das Verzeichnis <i>doc</i> unter dem Verzeichnis, in dem der Python 3-Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html</i>. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON3DOCDIR setzen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -76320,7 +76413,7 @@ <translation><b>Zeige Fehlerbericht...</b><p>Dies öffnet einen Dialog zur Anzeige des aktuellsten Fehlerberichtes.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation>Versionsprüfung</translation> </message> @@ -76391,27 +76484,22 @@ <translation><b>Eric-API-Dokumentation</b><p>Zeige die Eric-API-Dokumentation an. Der Pfad für die Dokumentation ist das Unterverzeichnis Documentation/Source im eric6-Installationverzeichnis.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt v.3 is not supported by eric6.</source> - <translation>Qt v.3 wird von eric6 nicht unterstützt.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Eine Aktualisierung auf <b>{0}</b> von Eric6 ist unter <b>{1}</b> verfügbar. Wollen Sie sie laden?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation>Eric6 ist aktuell</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation>Sie verwenden die aktuellste Version von eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>eric6 wurde noch nicht konfiguriert. Der Konfigurationsdialog wird nun gestartet.</translation> </message> @@ -76431,7 +76519,7 @@ <translation>Keine Benutzerwerkzeuge konfiguriert</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>Die Versionsinformationen konnten nicht heruntergeladen werden, da sie <b>nicht verbunden</b> sind. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -76476,7 +76564,7 @@ <translation><b>Sitzung speichern...</b><p>Dies speichert die aktuelle Sitzung in eine Datei. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation>Sitzung laden</translation> </message> @@ -76491,17 +76579,17 @@ <translation><b>Sitzung laden...</b><p>Dies lädt eine zuvor gesicherte Sitzung. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation>eric6 Sitzungsdateien (*.e5s)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation>Absturzsitzung gefunden!</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation>Eine Sitzungsdatei einer abgestürzten Sitzung wurde gefunden. Soll diese Sitzung wiederhergestellt werden?</translation> </message> @@ -76516,17 +76604,17 @@ <translation>Initialisiere Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation>Aktualisierungsprüfung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Eric wurde direkt von vom Quelltext installiert. Eine Aktualitätsprüfung ist daher nicht möglich.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Sie verwenden ein Snapshot-Release von eri6. Eine neueres, stabiles Release könnte verfügbar sein.</translation> </message> @@ -76581,7 +76669,7 @@ <translation><b>PySide2-Dokumentation</b><p>Zeige die PySide2-Dokumentation an. Abhängig von den Einstellungen wird Erics interner Hilfeanzeiger/Webbrowser, ein externer Webbrowser oder Qt Assistant verwendet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><p>Der PySide{0}-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> @@ -76657,17 +76745,17 @@ <translation><b>Neustart der Entwicklungsumgebung</b><p>Dies startet die Entwicklungsumgebung neu. Ungesicherte Änderungen können zuvor gesichert werden. Ein Python-Programm, das gerade debuggt wird, wird beendet und sämtliche Einstellungen werden gespeichert.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation>Webbrowser starten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation>Der eric6 Webbrowser konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>Der eric6 Webbrowser ist nicht gestartet.</p><p>Ursache: {0}</p></translation> </message> @@ -76766,6 +76854,21 @@ <source><h2>Version Numbers</h2><table></source> <translation><h2>Versionsnummern</h2><table></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>Das Qt-Designer Programm konnte nicht gefunden werden.<br>Stelle sicher, dass es installiert und optional auf der Qt Konfigurationsseite konfiguriert ist.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>Das Qt-Linguist Programm konnte nicht gefunden werden.<br>Stelle sicher, dass es installiert und optional auf der Qt Konfigurationsseite konfiguriert ist.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>Das Qt-Assistant Programm konnte nicht gefunden werden.<br>Stelle sicher, dass es installiert und optional auf der Qt Konfigurationsseite konfiguriert ist.</p></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -82501,47 +82604,47 @@ <translation>Minimale logische Schriftgröße:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation>Grafiken</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation>Auswählen, um Grafiken zu laden</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation>Grafiken laden</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation>Stylesheet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation>Benutzer-Stylesheet:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation>Gib den Namen einer Benutzer-Stylesheet-Datei ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation>Tabs</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation>Auswählen, um eine Warnung auszugeben, wenn mehrere Tabs geschlossen werden</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation>Warnen, wenn mehrere Tabs geschlossen werden</translation> </message> @@ -82561,37 +82664,37 @@ <translation>Wähle die Schriftart Pictograph aus</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Hinweis:</b> Alle folgenden Einstellungen werden erst beim nächsten Programmstart aktiv.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation>Werkzeugleisten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation>Auswählen, um die Anzeige von Werkzeugleisten zu erlauben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation>Zeige Werkzeugleisten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation>Scrollbalken</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation>Auswählen, um Scrollbalken anzuzeigen. Hinweis: Scrollen ist auch ohne sie möglich.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation>Scrollbalken anzeigen</translation> </message> @@ -82601,15 +82704,50 @@ <translation>Farben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation>Hintergrundfarbe für sichere URLs:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> <source>Select the background color for secure URLs.</source> <translation>Wähle die Hintergrundfarbe für sichere URLs.</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> + <source>URL Entry Background</source> + <translation>Hintergrund der URL Eingabe</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation>Sichere URLs:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation>Unsichere URLs:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation>Wähle die Hintergrundfarbe für unsichere URLs.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation>Bösartige URLs:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation>Wähle die Hintergrundfarbe für bösartige URLs.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation>Privatmodus:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> + <translation>Wähle die Hintergrundfarbe für URLs im Privatmodus.</translation> + </message> </context> <context> <name>WebBrowserClearPrivateDataDialog</name> @@ -83893,27 +84031,27 @@ <translation>...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation>Lade...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation>Seite geladen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation>Fehler beim Laden</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation>Möchten Sie das Fenster wirklich schließen?</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -83924,22 +84062,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation>B&eenden</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation>A&ktuelles Unterfenster schließen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation>Alle geschlossenen Tabs wiederherstellen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation>Liste löschen</translation> </message> @@ -86773,12 +86911,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation>Starte...</translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation>Erzeuge das Hauptfenster...</translation> </message>
--- a/eric6/i18n/eric6_empty.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_empty.ts Sun May 31 17:26:14 2020 +0200 @@ -352,7 +352,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation type="unfinished"></translation> </message> @@ -1791,7 +1791,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -1806,50 +1806,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> - <source>Open in New &Tab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> - <source>Edit &Name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> - <source>&Properties...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> - <source>New Folder</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <source>Open in New &Tab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <source>Edit &Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> + <source>&Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> + <source>New Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2879,15 +2894,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3248,252 +3268,252 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3501,87 +3521,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -3591,140 +3611,160 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10261,12 +10301,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -10735,7 +10775,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -11005,7 +11045,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -11200,307 +11240,307 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11525,12 +11565,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -16878,17 +16918,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -16906,12 +16946,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -16936,7 +16976,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -16946,47 +16986,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17019,20 +17059,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -37339,6 +37394,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -43122,27 +43185,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -43700,7 +43763,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -43727,32 +43790,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -43761,212 +43824,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -43981,50 +44044,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -45843,50 +45926,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -49260,17 +49343,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> @@ -58205,82 +58288,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -58290,7 +58363,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -58300,35 +58373,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -60150,6 +60228,21 @@ <source>Change Master Password...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -62099,75 +62192,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -62177,60 +62275,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -75037,7 +75140,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -75057,7 +75160,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -75437,7 +75540,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -75487,7 +75590,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation type="unfinished"></translation> </message> @@ -75547,289 +75650,279 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt 3 support</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt v.3 is not supported by eric6.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -75844,7 +75937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished"></translation> </message> @@ -75859,17 +75952,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -75884,17 +75977,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -75949,7 +76042,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -76025,17 +76118,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -76134,6 +76227,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -81839,47 +81947,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> @@ -81889,37 +81997,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -81929,13 +82037,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -83227,27 +83370,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -83255,22 +83398,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -86073,12 +86216,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>
--- a/eric6/i18n/eric6_en.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_en.ts Sun May 31 17:26:14 2020 +0200 @@ -352,7 +352,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation type="unfinished"></translation> </message> @@ -1791,7 +1791,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -1806,50 +1806,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>Edit &Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2879,15 +2894,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3248,137 +3268,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3386,52 +3406,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -3441,290 +3461,310 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10275,12 +10315,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -10749,7 +10789,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -10974,7 +11014,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -11149,257 +11189,257 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11424,27 +11464,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11469,7 +11509,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -11494,22 +11534,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11539,12 +11579,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -16892,17 +16932,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -16920,12 +16960,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -16950,7 +16990,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -16960,47 +17000,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17033,20 +17073,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -37371,6 +37426,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -43161,27 +43224,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -43739,7 +43802,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -43767,32 +43830,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -43801,212 +43864,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -44021,50 +44084,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -45883,50 +45966,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -49301,17 +49384,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -58238,22 +58321,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation type="unfinished"></translation> </message> @@ -58268,62 +58351,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -58333,7 +58406,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -58343,35 +58416,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -60193,6 +60271,21 @@ <source><b>Configure security settings</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -62142,75 +62235,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -62220,60 +62318,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -74622,7 +74725,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -74642,7 +74745,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -74887,7 +74990,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation type="unfinished"></translation> </message> @@ -74937,7 +75040,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation type="unfinished"></translation> </message> @@ -74987,209 +75090,204 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt 3 support</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> @@ -75229,27 +75327,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -75335,12 +75433,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -75705,7 +75803,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -75715,7 +75813,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -75735,7 +75833,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -75805,27 +75903,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt v.3 is not supported by eric6.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> @@ -75845,7 +75938,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -75890,7 +75983,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished"></translation> </message> @@ -75905,17 +75998,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -75930,17 +76023,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -75995,7 +76088,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -76071,17 +76164,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -76180,6 +76273,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -81875,47 +81983,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> @@ -81935,37 +82043,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -81975,13 +82083,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -83248,27 +83391,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -83279,22 +83422,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -86122,12 +86265,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>
--- a/eric6/i18n/eric6_es.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_es.ts Sun May 31 17:26:14 2020 +0200 @@ -352,7 +352,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Añadir Marcador</translation> </message> @@ -1814,32 +1814,32 @@ <translation>Añadir &Carpeta</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>&Abrir</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Abrir en Nueva Pes&taña</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Editar &Nombre</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation>Editar &Dirección</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation>Editar &Dirección</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Borrar</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Nueva carpeta</translation> </message> @@ -1849,25 +1849,40 @@ <translation>Pulse para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>&Propiedades...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation>Abrir en Nueva &Ventana</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation>Abrir en Nueva &Ventana</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation>Abrir en Nueva Ventana &Privada</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation>Abrir en Nueva Pes&taña en Segundo Plano</translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation>Nueva C&arpeta</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation>Nueva Carpeta de Marcadores</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation>Introducir título para la nueva carpeta de marcadores:</translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2909,15 +2924,20 @@ <translation>Archivos de Firmware CircuitPython (*.uf2);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation>Seleccionar Ruta al Dispositivo</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation><p>El volumen de dispositivo <b>{0}</b> no se puede encontrar. ¿Está dicho dispositivo en modo 'cargador de arranque' y montado?</p> <p>Alternativamente, seleccionar la opción "Selección Manuale introducir la ruta al dispositivo más abajo.</p></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation>Selección Manual</translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3283,137 +3303,137 @@ sobre una entrada, la abrirá en una ventana de edición posicionando el cursor en la línea y posición correspondiente.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation>Excluir Archivos:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Introducir patrones de nombre de archivo de los archivos a ser excluidos, separados por comas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation>Pulsar para iniciar la comprobación de estilo de código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation>Pulsar para arreglar los problemas seleccionados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation>Pulsar para cargar los valores por defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation>Pulsar para almacenar los valores actuales como valores por defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation>Pulsar para resetear los valores por defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation>Excluir Mensajes:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Introduzca códigos de mensaje o categorías a excluir separados por comas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation>Pulsar para seleccionar los códigos de mensaje de una lista</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation>Mensajes Incluidos:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Introducir códigos de mensaje o categorías a incluir separados por comas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation>Arreglar Problemas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Introducir los códigos de mensaje de los problemas que se desea arreglar automáticamente (dejar en blanco para arreglar todos)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation>No Arreglar Problemas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation>Introducir los códigos de mensaje de los problemas que se se van a arreglar automáticamente</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation>Máxima Longitud de Línea:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>Introducir el máximo permitido para longitud de línea (PEP-8: 79 caracteres)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation>Tipo de Docstring:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation>Seleccionar conjunto de reglas para docstrings</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation>Seleccionar para permitir hanging closing brackets</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation>Permitir hanging closing brackets</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation>Seleccionar para repetir cada tipo de mensaje</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation>Repetir mensajes</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation>Seleccionar para arreglar problemas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation>Arreglar problemas automaticamente</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3423,52 +3443,52 @@ sobre una entrada, la abrirá en una ventana de edición posicionando el cursor en la línea y posición correspondiente.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation>Archivo/Línea</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation>Código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation>Mensaje</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation>Muestra el progreso de la comprobación del estilo de código</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation>Muestra el progreso de la comprobación del estilo de código</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation>Estadísticas...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation>Pulsar para mostrar algunas estadísticas de la última ejecución</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation>Pulsar para mostrar todos los archivos con algún problema</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> @@ -3478,290 +3498,310 @@ <translation>Arreglar: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation>No se han encontrado problemas.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation>Muestra el progreso de la revisión de estilo de código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation>%v/%m Archivos</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation>Seleccionar para mostrar problemas ignorados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation>Mostrar ignorados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation>{0} (ignorado)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation>Preparando archivos...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation>Introducir la máxima complejidad de código permitida (McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation>Transfiriendo datos...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation>Opciones Globales</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation>Opciones Específicas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation>Estilo de Fuente</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation>Estilo de Documentación</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation>Línea de Código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation>Codificaciones Válidas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation>Introducir codificaciones válidas separadas por comas (dejar en blanco para utilizar valores por defecto)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation>Tamaño de Archivo Mínimo:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation>Introducir el tamaño mínimo que un archivo debe tener para ser comprobado (0 para todos los archivos)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation>Autor:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation>Introducir un nombre de autor de copyright para comprobar (dejar en blanco para omitir esta comprobación)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation>Future Imports</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation>Imports Esperados:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation>Complejidad del Código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation>&Iniciar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation>&Arreglar seleccionados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation>Cargar Va&lores por Defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation>Almacenar val&ores por defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation>&Restablecer Valores por Defecto</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation>No se han encontrado archivos (comprobar lista de ignorados).</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation>Ignorar Asignaciones Incorporadas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation>Izquierda</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation>Derecha</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation>Pulsar para añadir una asignación incorporada a ignorar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation>Pulsar para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation>Máx. Complejidad de McCabe:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation>Máx. Complejidad de Línea:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation>Introducir la máxima complejidad (número de nodos) para una línea de código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation>Puntuación de Máx. Complejidad de Línea:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation>Introducir el máximo permitido para la mediana de complejidad de línea</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation>Líneas en Blanco Antes</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation>Clases y Funciones de Primer Nivel:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation>Introducir el número de líneas en blanco antes de clases y funciones de primer nivel</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation>Métodos, Clases Anidadas y Funciones:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation>Introducir el número de líneas en blanco antes de métodos, clases anidadas o funciones</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation>Máx. Longitud Línea Documentación:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation>Código Comentado</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation>Seleccionar para buscar el código en comentarios más agresivamente. Puede incrementar el número de falsos positivos.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation>Búsqueda agresiva</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation>Anotaciones de Tipo</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation>Cobert. Mínima:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation>Introducir el porcentaje mínimo de anotaciones de tipo</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation>deshabilitado</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation>Complej. Máxima:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation>Introducir la complejidad máxima para anotaciones de tipo</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation>Ejecutar</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation>Pulsar para reiniciar la ejecución de comprobación de estilo de código</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation>Reiniciar</translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10363,12 +10403,12 @@ <translation>&Eliminar Todas</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation>Añadir entrada</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation>Introducir la entrada a añadir a la lista:</translation> </message> @@ -11002,7 +11042,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -11102,197 +11142,197 @@ <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -11362,7 +11402,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -11372,12 +11412,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -11417,32 +11457,32 @@ <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -11472,22 +11512,22 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> @@ -11512,27 +11552,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -11557,7 +11597,7 @@ <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?</p></translation> </message> @@ -11582,22 +11622,22 @@ <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> @@ -11627,12 +11667,12 @@ <translation>Ejecutar Selección en Consola</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation>Propiedades de EditorConfig</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Las propiedades de EditorConfig para el archivo <b>{0}</b> no se ha podido cargar.</p></translation> </message> @@ -17003,17 +17043,17 @@ <translation>Introducir la ruta del archivo de firmware</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation>Archivos de Firmware (*.img);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation>Copia de Seguridad de Firmware</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation>Restaurar Firmware</translation> </message> @@ -17031,12 +17071,12 @@ <translation>Borrar Flash</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation>Flash MicroPython Firmware</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation>Flash Additional Firmware</translation> </message> @@ -17061,7 +17101,7 @@ <translation>Tipo de chip no soportado '{0}'.</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation>Salida de 'esptool write_flash'</translation> </message> @@ -17071,47 +17111,47 @@ <translation>Resetear Dispositivo</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation>Copia de Seguridad de Firmware</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation>Restaurar Firmware</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation>Mostrar ID de Chip</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation>Mostrar ID de Flash</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation>Mostrar dirección MAC</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation>Salida de 'esptool read_flash'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation>Salida de 'esptool chip_id'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation>Salida de 'esptool flash_id'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation>Salida de 'esptool read_mac'</translation> </message> @@ -17144,20 +17184,35 @@ <translation>Introducir la ruta del archivo patch</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation>Dirección:</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation>Introducir la dirección del flash en forma hexadecimal</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation>Archivos de Firmware (*.bin);;Todos los Archivos (*)</translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation>Flash Mode:</translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation>Seleccionar el modo de flash</translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation>Dejar en blanco para usar el modo por defecto.</translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -37561,6 +37616,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation>Dispositivos de Serie Ignorados</translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -43353,27 +43416,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation>Dispositivo no soportado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <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="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <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="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <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="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation>El Gestor de Archovos no está soportado por este dispositivo.</translation> </message> @@ -43931,7 +43994,7 @@ <translation>Pulsar para abrir una ventana de gráfica para mostrar datos recibidos desde el dispositivo seleccionado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation>Pulsar para conectar el dispositivo seleccionado</translation> </message> @@ -43959,32 +44022,32 @@ <translation>No se han detectado dispositivos soportados.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation>Limpiar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation>Pegar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation>Pulsar para desconectar el dispositivo seleccionado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation>No hay dispositivo conectado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -43997,212 +44060,212 @@ Finalmente, pulsar el botón de reset del dispositivo y esperar unos pocos segundos antes de intentar de nuevo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation>Iniciar REPL</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation><p>El REPL no se puede iniciar.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation>Conexión de Dispositivo en Serie</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation><p>No se puede conectar el dispositovo en el puerto de serie <b>{0}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation>Ejecutar Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation>No hay editor abierto. Abortando...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation>El editor actual no contiene un script. Abortando...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation><p>No se puede ejecutar el script.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation>Abrir Archivo de Python</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation>Archivos de Python3 (*.py);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation>Iniciar Gráfica</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation><p>No se puede iniciar la gráfica.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation>Datos de Gráfica sin Guardar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation>La gráfica contiene datos sin guardar.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation>Comenzar Gestor de Archivos</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation><p>El Gestor de Archivos no se puede iniciar.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation>Mostrar Versión</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation>Mostrar Implementación</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation>Sincronizar Hora</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation>Mostrar Hora del Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation>Mostrar Hora Local</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation>Compilar Archivo de Python</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation>Compilar Editor Actual</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation><h3>Información de Versión de Dispositivo</h3></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation>No hay información de versión disponible.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation>Información de Versión de Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation>Información de Implementación de Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation><h3>Información de Implementación de Dispositivo </h3><p>Este dispositivo contiene <b>{0} {1}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation><p>La hora del dispositivo conectado está sincronizada con la hora local.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Fecha y Hora del Dispositivo</h3><table><tr><td><b>Fecha</b></td><td>{0}</td></tr><tr><td><b>Hora</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation><h3>Fecha y Hora del Dispositivo</h3><p>{0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation>Fecha y Hora del Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation>Fecha y Hora Local</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Fecha y Hora del Local</h3><table><tr><td><b>Fecha</b></td><td>{0}</td></tr><tr><td><b>Hora</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation>Error de gestión del dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation><p>Ha ocurrido un error al comunicar con el dispositivo conectado.</p><p>Método: {0}</p><p>Mensaje: {1}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation>El compilador multiplataforma de MicroPython <b>mpy-cross</b> no se encuentra. Asegúrese de que está en la ruta de búsqueda o configurarlo en la página de configuración de MicroPython.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Archivos Python (*.py);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation>El archivo de Python <b>{0}</b> no existe. Abortando...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation>Salida de 'mpy-cross'</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation>El editor actual no contiene un archivo de Python. Abortando...</translation> </message> @@ -44217,50 +44280,70 @@ <translation>Pulsar para abrir un gestor de archivos en el dispositivo seleccionado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation>Gráfica µPy</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation>Archivos µPy</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation>Mostrar Documentación</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation>Mostrar Tiempo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation>Descargar Firmware</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation>Fecha y Hora</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation><table><tr><th></th><th>Fecha y Hora Local</th><th>Fecha y Hora del Dispositivo</th></tr><tr><td><b>Fecha</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Hora</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation><table><tr><th>Fecha y Hora Local</th><th>Fecha y Hora del Dispositivo</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation>Dispositivo MicroPython Desconocido</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation><p>Se han detectado los siguientes dispositivos de serie desconocidos</p><ul><li>{0}</li></ul><p>Por favor, informe de ésto junto con el nombre de la placa y una descripción corta a <a href="mailto:eric-bugs@eric-ide.python-projects.org"> la dirección de informes de errores</a> si se trata de una placa MicroPython board.</p></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation>{0} ({1:04x}/{2:04x})</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation>Dispositivos de Serie Ignorados</translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -46087,50 +46170,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation>Error de Certificado SSL</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation><b>{0}</b><p>La página a la que se intenta acceder tiene errores en el certificado SSL.</p><ul><li>{1}</li></ul><p>¿Quiere añadir una excepción?</p></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation>Aceptar &Permanentemente</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation>Aceptar &temporalmente</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation>&Rechazar</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Introducir nombre de usuario y contraseña para '{0}', reino {1}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Introducir nombre de usuario y contraseña para '{0}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation>Autenticación necesaria</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation>Es necesaria autenticación para acceder:</translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation><b>{0}</b><p>El host <b>{1}</b> que trata de visitar tiene errores en el certificado SSL.</p><ul><li>{2}</li></ul><p>¿Desea hacer una excepción?</p></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -49512,17 +49595,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> @@ -58597,17 +58680,17 @@ <translation><b>Configurar Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Proporciona un ejemplo del nombre completo de la herramienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>designer</translation> </message> @@ -58617,7 +58700,7 @@ <translation><font color="#FF0000"><b>Nota:</b> Estas opciones de configuración serán activadas la siguiente vez que se inicie la aplicación.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>El ejecutable de la herramienta se compone del prefijo, el nombre de la herramienta y el postfijo. Para win, la extensión se añade automáticamente.</translation> </message> @@ -58632,67 +58715,52 @@ <translation>Introeucir la ruta del directorio de traducciones de Qt.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation><b>Nota:</b> Dejar vací esta entrada para utilizar una variable de entorno o la ruta compilada dentro de la biblioteca Qt. Las variables de entorno soportadas son -<ul> -<li>QT4TRANSLATIONSDIR para Qt4</li> -<li>QT5TRANSLATIONSDIR para Qt5</li> -<li>QTTRANSLATIONSDIR para cualquier variante de Qt</li> -</ul></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation>Prefijo de Qt:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation>Introducir el prefijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation>Postfijo de Qt:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation>Introducir el postfijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation>Ancho de indentación:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation>Generar imports relativos a '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation>Directorio de las Herramientas:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Introducir la ruta del directorio de las herramientas Qt, si no se encuentran automáticamente.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation>Introducir la ruta del directorio de las herramientas PyQt, si no se encuentran automáticamente.</translation> </message> @@ -58702,7 +58770,7 @@ <translation>Muestra: {0}designer{1}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation>Introducir la ruta del directorio de las herramientas PySide2, si no se encuentran automáticamente.</translation> </message> @@ -58712,35 +58780,40 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation>PyQt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation>Opciones de pyuic</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation>Seleccionar para generar el código extra para probar y mostrar el formulario</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation>Gemerar Código Extra de Prueba</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation>PySide2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation>Opciones de pyside2-uic</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation><b>Nota:</b> Dejar esta entrada vacía para usar la ruta compilada en la biblioteca Qt.</translation> + </message> </context> <context> <name>Queues</name> @@ -60613,6 +60686,21 @@ <source><b>Configure security settings</b></source> <translation><b>Configurar ajustes de seguridad</b></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation>Errores en Certificados</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation>Seleccionar para rechazar siempre páginas web con problemas en sus certificados</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation>Rechazar siempre páginas web con errores en sus certificados</translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -62576,75 +62664,80 @@ <translation><b>Información de Seguridad</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation>Media</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation>Imagen</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation>Dirección de la Imagen</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation><b>Vista preliminar</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation>Vista preliminar no disponible.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation>Copiar Ubicación de la Imagen al Portapapeles</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation>Copiar Nombre de la Imagen al Portapapeles</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation>Guardar imagen</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation>Todos los archivos (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation><p>No es posible escribir en el archivo <b>{0}</b>.</p></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation>Cargando...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation><p>Esta vista previa no está disponible.</p></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation><b>La Conexión está encriptada.</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation><b>La Conexión no está encriptada.</b></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation><b>La connection está encriptada pero puede ser insegura.</b></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -62654,60 +62747,65 @@ <translation><b>Site {0}</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation>La conexión a este site es <b>segura</b>.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation>La conexión a este site es <b>no segura</b>.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation>Esta es su <b>{0}.</b> visita a este site.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation><b>Nunca</b> ha visitado este sitio anteriormente.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation>primera</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation>segunda</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation>tercera</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation>Ésta es su <b>{0}</b> visita a este site.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation>Regisrar como <b>{0}</b> gestor de enlaces.</translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation>Regisrar como <b>{0}</b> gestor de enlaces.</translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation>Registrar</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation>Más...</translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation>La conexión a este site <b>podría no ser segura</b>.</translation> + </message> </context> <context> <name>SnapWidget</name> @@ -74911,7 +75009,7 @@ <translation><b>Atajos de Teclado</b><p>Establezca los atajos de teclado para la aplicación con sus valores preferidos.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atajos de Teclado</translation> </message> @@ -74931,7 +75029,7 @@ <translation><b>Exportar Atajos de Teclado</b><p>Exporte los atajos de teclado de la aplicación.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Importar Atajos de Teclado</translation> </message> @@ -75121,7 +75219,7 @@ <translation>Ajustes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Ayuda</translation> </message> @@ -75136,7 +75234,7 @@ <translation>Plugins</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -75176,82 +75274,82 @@ <translation>&Ocultar todo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problema</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>No hay visor personalizado seleccionado actualmente. Por favor, especifique uno en el diálogo de preferencias.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>No se ha podido ejecutar el visor de ayuda.<br>Asegúrese de que esta disponible como <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Falta documentación</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Documentación</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PyQt4 no ha sido configurado.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Guardar tareas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Leer tareas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Error de volcado</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Error durante la verificación de actualización</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Cancelar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Actualizaciones disponibles</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>No se puede llevar a cabo la verificación de actualizaciones.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versiones disponibles</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Usado por primera vez</translation> </message> @@ -75311,7 +75409,7 @@ <translation>Restaurando Gestor de Barras de Herramientas...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Herramientas Externas</translation> </message> @@ -75326,12 +75424,12 @@ <translation>Visor de &Multiproyecto</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Guardar sesión</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Cargar sesión</translation> </message> @@ -75561,11 +75659,6 @@ <translation>Editor de &Iconos...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt 3 support</source> - <translation>Soporte para Qt 3</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2870"/> <source>PySide Documentation</source> <translation>Documentación de PySide</translation> @@ -75601,106 +75694,106 @@ <translation>Herramientas Externas/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>El archivo <b>{0}</b> no existe o tiene longitud nula. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar Qt-Designer.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar Qt-Linguist.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar Qt-Assistant.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el visor personalizado.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el Previsualizador de UI.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el Previsualizador de Traducciones.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido iniciar el navegador SQL.<br>Asegúrese de que está disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>No se ha encontrado la entrada para la herramienta externa '{0}' en el grupo de herramientas '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation>No se ha encontrado la entrada para el grupo de herramientas '{0}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>Comenzando proceso '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>No se ha podido ejecutar la entrada de herramienta <b>{0}</b>.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>El proceso '{0}' ha finalizado. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><P>El punto de entrada de documentación "<b>{0}</b>" no ha podido encontrarse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de tareas <b>{0}</b> no pudo ser guardado.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de tareas <b>{0}</b> no puede leerse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de sesión <b>{0}</b> no ha podido guardarse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de sesión <b></b> no ha podido ser leído.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation>Probando host {0}</translation> </message> @@ -75735,7 +75828,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Archivo de atajos de teclado (*.e4k)</translation> </message> @@ -75775,27 +75868,27 @@ <translation><b>Documentación de Python 2</b><p>Mostrar la documentación de Python 2. Si no se ha configurado un directorio con esta documentación, la ubicación de la documentación de Python 2 se asumirá en el directorio de documentación bajo la ubicación del ejecutable configurado de Python 2 en Windows, y en <i>/usr/share/doc/packages/python/html/python-docs-html</i> para Unix. Establezca el valor de la variable de entorno PYTHON2DOCDIR para sobreescribir estas opciones. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation>Error al obtener información de versiones</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>La información de versiones no se ha podido descargar. Póngase online por favor e inténtelo de nuevo.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation>Abrir Navegador</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation>No se ha podido iniciar el navegador web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>La información de versiones no se ha podido descargar en los últimos 7 días. Póngase por favor online e inténtelo de nuevo.</translation> </message> @@ -75881,12 +75974,12 @@ <translation><b>Captura de Pantalla</b><p>Abre un diálogo para tomar capturas de pantalla de una región de la pantalla.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar la herramienta de Captura de Pantalla.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation>Seleccionar Directorio para el Espacio de Trabajo</translation> </message> @@ -76251,7 +76344,7 @@ <translation>Abrir Documentación de PyQt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PyQt5 no ha sido configurado.</p></translation> </message> @@ -76261,7 +76354,7 @@ <translation><b>Documentación de Python 3</b><p>Mostrar la documentación de Python 3. Si no se ha configurado un directorio con lesta documentación, la ubicación de la documentación de Python 3 se asumirá en el directorio de documentación bajo la ubicación del ejecutable de Python 3 en Windows, y en <i>/usr/share/doc/packages/python/html</i> para Unix. Establezca el valor de la variable de entorno PYTHON3DOCDIR para sobreescribir estas opciones. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -76281,7 +76374,7 @@ <translation><b>Mostrar registro de errores...</b><p>Abre un diálogo mostrando el registro más reciente de errores.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation>Verificación de Versión</translation> </message> @@ -76351,27 +76444,22 @@ <translation><b>Documentación de API de Eric</b><p>Muestra la documentación de API de Eric. La ubicación de la documentación es el subdirectorio Documentation/Source del directorio de instalación de eric6.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt v.3 is not supported by eric6.</source> - <translation>Qt v.3 no está soportado por eric6.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>La actualización para <b>{0}</b> de eric6 está disponible en <b>{1}</b>. ¿Le gustaría obtenerla?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation>Eric6 está actualizado</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation>Está utilizando la última versión de eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>Eric6 todavía no está configurado. El diálogo de configuración va a ser iniciado.</translation> </message> @@ -76391,7 +76479,7 @@ <translation>No se han Configurado Herramientas de Usuario</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>La información de versiones no se puede descargar porque está <b>sin línea</b>. Por favor, póngase en línea e inténtelo de nuevo.</translation> </message> @@ -76436,7 +76524,7 @@ <translation><b>Guardar sesión...</b><p>Guarda la sesión actual a disco. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation>Cargar sesión</translation> </message> @@ -76451,17 +76539,17 @@ <translation><b>Cargar sesión...</b><p>Carga una sesión guardada en disco anteriormente. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation>Archivos de Sesión de eric6 (*.e5s)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation>¡Se ha hallado una sesión perdida!</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation>Se ha encontrado un archivo de sesió para una sesión perdida. ¿Desea restaurar esta sesión?</translation> </message> @@ -76476,17 +76564,17 @@ <translation>Inicializando Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation>Comprobación Actualización</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Ha instalado eric directamente a partir del código fuente. No es posible comprobar la disponibilidad de una actuación.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Ésta es una snapshot release the eric6. Una release estable más reciente podría estar disponible.</translation> </message> @@ -76541,7 +76629,7 @@ <translation><b>Documentación de PySide2</b><p>Muestra la Documentación de PySide2. Dependiendo de la configuración, esta documentación será mostrará en el visor de ayuda interno de Eric, o se ejecutará en un navegador web, o Qt Assistant.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PySide{0} no ha sido configurado.</p></translation> </message> @@ -76617,17 +76705,17 @@ <translation><b>Reiniciar la IDE</b><p>Reinicia la IDE. Todos los cambios sin guardar pueden ser guardados primero. Cualquier programa de Python que esté en depuración será detenido, y las preferencias se guardarán en disco.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation>Iniciar Navegador Web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation>El navegador web de eric 6 no se ha podido iniciar.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>El navegador web de eric6 no se ha iniciado.</p><p>Razón: {0}</p></translation> </message> @@ -76726,6 +76814,21 @@ <source><h2>Version Numbers</h2><table></source> <translation><h2>Números de Versiones</h2><table></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>No se ha podido encontrar el ejecutable de Qt-Designer.<br>Asegúrese de que está instalado y opcionalmente configurado en la página de configuración de Qt.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>No se ha podido encontrar el ejecutable de Qt-Linguist.<br>Asegúrese de que está instalado y opcionalmente configurado en la página de configuración de Qt.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>No se ha podido encontrar el ejecutable de Qt-Assistant.<br>Asegúrese de que está instalado y opcionalmente configurado en la página de configuración de Qt.</p></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -82461,47 +82564,47 @@ <translation>Tamaño Mínimo Lógico de Fuente:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation>Imágenes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation>Seleccione para cargar imágenes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation>Cargar imágenes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation>Hoja de Estilo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation>Hoja de Estilo de Usuario:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation>Introduzca el nombre del archivo de la hoja de estilos de usuario</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation>Pestañas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation>Seleccionar para generar un aviso cuando estén a punto de cerrarse múltiples pestañas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation>Avisar cuando se vayan a cerrar múltiples pestañas</translation> </message> @@ -82521,37 +82624,37 @@ <translation>Seleccionar la fuente pictográfica</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Nota:</b> Estas opciones de configuración se activarán la siguiente vez que se ejecute la aplicacion.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation>Barras de Herramientas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation>Seleccionar para mostrar las barras de herramientas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation>Mostrar Barras de Herramientas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation>Barras de Desplazamiento</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation>Seleccionar mostrar barras de desplazamiento. Nota: el desplazamiento es posible aún sin ellas.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation>Mostrar Barras de Herramientas</translation> </message> @@ -82561,15 +82664,50 @@ <translation>Colores</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation>Color de fondo de URLs seguras:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> <source>Select the background color for secure URLs.</source> <translation>Seleccione el color de fondo para las URLs seguras.</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> + <source>URL Entry Background</source> + <translation>Color de fondo para Entradas URL</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation>URLs Seguras:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation>URLs Inseguras:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation>Seleccionar el color de fondo para URLs inseguras.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation>URLs Maliciosas:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation>Seleccionar el color de fondo para URLs maliciosas.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation>Modo Privado:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> + <translation>Seleccionar el color de fondo para URLs en modo privado.</translation> + </message> </context> <context> <name>WebBrowserClearPrivateDataDialog</name> @@ -83853,27 +83991,27 @@ <translation>...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation>Cargando...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation>Carga terminada</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation>Ha fallado la carga</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation>¿Realmente desea cerrar la ventana?</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -83884,22 +84022,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation>&Salir</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation>Cerrar Pestaña Actua&l</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation>Restaurar Todas las Pestañas Cerradas</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation>Borrar Lista</translation> </message> @@ -86732,12 +86870,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation>Comenzando...</translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation>Generando Ventana Principal...</translation> </message>
--- a/eric6/i18n/eric6_fr.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_fr.ts Sun May 31 17:26:14 2020 +0200 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Ajouter un signet</translation> </message> @@ -1850,32 +1850,32 @@ <translation>Ajouter &Répertoire</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>&Ouvrir</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Ouvrir dans un nouvel &onglet</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Éditer &Nom</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation>Éditer &Adresse</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation>Éditer &Adresse</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Nouveau répertoire</translation> </message> @@ -1885,25 +1885,40 @@ <translation>Cliquer pour supprimer les entrées sélectionnées</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>&Propriétés...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2958,15 +2973,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3361,137 +3381,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation type="unfinished">Fichiers exclus:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished">Entrer les filtres de noms de fichiers à exclure, séparés par des virgules</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3499,52 +3519,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation type="unfinished">Fichier/ligne</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation type="unfinished">Code</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -3554,290 +3574,310 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished">Auteur:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished">&Lancer</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished">Left</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished">Right</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished">Cliquer pour supprimer les entrées sélectionnées</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished">Configuration</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10519,12 +10559,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -11068,7 +11108,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -11143,87 +11183,87 @@ <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -11243,7 +11283,7 @@ <translation>Supprimer les flags d'erreurs de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -11253,12 +11293,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -11288,17 +11328,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -11333,72 +11373,72 @@ <translation>Pas de langage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Ajouter des fichiers...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Ajouter un fichier alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -11443,12 +11483,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -11518,7 +11558,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -11528,12 +11568,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -11573,32 +11613,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -11628,22 +11668,22 @@ <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11668,27 +11708,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation type="unfinished">Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11713,7 +11753,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -11738,22 +11778,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11783,12 +11823,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -17476,17 +17516,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -17504,12 +17544,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -17534,7 +17574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -17544,47 +17584,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17617,20 +17657,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished">Adresse:</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -39626,6 +39681,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -45519,27 +45582,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -46097,7 +46160,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -46125,32 +46188,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished">Effacer</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished">Coller</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -46159,212 +46222,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished">Lancer le script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -46379,50 +46442,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -48241,50 +48324,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished">Accepter &définitivement</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished">Accepter &temporairement</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished">&Refuser</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -51742,17 +51825,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -60871,17 +60954,17 @@ <translation><b>Configuration de Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Outils Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Ceci donne un exemple d'un nom complet d'outil Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>designer</translation> </message> @@ -60891,7 +60974,7 @@ <translation><font color="#FF0000"><b>Note:</b> Cette propriété sera activée au prochain démarrage de l'application.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> @@ -60906,62 +60989,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -60971,7 +61044,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -60981,35 +61054,40 @@ <translation type="unfinished">Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -62831,6 +62909,21 @@ <source><b>Configure security settings</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -64786,52 +64879,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation type="unfinished">Enregistrer l'image</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation type="unfinished">Tous fichiers (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -64841,25 +64934,30 @@ <translation type="obsolete">Nom:</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -64869,60 +64967,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -76798,7 +76901,7 @@ <translation><b>Raccourcis claviers</b><p>Edite les raccourcis claviers pour l'application.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Exporter les raccourcis clavier</translation> </message> @@ -76818,7 +76921,7 @@ <translation><b>Exporter les raccourcis clavier</b><p>Exporte les raccourcis claviers de l'application.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Importer des raccourcis clavier</translation> </message> @@ -76858,7 +76961,7 @@ <translation>Outils</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Aide</translation> </message> @@ -76873,12 +76976,12 @@ <translation>&Barres d'Outils</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problème</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -76994,7 +77097,7 @@ <translation type="obsolete">Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -77129,22 +77232,22 @@ <translation>Visualisueur de tâches</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Enregistrement des tâches</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Lecture des tâches</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Aucun visualiseur personalisé n'est sélectionné. Prière d'en spécifier un dans les préférences.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Documentation Manquante</translation> </message> @@ -77244,7 +77347,7 @@ <translation>Ouvre la documentation sur les APIs Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Impossible de démarrer le visualiseur d'aide.<br>Assurez-vous qu'il est bien ici <b>hh</b>.</p></translation> </message> @@ -77325,22 +77428,22 @@ <translation>Outils &internes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Documentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>L'emplacement de la documentation PyQt4 n'a pas été configuré.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Erreur durant la recherche de mises à jour</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Mise à jour disponible</translation> </message> @@ -77350,17 +77453,17 @@ <translation type="obsolete"><h3>Numéros de version</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation type="unfinished">Ouverture du navigateur</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation type="unfinished">Impossible de lancer le navigateur web</translation> </message> @@ -77385,17 +77488,17 @@ <translation>Afficher les &outils externes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Annuler</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Impossible de vérifier les mises à jour.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Première utilisation</translation> </message> @@ -77490,7 +77593,7 @@ <translation>Affiche les versions disponibles pour le téléchargement</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versions disponibles</h3><table></translation> </message> @@ -77580,17 +77683,17 @@ <translation>Gestionnaire de &multi-projet</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Outils externes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Enregistrer la session</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Chargement de session</translation> </message> @@ -77820,11 +77923,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt 3 support</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2870"/> <source>PySide Documentation</source> <translation type="unfinished"></translation> @@ -77860,104 +77958,104 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> @@ -77992,7 +78090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -78032,17 +78130,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -78128,12 +78226,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -78498,7 +78596,7 @@ <translation type="unfinished">Lance la documentation PyQt4 {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>L'emplacement de la documentation PyQt4 n'a pas été configuré.</p> {5 ?}</translation> </message> @@ -78508,7 +78606,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -78528,7 +78626,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -78598,27 +78696,22 @@ <translation type="unfinished"><b>Documentation de l'API Eric</b><p>Affiche la do. The location for the documentation is the Documentation/Source subdirectory of the eric4 installation directory.</p> {5 ?} {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt v.3 is not supported by eric6.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric4 est à jour {5 ?} {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric4 n'a pas encore été configuré. La fenêtre de configuration va être ouverte. {5 ?} {6 ?}</translation> </message> @@ -78638,7 +78731,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -78683,7 +78776,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished">Charger la session</translation> </message> @@ -78698,17 +78791,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -78723,17 +78816,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -78788,7 +78881,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -78864,17 +78957,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -78973,6 +79066,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>Numéros de version</h3><table> {2>?} {2>?}</translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -84789,47 +84897,47 @@ <translation type="obsolete">Sélectionne une couleur de fond pour les URLs sécurisées.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished">Images</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished">Cocher pour charger les images</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished">Charger les images</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished">Feuille de style</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished">Feuille de style utilisateur:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished">Entrer le nom d'une feuille de styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> @@ -84849,37 +84957,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"><font color="#FF0000"><b>Note:</b> Les paramètres seront activés au prochain lancement de l'application.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished">Barres d'outils</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -84889,13 +84997,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -86167,27 +86310,27 @@ <translation type="unfinished">...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -86196,22 +86339,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished">&Quitter</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -89115,12 +89258,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation type="unfinished">Création de la fenêtre principale...</translation> </message>
--- a/eric6/i18n/eric6_it.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_it.ts Sun May 31 17:26:14 2020 +0200 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Aggiungere segnalibro</translation> </message> @@ -1850,32 +1850,32 @@ <translation>Aggiungi &Cartella</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>&Apri</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Apri in una nuova linguet&ta</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Modifica &Nome</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation>Modifica &Indirizzo</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation>Modifica &Indirizzo</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>Can&cella</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Nuova Cartella</translation> </message> @@ -1885,25 +1885,40 @@ <translation></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>&Proprietà...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2968,15 +2983,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3453,137 +3473,137 @@ aprirà una finestra per editare e posizionerà il cursore alla rispettiva riga e colonna.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation>Escludi file:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Inserisci una stringa per il nome file dei file da escludere separati da una virgola</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation>Premi per iniziare l'esecuzione del controllo dello stile di codifica</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation>Premi per correggere le problemi selezionati</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation>Premi per caricare i valori di default</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation>Premi per salvare i valori corrente come predefiniti</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation>Premi per resettare i valori predefiniti</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation>Escludi Messaggi:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Inserici il codice del messaggio o le categorie da escludere separate da una virgola</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation>Premi per selezionare il codice messaggi da una lista</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation>Includi Messaggi:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Inserisci i codici messaggio o le categorie da includere separati da una virgola</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation>Problemi risolti:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Inserisci i codici messaggio dei problemi da correggere in automatico (lascia vuoto per correggerli tutti)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation>Problemi non risolti:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation>Inserisci i codici messaggio dei problemi da non correggere in automatico</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation>Max. lunghezza riga:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>Inserisci la lunghezza massima di riga consentita (PEP-8: 79 caratteri)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation>Tipo stringa doc.:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation>Seleziona l'insieme di regole per la stringa doc</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation>Seleziona per permettere l'apposizione delle parentesi di chiusura</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation>permette l'apposizione delle parentesi di chiusura</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation>Seleziona per ripetere ogni tipo di messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation>Ripeti messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation>Seleziona per correggere alcuni problemi</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation>Correggi automanticamente i problemi</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3593,52 +3613,52 @@ aprirà una finestra per le modifiche posizionando il cursore alla rispettiva riga e colonna.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation>File/Linea</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation>Codice</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation>Messaggio</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation>PEP-257</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation>PEP-257</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation>Statistiche...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation>Premi per mostrare alcune statistiche dell'ultima esecuzione</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation>Mostra</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation>Premi per mostrare tutti i file che contengono problematiche</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> @@ -3648,290 +3668,310 @@ <translation>Corregge:{0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation>Nessun problema trovato.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation>Mostra l'avanzamento del controllo dello stile di codifica</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation>File %v/%m</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished">Errori</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished">Autore:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished">&Avvia</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished">Sinistra</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished">Destra</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished">Configura</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished">Riavvio</translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10806,12 +10846,12 @@ <translation type="unfinished">Rimozione global&e</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -11355,7 +11395,7 @@ <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> @@ -11430,87 +11470,87 @@ <translation>L'autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>File modificato</translation> </message> @@ -11530,7 +11570,7 @@ <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -11540,12 +11580,12 @@ <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> @@ -11575,17 +11615,17 @@ <translation>File non analizzato precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Tutte le linee sono state analizzate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> @@ -11620,72 +11660,72 @@ <translation>Nessun linguaggio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Aggiungi file...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Aggiungi files...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Aggiungi file sinonimo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Aggiungi una risorsa localizzata...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Aggiungi un file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Aggiundi dei file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Aggiungi file sinonimo delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Diagrammi del package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Includi gli attributi della classe ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -11730,12 +11770,12 @@ <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -11805,7 +11845,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -11815,12 +11855,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -11860,32 +11900,32 @@ <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Il file macro <b>{0}</b> è danneggiato.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias per il file <b>{0}</b>:</translation> </message> @@ -11915,22 +11955,22 @@ <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file delle macro <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>Attenzione: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Attenzione:</b> con la riapertura le modifiche andranno perse.</translation> </message> @@ -11955,27 +11995,27 @@ <translation>Modifica precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation>Righe ordinate</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation>Nessun messaggio di attenzione disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation>Stile: {0}</translation> </message> @@ -12000,7 +12040,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> è stato modificato mentre era aperto in eric6. Rileggerlo ?</p></translation> </message> @@ -12025,22 +12065,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12070,12 +12110,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -17881,17 +17921,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -17909,12 +17949,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -17939,7 +17979,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -17949,47 +17989,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -18022,20 +18062,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished">Indirizzo:</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -41904,6 +41959,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -47827,27 +47890,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -48405,7 +48468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -48433,32 +48496,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished">Pulisci</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished">Copia</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished">Incolla</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -48467,212 +48530,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished">Esegui Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">File Python (*.py);;Tutti i File (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -48687,50 +48750,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished">Configura</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -50562,50 +50645,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished">Accetta &Permanentemente</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished">Accetta &Temporaneamente</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished">&Rigetta</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"><b>Inserisci utente e password per '{0}', dominio '{1}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b>Inserisci utente e password per '{0}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -54202,17 +54285,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> @@ -63368,17 +63451,17 @@ <translation><b>Configura Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Qt Tools</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Fa un esempio del nome completo del tool</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>designer</translation> </message> @@ -63388,7 +63471,7 @@ <translation><font color="#FF0000"><b>Nota:</b> Queste impostazioni saranno attivate al prossimo avvio dell'applicazione.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>L'eseguibile del tool e' composto dal predisso, il nome del tool e il suffizzo. Per win, l'estensione è aggiunta automaticamente.</translation> </message> @@ -63403,62 +63486,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -63468,7 +63541,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -63478,35 +63551,40 @@ <translation type="unfinished">Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -65348,6 +65426,21 @@ <source><b>Configure security settings</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -67304,22 +67397,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> @@ -67329,32 +67422,32 @@ <translation type="obsolete">Sicurezza</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished">Copia la posizione dell'immagine nella Clipboard</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation type="unfinished">Salva immagine</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -67369,25 +67462,30 @@ <translation type="obsolete">Percorso:</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished">Caricamento...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -67397,60 +67495,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -79369,7 +79472,7 @@ <translation><b>Scorciatoie da tastiera</b><p>Imposta le scorciatoie da tastiera dell'applicazione con i valori personalizzati.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Esporta scorciatoie da tastiera</translation> </message> @@ -79389,7 +79492,7 @@ <translation><b>Esporta scorciatoie da tastiera</b><p>Esporta le scorciatoie da tastiera dell'applicazione.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Importa scorciatoie da tastiera</translation> </message> @@ -79429,7 +79532,7 @@ <translation>Strumenti</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Aiuto</translation> </message> @@ -79444,12 +79547,12 @@ <translation>&Toolbar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problema</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -79564,7 +79667,7 @@ <translation type="obsolete">Non c'è uno script principale definito per il progetto. Esco</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -79699,22 +79802,22 @@ <translation>Task-Viewer</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Salva task</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Leggi task</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Attualmente nessun visualizzatore personalizzato è selezionato. Per favore usa il dialogo delle preferenze per specificarne uno.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Documentazione mancante</translation> </message> @@ -79814,7 +79917,7 @@ <translation>Apri documentazione API di Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Non posso avviare il visualizzatore di help.<br>Assicurarsi che sia disponibile come <b>hh</b>.</p></translation> </message> @@ -79895,22 +79998,22 @@ <translation>Tool &Builtin</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Documentazione</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>L'inizio della documentazione di PySide non è stato configurato.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Errore nel controllo per gli update</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Aggiornamento disponibile</translation> </message> @@ -79920,7 +80023,7 @@ <translation type="obsolete"><h3>Numeri di versione</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -79945,17 +80048,17 @@ <translation>Mostra toll &esterni</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Cancella</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Non posso controllare per gli update.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Primo avvio</translation> </message> @@ -80050,7 +80153,7 @@ <translation>Mostra le versioni disponibili per il download</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versioni disponibili</h3><table></translation> </message> @@ -80140,17 +80243,17 @@ <translation>&Multiproject-Viewer</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Tool esterni</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Salva sessione</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Leggi sessione</translation> </message> @@ -80382,7 +80485,7 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt 3 support</source> - <translation>Supporto Qt3</translation> + <translation type="obsolete">Supporto Qt3</translation> </message> <message> <location filename="../UI/UserInterface.py" line="2870"/> @@ -80420,105 +80523,105 @@ <translation>Tool Esterni/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Il file <b>{0}</b> non esiste o ha lunghezza zero.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare Qt-Designer.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare Qt-Linguist.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare Qt-Assistant.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare il visualizzatore personalizzato.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare UI Previewer.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare l'anteprima delle traduzioni.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare SQL Browser.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Nessun elemento per il tool esterno '{0}' trovato nel gruppo '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation>Nessun gruppo '{0}' trovato.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>Avvio processo '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Non posso avviare l'elemento degli strumenti <b>{0}</b>.<br>Assicurarsi che sia disponibile come <b>{1}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>Il processo '{0}' è terminato.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>L'inizio della documentazione "<b>{0}</b>" non viene trovato.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Il file task <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Il file task <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Il file sessione <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Il file sessione <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation>Tento su host {0}</translation> </message> @@ -80553,7 +80656,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>File scorciatoi tastiera (*.e4k)</translation> </message> @@ -80593,27 +80696,27 @@ <translation><b>Documentazione Python 2</b><p>Mostra la documentazione Python 2. Se non è configurata una directory per la documentazione, viene assunto che la posizione della documentazione sia nella directory doc nella locazione dell'eseguibile Python 2 su Windows e <i>/usr/share/doc/packages/python/html</i> su Unix. Imposta PYTHONDOCDIR2 nel tuo ambiente per sovrascrivere questi valori.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -80699,12 +80802,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation type="unfinished">Seleziona cartella di lavoro</translation> </message> @@ -81069,7 +81172,7 @@ <translation type="unfinished">Apri documentazione su PyQt4 {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>L'inizio della documentazione di PyQt4 non è stato configurato.</p> {5 ?}</translation> </message> @@ -81079,7 +81182,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -81099,7 +81202,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -81171,25 +81274,25 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt v.3 is not supported by eric6.</source> - <translation type="unfinished">Le Qt v.3 non sono supportate da eric6.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <translation type="obsolete">Le Qt v.3 non sono supportate da eric6.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished">L'update alla versione <b>{0}</b> di eric6 è disponibile presso <b>{1}</b>. Vuoi prenderlo?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric6 è aggiornato</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation type="unfinished">Stai usando l'ultima versione di eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric6 non è ancora stato configurato. Il dialogo di configurazione verrà avviato.</translation> </message> @@ -81209,7 +81312,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -81254,7 +81357,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished">Carica sessione</translation> </message> @@ -81269,17 +81372,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -81294,17 +81397,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -81359,7 +81462,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -81435,17 +81538,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -81544,6 +81647,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>Numeri di versione</h3><table> {2>?} {2>?}</translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -87359,37 +87477,37 @@ <translation type="obsolete">Seleziona lo sfondo per gli URL sicuri.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished">Immagini</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished">Seleziona per caricare le immagini</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished">Carica immagini</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished">Fogli di stile dell'utente:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished">Inserisci il nome del foglio di stile dell'utente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished">Schede</translation> </message> @@ -87399,12 +87517,12 @@ <translation type="obsolete">Mostra solo un pulsante di chiusura invece di uno per ogni linguetta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished">Seleziona per emettere un'attenzione, se schede multiple stanno per essere chiuse</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished">Attenzione, se schede multiple stanno per essere chiuse</translation> </message> @@ -87424,37 +87542,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"><font color="#FF0000"><b>Nota:</b> Tutte queste impostazioni saranno attivate al prossimo avvio dell'applicazione.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished">Toolbars</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -87464,13 +87582,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -88743,27 +88896,27 @@ <translation type="unfinished">...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished">Caricamento...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished">Caricamento terminato</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished">Caricamento fallito</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished">Sei sicuro di voler chiudere la finestra ?</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -88774,22 +88927,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished">&Esci</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished">C&hiudi scheda corrente</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">Ricarica tutte le schede chiuse</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished">Pulisci lista</translation> </message> @@ -91711,12 +91864,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation type="unfinished">Inizio...</translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation type="unfinished">Generazione Main Window...</translation> </message>
--- a/eric6/i18n/eric6_pt.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_pt.ts Sun May 31 17:26:14 2020 +0200 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Adicionar Marcador</translation> </message> @@ -1847,7 +1847,7 @@ <translation>Pressionar para apagar as entradas selecionadas</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Apagar</translation> </message> @@ -1862,50 +1862,65 @@ <translation>Adicionar &Diretório</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>A&brir</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Abrir num &Separador Novo</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Editar &Nome</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>Edit &Address</source> <translation>Editar &Direção</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Diretório Novo</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>&Propriedades...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation>Abrir numa Nova &Janela</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation>Abrir numa Nova &Janela</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation>Abrir numa Nova Janela Pri&vada</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation>Abrir num Novo Separador de &Fundo</translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2966,15 +2981,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3451,137 +3471,137 @@ numa entrada a abrirá a janela do editor e posiciona o cursor na respectiva linha e posição.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation>Excluir Ficheiros:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Introduzir padrões dos nomes dos ficheiros a excluir separados por uma vírgula</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation>Pressionar para começar a verficação de estilo do código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation>Pressionar para corrigir os problemas selecionados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation>Pressionar para carregar os valores padrão</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation>Pressionar para armazenar os valores atuais como padrão</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation>Pressionar para repor os valores padrão</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation>Excluir Mensagens:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Introduzir as categorias ou códigos de mensagens a excluir separados por uma vírgula</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation>Pressionar para selecionar os códigos de mensagem desde uma lista</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation>Mensagens Incluídas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Introduzir categorias ou códigos de mensagem a incluir separados por uma vírgula</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation>Corrigir Problemas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Introduzir códigos de mensagem dos problemas a reparar automaticamente (deixar vazio para reparar tudo)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation>Não Corrigir Problemas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation>Introduzir códigos de mensagem dos problemas a não reparar automaticamente</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation>Comprimento Max. Linha:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>Introduzir o comprimento máximo de linha permitido (PEP-8: 79 caráteres)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation>Tipo de Docstring:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation>Selecionar o conjunto de regras para docstrings</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation>Selecionar para permitir colocação de parêntesis finais</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation>Permitir colocação de parêntesis finais</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation>Selecionar para repetir cada tipo de mensagem</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation>Repetir Mensagens</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation>Selecionar para corrigir algum problema</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation>Corrigir problemas automaticamente</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3592,52 +3612,52 @@ linha e posição.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation>Ficheiro/Linha</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation>Código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation>Mensagem</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation>Estatísticas...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation>Pressionar para mostrar algumas estatísticas da última execução</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation>Pressionar para mostrar todos os ficheiros que tenham algum problema</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> @@ -3647,290 +3667,310 @@ <translation>Corrigir: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation>Não se encontraram problemas.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation>Mostra o progresso da verificação do estilo do código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation>%v%m Ficheiros</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation>Selecionar para mostrar falhos ignorados</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation>Mostrar ignorado</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation>{0} (ignorado)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation>A preparar ficheiros...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation>Erros</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation>A transferir dados...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation>Opções Globais</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation>Opções Específicas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation>Estilo de Fonte</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished">Estilo de Documentação</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation>Linha de Código</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation>Documentações Válidas:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation>Introduzir codificações válidas separadas por uma vírgula (deixar vazio para usar o padrão)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation>Direitos de Autor</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation>Tamanho Mín. de Ficheiro:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation>Autor:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation>Introduzir o nome do autor dos direitos de autor a verificar (vazio para omitir a verificação)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation>&Iniciar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished">Pressionar para apagar as entradas selecionadas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished">Configurar</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished">Reiniciar</translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10789,12 +10829,12 @@ <translation>Retirar &Tudo</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation>Adicionar Entrada</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation>Introduzir entrada a adicionar à lista:</translation> </message> @@ -11263,7 +11303,7 @@ <translation>Desselecionar tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Verificação ortográfica...</translation> </message> @@ -11488,7 +11528,7 @@ <translation>Editar ponto de interrupção...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Habilitar pontos de interrupção</translation> </message> @@ -11663,262 +11703,262 @@ <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Inabilitar ponto de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Foram cobertas as linhas todas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Dados de Perfil</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Escolha um ficheiro de perfil por favor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Erro de Sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Não está disponível a mensagem de erro de sintaxe.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Nome de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Selecionar um nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Carregar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Ficheiros Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Erro ao carregar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não se pode ler.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>O ficheiro macro <b>{0}</b> está corrompido.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Gravar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro macro <b>{0}</b> já existe. Sobreescrever-lo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Erro ao gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não pode ser escrito.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Iniciar Registo de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>A gravação de macro já está ativada. Começar nova?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Gravação de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Introduza o nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Ficheiro alterado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Adicionar Ficheiro...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Adicionar Ficheiros...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Adicionar ficheiro com pseudónimo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Adicionar recursos localizado...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Adicionar recurso de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Adicionar recursos de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Adicionar recurso de ficheiro com pseudónimo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation>Pseudónimo para o ficheiro <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Diagrama do Pacote</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Incluir atributos de classes?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Diagrama de Imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Incluir imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Diagrama da Aplicação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Incluir nome dos módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Adicionar dicionário</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Ignorar Tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>Aviso: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Aviso:</b> Perderá todas as alterações uma vez que o volte a abrir.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> @@ -11943,27 +11983,27 @@ <translation>Alteração anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation>Ordenar Linhas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation>Não estão disponíveis mensagens de aviso.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -11988,7 +12028,7 @@ <translation>Reabrir Com Codificação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>O ficheiro <b>{0}</b> foi alterado enquanto estava aberto em eric6. Recarregar?</p></translation> </message> @@ -12013,17 +12053,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12053,12 +12093,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -17797,17 +17837,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -17825,12 +17865,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -17855,7 +17895,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -17865,47 +17905,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17938,20 +17978,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -41427,6 +41482,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -47296,27 +47359,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -47874,7 +47937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -47902,32 +47965,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished">Limpar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished">Copiar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished">Colar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -47936,212 +47999,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished">Executar Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished">desconhecido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Ficheiros Python (*.py);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -48156,50 +48219,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished">Configurar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished">Data e Hora</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -50031,50 +50114,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"><b>Introduzir nome de usuário e senha para '{0}, domínio '{1}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b>Introduzir nome de usuário e senha para '{0}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -53583,17 +53666,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> @@ -62621,22 +62704,22 @@ <translation><font color="#FF0000"><b>Nota:</b> Estas definições estarão activadas a próxima vez que arranque a aplicação.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Ferramentas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation type="unfinished"></translation> </message> @@ -62651,62 +62734,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation>Prefixo de Qt:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation>Sufixo de Qt:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -62716,7 +62789,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -62726,35 +62799,40 @@ <translation type="unfinished">Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -64581,6 +64659,21 @@ <source><b>Configure security settings</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -66535,22 +66628,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> @@ -66560,32 +66653,32 @@ <translation type="obsolete">Segurança</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished">Copiar Localização da Imagem para a Área de Transferência</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation>Gravar Imagem</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation>Ficheiros Todos (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -66600,25 +66693,30 @@ <translation type="obsolete">Rota:</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished">Carregando...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -66628,60 +66726,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -79125,7 +79228,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atalhos de Teclado</translation> </message> @@ -79145,7 +79248,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Importar Atalhos de Teclado</translation> </message> @@ -79390,7 +79493,7 @@ <translation>Definições</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Ajuda</translation> </message> @@ -79445,7 +79548,7 @@ <translation type="obsolete"><h3>Números de Versão</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></translation> </message> @@ -79502,208 +79605,208 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt 3 support</source> - <translation>Suporte Qt3</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <translation type="obsolete">Suporte Qt3</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problema</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Não há nenhum visor personalizado selecionado. Por favor use a caixa de diálogo das preferências para escolher um.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Ferramentas Externas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>A iniciar processo '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>Processo '{0}' saiu.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Falta a Documentação</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Documentação</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Ficheiro de atalhos de teclado (*.e4k)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Gravar tarefas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Ler tarefas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Guargar sessão</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Sessão de leitura</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Cancelar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Atualização disponível</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Erro na verificação de atualizações</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Não procurar atualizações.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versões Disponíveis</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Usado a primeira vez</translation> </message> @@ -79743,27 +79846,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation>Erro na obtenção da informação de versões</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation>Abrir Navegador</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation>Não se pôde iniciar um navegador web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79849,12 +79952,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation>Selecionar o Diretório de Trabalho</translation> </message> @@ -80219,7 +80322,7 @@ <translation>Abrir a Documentação de PyQt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80229,7 +80332,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation></translation> </message> @@ -80316,30 +80419,30 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt v.3 is not supported by eric6.</source> - <translation>Qt v.3 não está suportado por eric6.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <translation type="obsolete">Qt v.3 não está suportado por eric6.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Atualização a <b>{0}</b> de eric6 já está disponível em <b>{1}</b>. Quere-a descarregar?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation>Eric6 está atualizado</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation>Utiliza a última versão do eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>eric6 ainda não foi configurado. A caixa de diálogo de configuração vai iniciar-se.</translation> </message> @@ -80359,7 +80462,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -80404,7 +80507,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished">Carregar sessão</translation> </message> @@ -80419,17 +80522,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80444,17 +80547,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80509,7 +80612,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80585,17 +80688,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80694,6 +80797,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>Números de Versão</h3><table> {2>?} {2>?}</translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -86463,37 +86581,37 @@ <translation type="obsolete">Selecionar a cor de fundo para as URL seguras.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished">Imagens</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished">Marcar para carregar imagens</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished">Carregar Imagens</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished">Folha de Estilo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished">Folha de Estilo de Usuário:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished">Introduzir o nome de ficheiro de uma folha de estilo do usuário</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> @@ -86503,12 +86621,12 @@ <translation type="obsolete">Apenas mostrar um botão de fechar em vez de um por separador</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished">Selecionar para que avise quanto esteja prestes a fechar múltiplos separadores</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished">Avisar se está prestes a fechar múltiplos separadores</translation> </message> @@ -86528,37 +86646,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished">Barras de Ferramentas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -86568,13 +86686,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -87847,27 +88000,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished">Carregando...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished">Acabou de carregar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished">Falhou ao carregar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished">Tem a certeza de que quer fechar a janela?</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -87878,22 +88031,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished">Sai&r</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished">F&echar o Separador Atual</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">Restaurar Todos os Separadores Fechados</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished">Limpar Lista</translation> </message> @@ -90771,12 +90924,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation>A iniciar...</translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation>A criar a Janela Principal...</translation> </message>
--- a/eric6/i18n/eric6_ru.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_ru.ts Sun May 31 17:26:14 2020 +0200 @@ -352,7 +352,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Добавить закладку</translation> </message> @@ -1810,7 +1810,7 @@ <translation>Удалить выбранные элементы</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Удалить</translation> </message> @@ -1825,50 +1825,65 @@ <translation>Добавить &папку</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>&Открыть</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Открыть в новой &вкладке</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Редактировать &имя</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>Edit &Address</source> <translation>Редактировать &адрес</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Новая папка</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation>Открыть в новом &окне</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation>Открыть в новом &окне</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation>Открыть в новом при&ватном окне</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation>Открыть в новой &фоновой вкладке</translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation>Новая &папка...</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation>Новая папка закладок</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation>Введите заголовок новой папки закладок:</translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2911,15 +2926,20 @@ <translation>Файлы прошивки CircuitPython (*.uf2);;Все файлы (*)</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation>Выберите путь к устройству</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation><p>Не удается найти том устройства <b>{0}</b>. Находится ли устройство в режиме 'bootloader' и подмонтировано ли?</p><p>В качестве альтернативы, выберите пункт "Manual Select" и ниже введите путь к устройству.</p></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation>Manual Select</translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3285,137 +3305,137 @@ записи откроет окно редактора и поместит курсор на соответствующую строку.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation>Не включать файлы:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Задайте разделённые запятой маски файлов для исключения</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation>Запустить проверку стиля</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation>Редактировать выбранные проблемы</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation>Восстановить значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation>Сохранить текущие значения как значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation>Восстановить значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation>Не включать сообщения:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation>Задайте через запятую коды сообщений или категорий, которые не нужно включать в проверку</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation>Выбрать коды сообщений из списка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation>Включить сообщения:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation>Задайте через запятую коды сообщений или категорий, которые нужно включать в проверку</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation>Исправлять автоматически:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation>Задайте коды сообщений, которые нужно исправлять автоматически (если пусто, то исправлять всё)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation>Не исправлять:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation>Задайте коды сообщений которые не нужно исправлять автоматически</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation>Максимальная длина строки:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation>Задайте максимально допустимую длину строки (PEP-8: 79 символов)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation>Тип строки документации (docstring):</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation>Задайте набор правил для строк документации (docstring)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation>Разрешить непарные закрывающие скобки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation>Разрешить непарные закрывающие скобки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation>Разрешить повтор каждого типа сообщений</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation>Повторять сообщения</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation>Разрешить исправление некоторых проблем</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation>Автоматическое исправление ошибок</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3425,52 +3445,52 @@ по элементу откроет редактор с курсором на соответствующей строке и колонке.</p></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation>Файл/Строка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation>Код</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation>PEP-257</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation>PEP-257</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation>Статистика...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation>Показать результаты последней проверки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation>Показать</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation>Показать все файлы, содержащие ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -3480,290 +3500,310 @@ <translation>Исправлено: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation>Проблем со стилем не найдено.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation>Отображение выполнения проверки стиля</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation>%v из %m файла(ов)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> - <translation>Показать проигнорированные проблемы</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <translation>Разрешить показывать проигнорированные проблемы</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation>Показывать проигнорированные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation>{0} (проигнорировано)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation>Подготовка файлов...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation>Задайте максимально допустимую сложность кода (McCabe: 10)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation>Глобальные параметры</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation>Особые параметры</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation>Исходный стиль</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation>Стиль документации</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation>Кодировки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation>Допустимые кодировки:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation>Введите через запятую допустимые кодировки (не вводите чтобы использовать значения по умолчанию)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation>Авторское право (Copyright)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation>Мин. размер файла:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation>Укажите минимальный размер файла, которые должны быть проверены (0 для всех файлов)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation>Автор:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation>Введите имя автора для проверки авторского права (оставьте пустым чтобы не выполнять проверку)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation>Future Imports</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation>Ожидаемый импорт:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation>Сложность кода</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation>&Старт</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation>&Исправить выделенные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation>&Загрузить стандартные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation>Со&хранить как стандартные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation>&Сброс к стандартным</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation>Файлы не найдены (проверьте ваш игнор-лист).</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation>Игнорировать встроенные присвоения</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation>Левая</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation>Правая</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation>Добавить встроенное присвоение для его игнорирования</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation>Удалить выбранные записи</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation>Максимальная McCabe сложность:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation>Максимальная сложность строки:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation>Задайте максимальную сложность (количество узлов) для строки кода</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation>Максимальное значение сложности строки:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation>Задайте максимально разрешенную медиану сложности строки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation>Пустые строки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation>Классы и функции верхнего уровня:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation>Задайте количество пустых строк перед классами и функциями верхнего уровня</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation>Методы и вложенные классы и функции:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation>Задайте количество пустых строк перед методами и вложенными классами и функциями</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation>Максимальная длина строки документации:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation>Закомментированный код</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation>Разрешить более настойчивый поиск закомментированного кода. Это может увеличить количество ложных срабатываний.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation>Настойчивый поиск</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation>Аннотации типов</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation>Минимальное покрытие:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation>Задайте минимальный процент аннотиций типов</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation>выкл</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation>Максимальная сложность:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation>Задайте максимальную сложность аннотации типа</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation>Настройки</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation>Выполнено</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation>Перезапустить проверку стиля</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation>Рестарт</translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -4852,7 +4892,7 @@ <message> <location filename="../CondaInterface/CondaInfoDialog.ui" line="152"/> <source>Channel URLs:</source> - <translation>Каналы, URL'ы:</translation> + <translation>Каналы, URLs:</translation> </message> <message> <location filename="../CondaInterface/CondaInfoDialog.ui" line="165"/> @@ -10397,12 +10437,12 @@ <translation>У&далить всё</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation>Добавить запись</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation>Введите строку для добавления в список:</translation> </message> @@ -10871,7 +10911,7 @@ <translation>Снять выделение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -11096,7 +11136,7 @@ <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> @@ -11271,257 +11311,257 @@ <translation>Автодополнение недоступно, так как не задан источник автодополнения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Покрытие кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл покрытия</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по покрытию кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Все строки были охвачены.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>Нет доступного файла покрытия.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Файл с макросами <b>{0}</b> повреждён.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Макро <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Начать запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Файл изменен</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Добавить файлы...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Добавить файл под другим именем...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Добавить в словарь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> @@ -11546,27 +11586,27 @@ <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation>Сортировать строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation>Нет предупреждающего сообщения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation>Стиль: {0}</translation> </message> @@ -11591,7 +11631,7 @@ <translation>Открыть заново с кодировкой</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Файл <b>{0}</b> был изменён, будучи открытым в eric6. Перепрочесть?</p></translation> </message> @@ -11616,22 +11656,22 @@ <translation>Список дополнений источника '{0}' уже зарегистрирован. Повторный запрос проигнорирован.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation>Источник всплывающих подсказок</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Источник всплывающих подсказок '{0}' уже зарегистрирован. Повторный запрос проигнорирован.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation>Регистрация обработчика кликов мышки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Обработчик кликов мышки для "{0}" уже зарегистрирован "{1}". Запрос прерван "{2}"...</translation> </message> @@ -11661,12 +11701,12 @@ <translation>Выполнить выбор в консоли</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation>Свойства EditorConfig</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Не удается загрузить свойства EditorConfig для файла <b>{0}</b>.</p></translation> </message> @@ -17038,17 +17078,17 @@ <translation>Введите путь к файлу прошивки</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation>Файлы прошивки (*.img);;Все файлы (*)</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation>Резервное копирование прошивки</translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation>Восстановить прошивку</translation> </message> @@ -17066,12 +17106,12 @@ <translation>Очистить Flash-память</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation>Прошивка Flash MicroPython</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation>Дополнительная прошивка Flash</translation> </message> @@ -17096,7 +17136,7 @@ <translation>Неподдерживаемый тип чипа '{0}'.</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation>Вывод команды 'esptool write_flash'</translation> </message> @@ -17106,47 +17146,47 @@ <translation>Сбросить устройство</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation>Резервное копирование прошивки</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation>Восстановить прошивку</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation>Показать ID чипа</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation>Показать ID Flash</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation>Показать MAC-адрес</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation>Вывод команды 'esptool read_flash'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation>Вывод команды 'esptool chip_id'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation>Вывод команды 'esptool flash_id'</translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation>Вывод команды 'esptool read_mac'</translation> </message> @@ -17179,20 +17219,35 @@ <translation>Введите путь к файлу прошивки</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation>Адрес:</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation>Введите адрес flash-памяти в шестнадцатеричной форме</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation>Файлы прошивки (* .bin);;Все файлы (*)</translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation>Режим прошивки:</translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation>Выберите режим прошивки</translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation>Оставьте пустым для режима по умолчанию.</translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -37616,6 +37671,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation>Проигнорированные последовательные устройства</translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -43417,27 +43480,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation>Неподдерживаемое устройство</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation>REPL не поддерживается этим устройством.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation>Плоттер не поддерживается этим устройством.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation>Выполнение скриптов не поддерживается этим устройством.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation>Менеджер файлов не поддерживается этим устройством.</translation> </message> @@ -43995,7 +44058,7 @@ <translation>Открыть окно для отображения данных, полученных с выбранного устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation>Подключить выбранное устройство</translation> </message> @@ -44024,32 +44087,32 @@ <translation>Поддерживаемые устройства не обнаружены.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation>Отключить выбранное устройство</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation>Устройство не подключено</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -44062,212 +44125,212 @@ И наконец, нажмите кнопку сброса устройства и подождите несколько секунд, прежде чем повторить попытку.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation>Запустить REPL</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Неудается запустить REPL.</p><p>Причина:</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation>Подсоединение последовательного устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation><p>Не удается соединиться с устройством через последовательный порт <b>{0}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation>Выполнить скрипт</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation>Редактор не открыт. Прервать...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation>Текущий редактор не содержит скрипт. Прервать...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation><p>Не удается выполнить скрипт.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation>Открыть файл Python</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation>Файлы Python3 (*.py);;Все файлы (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation>Построить диаграмму</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Не удается построить диаграмму.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation>Несохраненные данные диаграммы</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation>Диаграмма содержит несохраненные данные.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation>Запустить менеджер файлов</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Не удается запустить менеджер файлов.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation>Показать версию</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation>Показать исполнение</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation>Синхронизировать время</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation>Показать время устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation>Показать локальное время</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation>Компилировать файл Python</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation>Компилировать текущий редактор</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation><h3>Информация о версии устройства</h3></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation>Информация о версии недоступна.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation>Информация о версии устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation>Информация о исполнении устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation><h3>Информация о исполнении устройства</h3><p>Это устройство содержит <b>{0} {1}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation><p>Время подключенного устройства было синхронизировано с локальным временем.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Дата и время устройства</h3><table><tr><td><b>Дата</b></td><td>{0}</td></tr><tr><td><b>Время</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation><h3>Дата и время устройства</h3><p>{0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation>Дата и время устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation>Локальные дата и время</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Локальные дата и время</h3><table><tr><td><b>Дата</b></td><td>{0}</td></tr><tr><td><b>Время</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation>Ошибка обработки устройства</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation><p>Произошла ошибка связи с подключенным устройством.</p><p>Метод: {0}</p><p>Сообщение: {1}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation>Кросс-компилятор MicroPython <b>mpy-cross</b> не найден. Убедитесь, что он находится в пути поиска, или настройте его на странице конфигурации MicroPython.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Файлы Python (*.py);;Все файлы (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation>Файл Python <b>{0}</b> не существует. Отмена...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation>Вывод команды 'mpy-cross'</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation>Текущий редактор не содержит файл Python. Отмена...</translation> </message> @@ -44282,50 +44345,70 @@ <translation>Открыть менеджер файлов на выбранном устройстве</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation>µPy диаграммы</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation>µPy файлы</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation>Обзор документации</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation>Настройки</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation>Показать время</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation>Загрузить прошивку</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation>Дата и время</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation><table><tr><th></th><th>Дата и время локальные</th><th>Дата и время устройства</th></tr><tr><td><b>Дата</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Время</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation><table><tr><th>Дата и время локальные</th><th>Дата и время устройства</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation>Неизвестное устройство MicroPython</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation><p>Обнаружены следующие последовательные устройства</p><ul><li>{0}</li></ul><p>Если это платы MicroPython, то, пожалуйста, сообщите о них вместе с названием платы и их кратким описанием по адресу для<a href="mailto:eric-bugs@eric-ide.python-projects.org"> сообщений об ошибах eric </a>.</p></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation>{0} ({1:04x}/{2:04x})</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation>Проигнорированные последовательные устройства</translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -46163,50 +46246,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation>Ошибка сертификата SSL</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation><b>{0}</b><p>Страница, к которой вы пытаетесь получить доступ, имет ошибки сертификата SSL.</p><ul><li>{1}</li></ul><p>Хотите сделать исключение?</p></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation>Принимать &всегда</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation>Принимать вр&еменно</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation>&Отвергать</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Введите имя пользователя и пароль для '{0}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation>Требуется аутентификация</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation>Для доступа требуется аутентификация:</translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation><b>{0}</b><p>Хост <b>{1}</b>, к которому вы пытаетесь обратиться, содержит ошибки сертификата SSL.</p><ul><li>{2}</li></ul><p>Хотите сделать исключение?</p></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -49591,17 +49674,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation> </message> @@ -58770,22 +58853,22 @@ <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Инструменты Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Имя исполняемого файла программы состоит из префикса, имени программы и постфикса. Для windows же расширение добавляется автоматически.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Пример полного имени инструмента</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>designer</translation> </message> @@ -58800,67 +58883,52 @@ <translation>Задайте путь к директории переводов Qt.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation><b>Примечание:</b> Оставьте эту строку пустой, чтобы использовать переменную среды окружения или путь в библиотеку Qt. Поддерживаются переменные сред окружения -<ul> -<li>QT4TRANSLATIONSDIR для Qt4</li> -<li>QT5TRANSLATIONSDIR для Qt5</li> -<li>QTTRANSLATIONSDIR для любого варианта Qt</li> -</ul></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation>Qt-префикс:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation>Задайте префикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation>Qt-постфикс:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation>Задайте постфикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation>Ширина отступа:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation>Задайте ширину отступа (по умолчанию: 4)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation>Генерировать импорт относительно '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation>Директория инструментов:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Задайте путь к директории инструментов Qt, если они не найдены.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation>Задайте путь к директории инструментов PyQT, если они не найдены.</translation> </message> @@ -58870,7 +58938,7 @@ <translation>Например: {0}designer{1}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation>Задайте путь к директории инструментов PySide2, если они не найдены.</translation> </message> @@ -58880,35 +58948,40 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation>PyQt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation>Опции pyuic</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation>Разрешить генерировать дополнительный код для тестирования и отображения формы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation>Генерировать дополнительный тестовый код</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation>PySide2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation>Опции pyside2-uic</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation><b>Примечание:</b> Оставьте это поле пустым чтобы использовать подготовленный путь к библиотеке Qt.</translation> + </message> </context> <context> <name>Queues</name> @@ -60759,7 +60832,7 @@ <message> <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="55"/> <source>Select to use a master password</source> - <translation>Использовать мастер-пароль</translation> + <translation>Разрешить использовать мастер-пароль</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="58"/> @@ -60781,6 +60854,21 @@ <source><b>Configure security settings</b></source> <translation><b>Настройка безопасности</b></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation>Ошибки сертификата</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation>Разрешить всегда отклонять вебстраницы с проблемами сертификаты</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation>Всегда отклонять URL-адреса с ошибками сертификата</translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -62744,75 +62832,80 @@ <translation><b>Информация о безопасности</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation>Мультимедиа</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation>Изображение</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation>Адрес изображения</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation><b>Предварительный просмотр</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation>Предварительный просмотр не возможен.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation>Копировать адрес изображения в буфер</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation>Копировать имя изображения в буфер</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation>Сохранить изображение</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation>Все файлы (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation><p>Невозможно записать в файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation>Загрузка...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation><p>Предварительный просмотр недоступен.</p></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation><b>Соединение зашифровано.</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation><b>Соединение не зашифровано.</b></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation><b>Соединение зашифровано, но может быть небезопасно.</b></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -62822,60 +62915,65 @@ <translation><b>Сайт {0}</b></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation>Ваше соединение с этим сайтом <b>защищено</b>.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation>Ваше соединение с этим сайтом <b>не защищено</b>.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation>Это ваше <b>{0}.</b> посещение этого сайта.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation>Вы <b>никогда</b> не посещали этот сайт раньше.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation>первое</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation>второе</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation>третье</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation>Это ваше <b>{0}</b> посещение этого сайта.</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation>Регистрация как <b>{0}</b> обработчик ссылок.</translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation>Регистрация как <b>{0}</b> обработчик ссылок.</translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation>Регистрация</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation>Еще...</translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation>Ваше подключение к этому сайту <b> может быть небезопасным </b>.</translation> + </message> </context> <context> <name>SnapWidget</name> @@ -75356,7 +75454,7 @@ <translation><b>Горячие клавиши</b><p>Определите горячие клавиши приложения согласно вашим предпочтениям.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Экспорт горячих клавиш</translation> </message> @@ -75377,7 +75475,7 @@ <p>Экспортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Импорт горячих клавиш</translation> </message> @@ -75624,7 +75722,7 @@ <translation>Настройки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Справка</translation> </message> @@ -75674,7 +75772,7 @@ <translation>Внешние инструменты/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -75724,211 +75822,206 @@ <translation>Ск&рыть всё</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt 3 support</source> - <translation>Поддержка Qt3</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Проблема</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Файл <b>{0}</b> либо не существует, либо нулевой длины.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Designer.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Linguist.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Assistant.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>В настоящее время просмотрщик пользователя не выбран. Используйте диалог предпочтений для его выбора.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить пользовательский просмотрщик.<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Невозможно запустить просмотрщик справки.<br>Убедитесь, что он доступен под именем <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить UI Previewer (предпросмотр интерфейсов).<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Translation Previewer (предпросмотр переводов).<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить SQL браузер.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Внешние инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Запись для внешнего инструмента '{0}' не найдена в группе инструментов '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation>Запись для группы инструментов '{0}' не найдена.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>Запускается процесс '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Невозможно запустить инструмент <b>{0}</b>.<br>Убедитесь, что он доступен в <b>{1}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>Процесс '{0}' завершен. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Документация отсутствует</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Стартовый каталог документации "<b>{0}</b>" не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Документация</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>Стартовый каталог документации PyQt4 не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Файл горячих клавиш (*.e4k)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Сохранить задачи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Прочитать задачи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл задач: <b>{0}</b></p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно записать файл сессии <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл сессии <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>От&мена</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation>Подключение к хосту {0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Обновления доступны</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Ошибка при проверке обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Невозможно запустить проверку обновлений.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Доступные версии</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>Первое использование</translation> </message> @@ -75968,27 +76061,27 @@ <translation><b>Документация Python 2</b><p>Показать документацию Python 2. Если местонахождение документации не было настроено, то искать в директории <i>doc</i> каталога где находится исполняемый файл Python 2 под Windows и в директории <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной среды окружения PYTHON2DOCDIR.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation>Ошибка при получении информации о версии</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>Невозможно загрузить информацию о версии. Пожалуйста попробуйте ещё раз.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation>Открыть браузер</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation>Невозможно запустить web-браузер</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>Невозможно загрузить информацию о версии в течении последних 7 дней. Пожалуйста попробуйте ещё раз.</translation> </message> @@ -76074,12 +76167,12 @@ <translation><b>Снимки</b><p>Сделать снимок области экрана.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить программу для создания снимка экрана.<br>Убедитесь что она установлена как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation>Выбор директории рабочей области</translation> </message> @@ -76444,7 +76537,7 @@ <translation>Открыть документацию PyQt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><p>Стартовый каталог документации PyQt5 не задан.</p></translation> </message> @@ -76454,7 +76547,7 @@ <translation><b>Документация Python 3</b><p>Показать документацию Python 3. Если местонахождение документации не было настроено, то искать в директории <i>doc</i> каталога где находится исполняемый файл Python 3 под Windows и в директории <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной среды окружения PYTHON3DOCDIR.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -76474,7 +76567,7 @@ <translation><b>Показать журнал ошибок...</b><p>Показать журнал ошибок.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation>Проверка версии</translation> </message> @@ -76544,27 +76637,22 @@ <translation><b>Документация API eric</b><p>Показать документацию API eric. Местонахождение документации - каталог Documentation/Source, расположенный в директории инсталляции eric6.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5062"/> - <source>Qt v.3 is not supported by eric6.</source> - <translation>eric6 не поддерживает Qt3.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>На сайте <b>{1}</b> доступно обновление eric6 до версии <b>{0}</b>. Загрузить?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation>Eric6 не требует обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation>Вы используете самую последнюю версию eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>Настройка eric6 ещё не выполнена. Сейчас будет запущен диалог конфигурации.</translation> </message> @@ -76584,7 +76672,7 @@ <translation>Инструменты пользователя не сконфигурированы</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>Невозможно загрузить информацию о версии потому что вы <b>не в сети</b>. Пожалуйста, подключитесь к интернету и повторите попытку.</translation> </message> @@ -76629,7 +76717,7 @@ <translation><b>Сохранить сессию...</b><p>Позволяет сохранить текущую сессию на диск. Открывается диалог для выбора имени файла.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation>Загрузить сессию</translation> </message> @@ -76644,17 +76732,17 @@ <translation><b>Загрузить сессию...</b><p>Позволяет загрузить сессию, ранее сохраненную на диске. Открывается диалог для выбора имени файла.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation>Файлы сессии eric6 (*.e5s)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation>Обнаружена crash-сессия!</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation>Найден файл crashed-сессии. Должна ли эта сессия быть восстановлена?</translation> </message> @@ -76669,18 +76757,18 @@ <translation>Инициализация плагинов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation>Проверка обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Eric установлен непосредственно из исходного кода. Невозможно проверить наличие обновлений.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Вы используете промежуточный релиз eric6. Возможно на сайте доступна и более свежий стабильный релиз.</translation> </message> @@ -76735,7 +76823,7 @@ <translation><b>Документация PySide2</b><p>Отображение документации PySide2. В зависимости от ваших настроек это может быть отображение справки либо во встроенных средствах просмотра справки Eric-вьюере/web-браузере, либо в Qt Assistant, либо во внешнем web-браузере. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><p>Просмотр документации PySide{0} не настроен.</p></translation> </message> @@ -76811,17 +76899,17 @@ <translation><b>Рестарт IDEE</b><p>Перезапуск среды IDE. Любые несохраненные изменения сохраняются в первую очередь. Любая программа Python, находящаяся в процессе отладки, будет остановлена, предпочтения будут записаны на диск.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation>Запуск web-браузера</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation>Невозможно запустить eric6 web-браузер.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>Eric6 web-браузер не запущен.</p><p>Причина: {0}</p></translation> </message> @@ -76920,6 +77008,21 @@ <source><h2>Version Numbers</h2><table></source> <translation><h2>Номера версий</h2><table></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>Не удается найти исполняемый файл Qt-Designer.<br>На странице настройки Qt убедитесь, что он установлен и дополнительно настроен.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>Не удается найти исполняемый файл Qt-Linguist.<br>На странице настройки Qt убедитесь, что он установлен и дополнительно настроен.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation><p>Не удается найти исполняемый файл Qt-Assistant.<br>На странице настройки Qt убедитесь, что он установлен и дополнительно настроен.</p></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -82702,47 +82805,47 @@ <translation>Минимальный размер логического шрифта:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation>Изображения</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation>Разрешить загрузку изображений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation>Загружать изображения</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation>Страница стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation>Таблица стилей пользователя:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation>Задайте имя файла таблицы стилей пользователя</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation>Вкладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation>Разрешить предупреждения, если возможно закрытие нескольких вкладок</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation>Предупреждать, если возможно закрытие нескольких вкладок</translation> </message> @@ -82762,37 +82865,37 @@ <translation>Выбор пиктографического шрифта</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation>Панели инструментов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation>Разрешить отображение панелей инструментов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation>Показывать панели инструментов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation>Полосы прокрутки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation>Разрешить показывать полосу прокрутки. Примечание: Прокрутка возможна даже без них.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation>Показывать полосы прокрутки</translation> </message> @@ -82802,15 +82905,50 @@ <translation>Цвет</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation>Цвет фона защищенных URL:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> <source>Select the background color for secure URLs.</source> <translation>Выберите цвет фона безопасных URL-адресов.</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> + <source>URL Entry Background</source> + <translation>Фон ввода URL-адресов</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation>Безопасные URL-адреса:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation>Небезопасные URL-адреса:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation>Выберите цвет фона небезопасных URL-адресов.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation>Вредоносные URL-адреса:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation>Выберите цвет фона вредоносных URL-адресов.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation>Приватный режим:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> + <translation>Выберите цвет фона URL-адресов для приватного режима.</translation> + </message> </context> <context> <name>WebBrowserClearPrivateDataDialog</name> @@ -84094,27 +84232,27 @@ <translation>...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation>Загрузка...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation>Загрука не удалась</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation>Вы действительно хотите закрыть окно?</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -84127,22 +84265,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation>&Закрыть текущую вкладку</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation>Восстановить все закрытые вкладки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation>Очистить список</translation> </message> @@ -84335,7 +84473,7 @@ <message> <location filename="../WebBrowser/WebBrowserView.py" line="1025"/> <source>Google Translate</source> - <translation>Переводчик Гугл</translation> + <translation>Переводчик Google</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="909"/> @@ -86979,12 +87117,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message>
--- a/eric6/i18n/eric6_tr.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_tr.ts Sun May 31 17:26:14 2020 +0200 @@ -375,7 +375,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>Yerimi Ekle</translation> </message> @@ -1825,7 +1825,7 @@ <translation>Seçilen girişi silmek için basınız</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>&Sil</translation> </message> @@ -1840,50 +1840,65 @@ <translation>Dizin &Ekle</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>&Aç</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>Yeni Se&kmede Aç</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>Adı Düze&nle</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>Edit &Address</source> <translation>&Adresi Düzenle</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>Yeni Dizin</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation type="unfinished">&Özellikler...</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2945,15 +2960,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3347,137 +3367,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation type="unfinished">Dışarda Tutulan Dosyalar:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished">Dosyaadılarını virgül ile ayırarak giriniz</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3485,52 +3505,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation type="unfinished">Dosya/Satır</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation type="unfinished">Kod</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation type="unfinished">Mesaj</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation type="unfinished">Göster</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation type="unfinished">Hata: {0}</translation> </message> @@ -3540,290 +3560,310 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation type="unfinished">Sorun bulunamadı.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished">Hatalar</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished">Yazar:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished">Ba&şlat</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished">Left</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished">Right</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished">Seçilen girişi silmek için basınız</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished">Yapılandırma</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10635,12 +10675,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -11109,7 +11149,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>Yazım Kontrolü...</translation> </message> @@ -11334,7 +11374,7 @@ <translation>Bekleme noktasını düzenle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>Beklemenoktasını etkinleştir</translation> </message> @@ -11504,237 +11544,237 @@ <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>Tüm satırlar korumaya alındı.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Makro dosyası <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Makro dosyası <b>{0}</b> bozuk.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Makro dosyası <b>{0}</b> yazılamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>Dosya ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>Dosyaları ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>Kısaltmalar dosyasına ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>Yaral kaynak ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation><b>{0} dosyası için takma ad</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>Şemayı İçe Aktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>Hepsini Yoksay</translation> </message> @@ -11744,22 +11784,22 @@ <translation><p><b>{0}</b> dosyası halen mevcut. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>Dikkat: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Makro dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11784,27 +11824,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation type="unfinished">Dikkat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11829,7 +11869,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Eric5 ile açıldıktan sonra <b>{0}</b> dosyasında değişiklik olmuş. Yeniden açılsın mı?</p> {0}?} {6.?}</translation> </message> @@ -11854,22 +11894,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11899,12 +11939,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -17475,17 +17515,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -17503,12 +17543,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -17533,7 +17573,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -17543,47 +17583,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17616,20 +17656,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -40583,6 +40638,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -46496,27 +46559,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -47074,7 +47137,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -47102,32 +47165,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished">Temizle</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished">Yapıştır</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -47136,212 +47199,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished">Betiği Çalıştır</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Python Dosyaları (*.py);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47356,50 +47419,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished">Yapılandırma</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -49231,50 +49314,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished">Sürekli kabul &P</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished">Geçicikabul &T</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished">&Reddet</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"><b> '{1}' alanı, '{0}' için kullanıcı adı ve parola giriniz</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b> '{0}' için kullanıcı adını ve parolayı giriniz</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -52755,17 +52838,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -61807,22 +61890,22 @@ <translation><font color="#FF0000"><b>Not:</b> Bu ayarlamalar uygulamanın bir sonraki çalıştırılmasında aktif hale geçecektir.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>QT Araçları</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>çalışabilen araçların kendiliğinden oluşan ön eki. başarı için, kendiliğinden eklenir.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>Bu tüm araç isimlerinin bir örneğini verir</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>dizayncı</translation> </message> @@ -61837,62 +61920,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -61902,7 +61975,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -61912,35 +61985,40 @@ <translation type="unfinished">Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -63767,6 +63845,21 @@ <source><b>Configure security settings</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -65723,52 +65816,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation type="unfinished">Görüntünün Yerini Panoya kopyala</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation type="unfinished">Görüntüyü Kaydet</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation type="unfinished">Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -65783,25 +65876,30 @@ <translation type="obsolete">Yol:</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished">Yükleniyor...</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -65811,60 +65909,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -78278,7 +78381,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>Kılavye Kısa Yollarını Dışa Aktar</translation> </message> @@ -78298,7 +78401,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>Klavye kısayollarını İçe Aktar</translation> </message> @@ -78543,7 +78646,7 @@ <translation>Ayarlar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>Yardım</translation> </message> @@ -78598,7 +78701,7 @@ <translation type="obsolete"><h3>Sürüm Numaraları</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -78655,202 +78758,202 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt 3 support</source> - <translation>Qt3 Desteği</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <translation type="obsolete">Qt3 Desteği</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>Problem</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Hali hazırda kullanıcı göstericisi seçilmedi. Lütfen .birini belirlemek için özellikler diyaloğunu kullanının.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>Harici Araçlar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>Eksik Belgeleme</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>Belgeleme</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>PyQt4 Belgelerinin başlama noktası ayarlanmamış.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>Görevleri kaydet</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>Görevler Okunuyor</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>Oturumu kaydet</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>Oturumu oku</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>&Vazgeç</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>Güncelleme mümkün değil</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>Güncellemeleri kontrol esnasında hata</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>Güncellemelere ulaşamıyorum.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>Mümkün sürümler</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>İlk kullanım</translation> </message> @@ -78910,32 +79013,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79021,12 +79124,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -79391,7 +79494,7 @@ <translation type="unfinished">PyQt4 Begelerini aç {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>PyQt4 Belgelerinin başlama noktası ayarlanmamış.</p> {5 ?}</translation> </message> @@ -79401,7 +79504,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -79421,7 +79524,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -79493,25 +79596,25 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt v.3 is not supported by eric6.</source> - <translation type="unfinished">Qt v.3 eric5 tarafından desteklenmiyor. {3 ?} {6.?}</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <translation type="obsolete">Qt v.3 eric5 tarafından desteklenmiyor. {3 ?} {6.?}</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">Eric5 henüz ayarlanmadı. Ayarlar Diyaloğu başlatılıyor. {6 ?}</translation> </message> @@ -79531,7 +79634,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79576,7 +79679,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished">Oturum yükleniyor</translation> </message> @@ -79591,17 +79694,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -79616,17 +79719,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -79681,7 +79784,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -79757,17 +79860,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -79866,6 +79969,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>Sürüm Numaraları</h3><table> {2>?} {2>?}</translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -85653,37 +85771,37 @@ <translation type="obsolete">Güvenli URL'nin arkaalan rengini seçiniz.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished">Görüntüler</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished">Yüklenecek görüntüleri seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished">Görüntüleri yükle</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished">Sayfa Stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished">Kullanıcı Sayfa Stili:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished">Sekmeler</translation> </message> @@ -85693,12 +85811,12 @@ <translation type="obsolete">Her bir sekmede bir tane yerine tek bir kapatma düğmesi göster</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished"></translation> </message> @@ -85718,37 +85836,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"><font color="#FF0000"><b>Not:</b> Bu ayarlamalar uygulamanın bir sonraki çalıştırılmasında aktif hale geçecektir.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished">Araççubuğu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -85758,13 +85876,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -87036,27 +87189,27 @@ <translation type="unfinished">...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished">Yükleniyor...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished">Yükleme bitirildi</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished">Yüklerken başarısız olundu</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -87065,22 +87218,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished">&Çıkış</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -89979,12 +90132,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation type="unfinished">Anapencere üretiliyor...</translation> </message>
--- a/eric6/i18n/eric6_zh_CN.ts Sat May 02 14:04:18 2020 +0200 +++ b/eric6/i18n/eric6_zh_CN.ts Sun May 31 17:26:14 2020 +0200 @@ -385,7 +385,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="201"/> <source>Add Bookmark</source> <translation>添加书签</translation> </message> @@ -1845,32 +1845,32 @@ <translation>添加文件夹(&F)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>&Open</source> <translation>打开(&O)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> <source>Open in New &Tab</source> <translation>在新选项卡中打开(&T)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>Edit &Name</source> <translation>编辑名称(&N)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> - <source>Edit &Address</source> - <translation>编辑地址(&A)</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> + <source>Edit &Address</source> + <translation>编辑地址(&A)</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="174"/> <source>&Delete</source> <translation>删除(&D)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="343"/> <source>New Folder</source> <translation>新文件夹</translation> </message> @@ -1880,25 +1880,40 @@ <translation>点击删除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="178"/> <source>&Properties...</source> <translation>属性(&P)…</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> - <source>Open in New &Window</source> - <translation type="unfinished">在新窗口中打开(&W)</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New &Window</source> + <translation type="unfinished">在新窗口中打开(&W)</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="165"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="182"/> + <source>New &Folder...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>New Bookmark Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="335"/> + <source>Enter title for new bookmark folder:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksImportDialog</name> @@ -2956,15 +2971,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/> + <source>Manual Select</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ClearPrivateDataDialog</name> @@ -3364,137 +3384,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="50"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="48"/> <source>Exclude Files:</source> <translation type="unfinished">排除文件：</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="57"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="55"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished">输入要排除文件的文件名样式，用逗号分隔</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="828"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="840"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="985"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="863"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="873"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="861"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="871"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="64"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="62"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="71"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="69"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="141"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="139"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="83"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="90"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="104"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="111"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="263"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="298"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="296"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="423"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="432"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="406"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="150"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="148"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="151"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="161"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="166"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="164"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="904"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3502,52 +3522,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="920"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="914"/> <source>File/Line</source> <translation type="unfinished">文件/行</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="925"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="919"/> <source>Code</source> <translation type="unfinished">代码</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="930"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="924"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> - <source>PEP-257</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="81"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="88"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="90"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="91"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="94"/> <source>Show</source> <translation type="unfinished">显示</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="96"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="647"/> <source>Error: {0}</source> <translation type="unfinished">错误：{0}</translation> </message> @@ -3557,290 +3577,310 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="778"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="789"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="951"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="945"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="960"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="954"/> <source>%v/%m Files</source> <translation type="unfinished">%v/%m 文件</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="177"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="730"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="740"/> <source>{0} (ignored)</source> <translation type="unfinished">{0}（已忽略）</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="632"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="680"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="678"/> <source>Enter the maximum allowed code complexity (McCabe: 10)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="159"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="664"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="674"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="42"/> <source>Global Options</source> <translation type="unfinished">全局选项</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="215"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="213"/> <source>Specific Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="257"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="255"/> <source>Source Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="419"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="417"/> <source>Documentation Style</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="455"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="453"/> <source>Coding Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="461"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="459"/> <source>Valid Encodings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="466"/> <source>Enter valid encodings separated by a comma (leave empty to use defaults)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="478"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="476"/> <source>Copyright</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="484"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="482"/> <source>Min. File Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="491"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="489"/> <source>Enter the minimum size a file must have to be checked (0 for all files)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="517"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="515"/> <source>Author:</source> <translation type="unfinished">作者：</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="522"/> <source>Enter a copyright author name to check for (leave empty to omit this check)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="534"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="532"/> <source>Future Imports</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="538"/> <source>Expected Imports:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="654"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="652"/> <source>Code Complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="831"/> <source>&Start</source> <translation type="unfinished">开始(&S)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="843"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="988"/> <source>&Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="866"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="854"/> <source>&Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="876"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="864"/> <source>St&ore Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="886"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="874"/> <source>&Reset Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="781"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="792"/> <source>No files found (check your ignore list).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="564"/> <source>Ignore Built-ins Assignment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="582"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="580"/> <source>Left</source> <translation type="unfinished">Left</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="585"/> <source>Right</source> <translation type="unfinished">Right</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="595"/> <source>Press to add a built-in assignment to be ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="605"/> <source>Press to delete the selected entries</source> <translation type="unfinished">点击删除选中的条目</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="671"/> <source>Max. McCabe Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="694"/> <source>Max. Line Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="703"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="701"/> <source>Enter the maximum complexity (number of nodes) for a line of code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="717"/> <source>Max. Line Complexity Score:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="726"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="724"/> <source>Enter the maximum allowed median for line complexity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="332"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Blank Lines Before</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="338"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="336"/> <source>Top Level Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="345"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Enter the number of blank lines before top level classes and functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="375"/> <source>Methods and Nested Classes and Functions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="382"/> <source>Enter the number of blank lines before methods and nested classes or functions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="289"/> <source>Max. Documentation Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="635"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="633"/> <source>Commented Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="639"/> <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="642"/> <source>Search aggressively</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="745"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="743"/> <source>Type Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="751"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="749"/> <source>Min. Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="756"/> <source>Enter the minimum percentage of type annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="759"/> <source>off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="764"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="762"/> <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="785"/> <source>Max. Complexity:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="792"/> <source>Enter the maximum type annotation complexity</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="32"/> + <source>Configure</source> + <translation type="unfinished">配置</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="884"/> + <source>Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="975"/> + <source>Press to restart the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="978"/> + <source>Restart</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -10570,12 +10610,12 @@ <translation>移除全部(&E)</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Add Entry</source> <translation>添加条目</translation> </message> <message> - <location filename="../E5Gui/E5StringListEditWidget.py" line="90"/> + <location filename="../E5Gui/E5StringListEditWidget.py" line="100"/> <source>Enter the entry to add to the list:</source> <translation type="unfinished"></translation> </message> @@ -11039,7 +11079,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7847"/> + <location filename="../QScintilla/Editor.py" line="7848"/> <source>Check spelling...</source> <translation>正在进行拼写检查…</translation> </message> @@ -11259,7 +11299,7 @@ <translation>编辑断点…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5615"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -11384,207 +11424,207 @@ <translation>自动完成无效，没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5618"/> + <location filename="../QScintilla/Editor.py" line="5619"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5993"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6049"/> + <location filename="../QScintilla/Editor.py" line="6050"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6056"/> + <location filename="../QScintilla/Editor.py" line="6057"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6173"/> + <location filename="../QScintilla/Editor.py" line="6174"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6335"/> + <location filename="../QScintilla/Editor.py" line="6336"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6726"/> + <location filename="../QScintilla/Editor.py" line="6727"/> <source>Select a macro name:</source> <translation>选择一个宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6843"/> + <location filename="../QScintilla/Editor.py" line="6844"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6869"/> + <location filename="../QScintilla/Editor.py" line="6870"/> <source>Enter name of the macro:</source> <translation>输入宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7009"/> + <location filename="../QScintilla/Editor.py" line="7010"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7341"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7343"/> + <location filename="../QScintilla/Editor.py" line="7344"/> <source>Add file...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7345"/> + <location filename="../QScintilla/Editor.py" line="7346"/> <source>Add files...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7347"/> + <location filename="../QScintilla/Editor.py" line="7348"/> <source>Add aliased file...</source> <translation>添加别名文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7351"/> <source>Add localized resource...</source> <translation>添加本地资源…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7354"/> + <location filename="../QScintilla/Editor.py" line="7355"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7373"/> + <location filename="../QScintilla/Editor.py" line="7374"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7389"/> + <location filename="../QScintilla/Editor.py" line="7390"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7483"/> <source>Include class attributes?</source> <translation>包含类属性？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7504"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7518"/> + <location filename="../QScintilla/Editor.py" line="7519"/> <source>Include module names?</source> <translation>包含模块名？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7851"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7852"/> + <location filename="../QScintilla/Editor.py" line="7853"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -11624,32 +11664,32 @@ <translation><p>文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6768"/> + <location filename="../QScintilla/Editor.py" line="6769"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6777"/> + <location filename="../QScintilla/Editor.py" line="6778"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7179"/> + <location filename="../QScintilla/Editor.py" line="7180"/> <source>{0} (ro)</source> <translation>{0}（只读）</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7320"/> + <location filename="../QScintilla/Editor.py" line="7321"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7417"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -11679,22 +11719,22 @@ <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6814"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>宏文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6614"/> + <location filename="../QScintilla/Editor.py" line="6615"/> <source>Warning: {0}</source> <translation>警告：{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6622"/> <source>Error: {0}</source> <translation>错误：{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7005"/> + <location filename="../QScintilla/Editor.py" line="7006"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>警告：</b>您在重新打开时将丢失所有更改。</translation> </message> @@ -11719,27 +11759,27 @@ <translation>上一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8268"/> + <location filename="../QScintilla/Editor.py" line="8269"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6549"/> + <location filename="../QScintilla/Editor.py" line="6550"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6611"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11764,7 +11804,7 @@ <translation>使用指定编码重新打开</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7000"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -11789,22 +11829,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5185"/> + <location filename="../QScintilla/Editor.py" line="5186"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8357"/> + <location filename="../QScintilla/Editor.py" line="8358"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11834,12 +11874,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8478"/> + <location filename="../QScintilla/Editor.py" line="8479"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -17545,17 +17585,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/> <source>Firmware Files (*.img);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> + <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> @@ -17573,12 +17613,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="211"/> + <location filename="../MicroPython/EspDevices.py" line="217"/> <source>Flash MicroPython Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="236"/> + <location filename="../MicroPython/EspDevices.py" line="248"/> <source>Flash Additional Firmware</source> <translation type="unfinished"></translation> </message> @@ -17603,7 +17643,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>'esptool write_flash' Output</source> <translation type="unfinished"></translation> </message> @@ -17613,47 +17653,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>Backup Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="297"/> + <location filename="../MicroPython/EspDevices.py" line="309"/> <source>Restore Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>Show Chip ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>Show Flash ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>Show MAC Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="263"/> + <location filename="../MicroPython/EspDevices.py" line="275"/> <source>'esptool read_flash' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="315"/> + <location filename="../MicroPython/EspDevices.py" line="327"/> <source>'esptool chip_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="332"/> + <location filename="../MicroPython/EspDevices.py" line="344"/> <source>'esptool flash_id' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspDevices.py" line="349"/> + <location filename="../MicroPython/EspDevices.py" line="361"/> <source>'esptool read_mac' Output</source> <translation type="unfinished"></translation> </message> @@ -17686,20 +17726,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/> <source>Address:</source> <translation type="unfinished">地址：</translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/> <source>Enter the flash addres in the hexadecimal form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/> + <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/> <source>Firmware Files (*.bin);;All Files (*)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/> + <source>Flash Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/> + <source>Select the flash mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/> + <source>Leave empty to use the default mode.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ExceptionLogger</name> @@ -41066,6 +41121,14 @@ </message> </context> <context> + <name>IgnoredDevicesDialog</name> + <message> + <location filename="../MicroPython/IgnoredDevicesDialog.ui" line="14"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImageMarkupDialog</name> <message> <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="52"/> @@ -47042,27 +47105,27 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="214"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="223"/> <source>Unsupported Device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="224"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="233"/> <source>REPL is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="252"/> <source>Plotter is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="262"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="271"/> <source>Running scripts is not supported by this device.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="282"/> + <location filename="../MicroPython/MicroPythonDevices.py" line="291"/> <source>File Manager is not supported by this device.</source> <translation type="unfinished"></translation> </message> @@ -47620,7 +47683,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="460"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="493"/> <source>Press to connect the selected device</source> <translation type="unfinished"></translation> </message> @@ -47647,32 +47710,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="430"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="463"/> <source>Clear</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="432"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="465"/> <source>Copy</source> <translation type="unfinished">复制</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="433"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="466"/> <source>Paste</source> <translation type="unfinished">粘贴</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="455"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="488"/> <source>Press to disconnect the current device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>No device attached</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="476"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="509"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -47681,212 +47744,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source>Start REPL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="536"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="893"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="926"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source>Run Script</source> <translation type="unfinished">运行脚本</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="954"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="929"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="962"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="938"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="971"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="961"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1038"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1034"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1067"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1085"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1118"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1136"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1139"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1172"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1147"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1180"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1150"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1183"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1461"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1497"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1481"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1517"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1188"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1233"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1235"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1222"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1262"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1250"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1286"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1272"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1308"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1280"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1330"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1343"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1410"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1413"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1449"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1431"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1467"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1441"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1477"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1451"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1487"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1474"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1510"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47901,50 +47964,70 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1018"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1098"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1174"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1207"/> <source>Show Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1178"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1214"/> <source>Configure</source> <translation type="unfinished">配置</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1153"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> <source>Show Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1203"/> <source>Download Firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source>Date and Time</source> <translation type="unfinished">日期和时间</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1333"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1369"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1350"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1386"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>Unknown MicroPython Device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:eric-bugs@eric-ide.python-projects.org"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="336"/> + <source>{0} ({1:04x}/{2:04x})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1211"/> + <source>Ignored Serial Devices</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MicrobitDevice</name> @@ -49771,50 +49854,50 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="195"/> - <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Permanent accept</source> <translation type="unfinished">永久接受(&P)</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/> <source>&Temporary accept</source> <translation type="unfinished">临时接受(&T)</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/> <source>&Reject</source> <translation type="unfinished">拒绝</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b>输入“{0}”的用户名和密码</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/> + <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NetworkPage</name> @@ -53406,17 +53489,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1640"/> + <location filename="../Preferences/__init__.py" line="1645"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1668"/> + <location filename="../Preferences/__init__.py" line="1673"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> @@ -62547,17 +62630,17 @@ <translation><b>配置 Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> <source>Qt Tools</source> <translation>Qt 工具</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="164"/> <source>This gives an example of the complete tool name</source> <translation>这里给出了完整工具名称的一个范例</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="167"/> <source>designer</source> <translation>设计师</translation> </message> @@ -62567,7 +62650,7 @@ <translation><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="118"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> @@ -62582,32 +62665,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> - <source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="144"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="151"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -62617,32 +62690,32 @@ <translation type="obsolete">pyuic / pyside-uic 选项</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>Indent Width:</source> <translation>缩进宽度：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="228"/> <source>Select the indent width (default: 4)</source> <translation>缩进宽度（默认值：4）</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="291"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="206"/> <source>Enter the path of the PyQt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -62652,7 +62725,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="307"/> <source>Enter the path of the PySide2 tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> @@ -62662,35 +62735,40 @@ <translation type="unfinished">Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="182"/> <source>PyQt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="215"/> <source>pyuic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="267"/> <source>Select to generate extra code to test and display the form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="270"/> <source>Generate Extra Test Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="283"/> <source>PySide2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="316"/> <source>pyside2-uic Options</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/> + <source><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -64532,6 +64610,21 @@ <source><b>Configure security settings</b></source> <translation><b>配置安全设置</b></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/> + <source>Certificate Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/> + <source>Select to always reject web pages with certificate issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/> + <source>Always reject URLs with certificate errors</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendRefererWhitelistDialog</name> @@ -66492,22 +66585,22 @@ <translation type="obsolete">详情</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="168"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="171"/> <source>Media</source> <translation>媒体</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="184"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="187"/> <source>Image</source> <translation>图像</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="189"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="192"/> <source>Image Address</source> <translation>图像地址</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="197"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.ui" line="200"/> <source><b>Preview</b></source> <translation><b>预览</b></translation> </message> @@ -66517,22 +66610,22 @@ <translation type="obsolete">安全</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="216"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="238"/> <source>Preview not available.</source> <translation>预览不可用。</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="243"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="265"/> <source>Copy Image Location to Clipboard</source> <translation>将图像位置复制至剪贴板</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="246"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="268"/> <source>Copy Image Name to Clipboard</source> <translation>将图像名称复制至剪贴板</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source>Save Image</source> <translation>保存图像</translation> </message> @@ -66542,12 +66635,12 @@ <translation type="obsolete">图像不可用。</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="299"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="321"/> <source>All Files (*)</source> <translation>所有文件 (*)</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="310"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="332"/> <source><p>Cannot write to file <b>{0}</b>.</p></source> <translation><p>无法写入文件 <b>{0}</b>。</p></translation> </message> @@ -66587,25 +66680,30 @@ <translation type="obsolete">显示该站点使用的数据库的列表</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="229"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="251"/> <source>Loading...</source> <translation type="unfinished">正在加载…</translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="287"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="309"/> <source><p>This preview is not available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="76"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="97"/> <source><b>Connection is encrypted.</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="80"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="102"/> <source><b>Connection is not encrypted.</b></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoDialog.py" line="87"/> + <source><b>Connection is encrypted but may be insecure.</b></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SiteInfoWidget</name> @@ -66615,60 +66713,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/> <source>Your connection to this site is <b>secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/> <source>Your connection to this site is <b>not secure</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/> <source>This is your <b>{0}.</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/> <source>You have <b>never</b> visited this site before.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/> <source>first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/> <source>second</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/> <source>third</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/> <source>This is your <b>{0}</b> visit of this site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/> - <source>Register as <b>{0}</b> links handler.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/> + <source>Register as <b>{0}</b> links handler.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/> <source>Register</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/> <source>More...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/> + <source>Your connection to this site <b>may not be secure</b>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapWidget</name> @@ -79047,7 +79150,7 @@ <translation><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6327"/> + <location filename="../UI/UserInterface.py" line="6294"/> <source>Export Keyboard Shortcuts</source> <translation>导出键盘快捷键</translation> </message> @@ -79067,7 +79170,7 @@ <translation><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Import Keyboard Shortcuts</source> <translation>导入键盘快捷键</translation> </message> @@ -79297,7 +79400,7 @@ <translation>设置</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Help</source> <translation>帮助</translation> </message> @@ -79347,7 +79450,7 @@ <translation type="obsolete"><h3>版本号</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7324"/> + <location filename="../UI/UserInterface.py" line="7291"/> <source></table></source> <translation></table></translation> </message> @@ -79402,107 +79505,107 @@ <translation type="obsolete">当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source>Problem</source> <translation>问题</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Open Browser</source> <translation>打开浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6119"/> + <location filename="../UI/UserInterface.py" line="6086"/> <source>Could not start a web browser</source> <translation>无法启动网络浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5115"/> + <location filename="../UI/UserInterface.py" line="5082"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>目前没有选择自定义浏览器。请使用首选项对话框指定一个。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5149"/> + <location filename="../UI/UserInterface.py" line="5116"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>无法开启帮助浏览器。<br>确保其有效如 <b>hh</b>。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>External Tools</source> <translation>外部工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source>Documentation Missing</source> <translation>文档缺失</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source>Documentation</source> <translation>文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5727"/> + <location filename="../UI/UserInterface.py" line="5694"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>未配置 PyQt4 文档起点。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source>Save tasks</source> <translation>保存任务</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source>Read tasks</source> <translation>读取任务</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6646"/> + <location filename="../UI/UserInterface.py" line="6613"/> <source>Save session</source> <translation>保存会话</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Read session</source> <translation>读取会话</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Error during updates check</source> <translation>检查更新时出错</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>&Cancel</source> <translation>取消(&C)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <location filename="../UI/UserInterface.py" line="7233"/> <source>Update available</source> <translation>可用更新</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7285"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Could not perform updates check.</source> <translation>无法完成更新检查。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7309"/> + <location filename="../UI/UserInterface.py" line="7276"/> <source><h3>Available versions</h3><table></source> <translation><h3>可用版本</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>First time usage</source> <translation>第一次使用</translation> </message> @@ -79584,7 +79687,7 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt 3 support</source> - <translation>Qt 3 支持</translation> + <translation type="obsolete">Qt 3 支持</translation> </message> <message> <location filename="../UI/UserInterface.py" line="2870"/> @@ -79622,106 +79725,106 @@ <translation>外部工具/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5243"/> + <location filename="../UI/UserInterface.py" line="5210"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>文件 <b>{0}</b> 不存在或者长度为零。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4962"/> + <location filename="../UI/UserInterface.py" line="4935"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 设计师。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5034"/> + <location filename="../UI/UserInterface.py" line="5005"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 语言家。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5049"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 助手。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5129"/> + <location filename="../UI/UserInterface.py" line="5096"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动自定义的查看器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5199"/> + <location filename="../UI/UserInterface.py" line="5166"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 UI 预览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5256"/> + <location filename="../UI/UserInterface.py" line="5223"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动翻译预览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5279"/> + <location filename="../UI/UserInterface.py" line="5246"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 SQL 浏览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5374"/> + <location filename="../UI/UserInterface.py" line="5341"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5383"/> + <location filename="../UI/UserInterface.py" line="5350"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5422"/> + <location filename="../UI/UserInterface.py" line="5389"/> <source>Starting process '{0} {1}'. </source> <translation>正在启动进程“{0} {1}”。 </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5438"/> + <location filename="../UI/UserInterface.py" line="5405"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5516"/> + <location filename="../UI/UserInterface.py" line="5483"/> <source>Process '{0}' has exited. </source> <translation>进程“{0}”已退出。 </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5919"/> + <location filename="../UI/UserInterface.py" line="5886"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6521"/> + <location filename="../UI/UserInterface.py" line="6488"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>任务文件 <b>{0}</b> 无法写入。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6550"/> + <location filename="../UI/UserInterface.py" line="6517"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>任务文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6584"/> + <location filename="../UI/UserInterface.py" line="6551"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>会话文件 <b>{0}</b> 无法写入。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>会话文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6914"/> + <location filename="../UI/UserInterface.py" line="6881"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108"/> + <location filename="../UI/UserInterface.py" line="7075"/> <source>Trying host {0}</source> <translation>正在尝试主机 {0}</translation> </message> @@ -79756,7 +79859,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6351"/> + <location filename="../UI/UserInterface.py" line="6318"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>键盘快捷键文件 (*.e4k)</translation> </message> @@ -79796,17 +79899,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>Error getting versions information</source> <translation>获取版本信息出错</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7167"/> + <location filename="../UI/UserInterface.py" line="7134"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>无法获取版本信息。请连线并再试一次。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7174"/> + <location filename="../UI/UserInterface.py" line="7141"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>过去7天均无法获取版本信息。请连线并再试一次。</translation> </message> @@ -79892,12 +79995,12 @@ <translation><b>快照</b><p>打开一个对话框来截取屏幕一个区域的快照。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5351"/> + <location filename="../UI/UserInterface.py" line="5318"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动快照工具。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7380"/> + <location filename="../UI/UserInterface.py" line="7347"/> <source>Select Workspace Directory</source> <translation>选择工作区目录</translation> </message> @@ -80272,7 +80375,7 @@ <translation>打开 PyQt5 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5789"/> + <location filename="../UI/UserInterface.py" line="5756"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><p>未配置 PyQt5 文档起始位置。</p></translation> </message> @@ -80287,7 +80390,7 @@ <translation><b>Python 3 文档</b><p>显示 Python 3 文档。如果尚未配置文档目录，则在 Windows 系统上，文档位置将默认为 Python 3 可执行文件所在目录下的 doc 目录；在类 Unix 系统上，则默认为 <i>/usr/share/doc/packages/python/html</i>。请在环境中设置 PYTHON3DOCDIR 以覆盖默认行为。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7099"/> + <location filename="../UI/UserInterface.py" line="7066"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -80307,7 +80410,7 @@ <translation><b>显示错误日志…</b><p>打开一个对话框显示最近的错误日志。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7103"/> + <location filename="../UI/UserInterface.py" line="7070"/> <source>Version Check</source> <translation>版本检查</translation> </message> @@ -80379,25 +80482,25 @@ <message> <location filename="../UI/UserInterface.py" line="5062"/> <source>Qt v.3 is not supported by eric6.</source> - <translation>Qt 版本3 不被 eric6 支持。</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7266"/> + <translation type="obsolete">Qt 版本3 不被 eric6 支持。</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7233"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>eric6 的 <b>{0}</b> 更新已经可用，位于 <b>{1}</b>。您是否希望下载它？</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>Eric6 is up to date</source> <translation>Eric6 已是最新版本</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7278"/> + <location filename="../UI/UserInterface.py" line="7245"/> <source>You are using the latest version of eric6</source> <translation>您正在使用 eric6 的最新版本</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7361"/> + <location filename="../UI/UserInterface.py" line="7328"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>尚未配置 eric6。将打开配置对话框。</translation> </message> @@ -80417,7 +80520,7 @@ <translation>没有配置的用户工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7119"/> + <location filename="../UI/UserInterface.py" line="7086"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>因为当前处在 <b>离线</b> 状态，无法获取版本信息。请连线并再试一次。</translation> </message> @@ -80462,7 +80565,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>Load session</source> <translation type="unfinished">载入会话</translation> </message> @@ -80477,17 +80580,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6668"/> + <location filename="../UI/UserInterface.py" line="6635"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6719"/> + <location filename="../UI/UserInterface.py" line="6686"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80502,17 +80605,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7254"/> + <location filename="../UI/UserInterface.py" line="7221"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7244"/> + <location filename="../UI/UserInterface.py" line="7211"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80567,7 +80670,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5902"/> + <location filename="../UI/UserInterface.py" line="5869"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80638,17 +80741,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="5982"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6076"/> + <location filename="../UI/UserInterface.py" line="6043"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80747,6 +80850,21 @@ <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>版本号</h3><table> {2>?} {2>?}</translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="4944"/> + <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5014"/> + <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5058"/> + <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -86562,37 +86680,37 @@ <translation type="obsolete">为安全的 URL 选择背景色。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/> <source>Images</source> <translation type="unfinished">图像</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/> <source>Select to load images</source> <translation type="unfinished">选择输入图像</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/> <source>Load images</source> <translation type="unfinished">输入图像</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/> <source>Style Sheet</source> <translation type="unfinished">样式表</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/> <source>User Style Sheet:</source> <translation type="unfinished">用户样式表：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished">输入用户样式表的文件名</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/> <source>Tabs</source> <translation type="unfinished">选项卡</translation> </message> @@ -86602,12 +86720,12 @@ <translation type="obsolete">仅显示一个关闭按钮，而不是每个选项卡显示一个按钮</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation type="unfinished">选择在多个选项卡将要被关闭时弹出警告</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/> <source>Warn, if multiple tabs are about to be closed</source> <translation type="unfinished">如果将要关闭多个选项卡，发出警告</translation> </message> @@ -86627,37 +86745,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation type="unfinished"><font color="#FF0000"><b>注意：</b> 以上所有设置将在下次启动应用程序时生效。</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/> <source>Toolbars</source> <translation type="unfinished">工具栏</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/> <source>Select to show toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/> <source>Show Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/> <source>Scrollbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/> <source>Select to show scrollbars. Note: Scrolling is possible even without them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/> <source>Show Scrollbars</source> <translation type="unfinished"></translation> </message> @@ -86667,13 +86785,48 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/> + <source>Select the background color for secure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/> - <source>Background color of secure URLs:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/> - <source>Select the background color for secure URLs.</source> + <source>URL Entry Background</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/> + <source>Secure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/> + <source>Insecure URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/> + <source>Select the background color for insecure URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/> + <source>Malicious URLs:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/> + <source>Select the background color for malicious URLs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/> + <source>Private Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/> + <source>Select the background color for URLs in private mode.</source> <translation type="unfinished"></translation> </message> </context> @@ -87945,27 +88098,27 @@ <translation type="unfinished">…</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="892"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="913"/> <source>Loading...</source> <translation type="unfinished">正在加载…</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="912"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="922"/> <source>Finished loading</source> <translation type="unfinished">加载完成</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="914"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="889"/> <source>Failed to load</source> <translation type="unfinished">加载失败</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished">确定要关闭窗口？</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="955"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="963"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation type="unfinished"> @@ -87974,22 +88127,22 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="962"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="970"/> <source>&Quit</source> <translation type="unfinished">退出(&Q)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="965"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="973"/> <source>C&lose Current Tab</source> <translation type="unfinished">关闭当前选项卡(&C)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1146"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">恢复所有已关闭的选项卡</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1148"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1156"/> <source>Clear List</source> <translation type="unfinished">清空列表</translation> </message> @@ -90864,12 +91017,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="391"/> + <location filename="../eric6.py" line="399"/> <source>Starting...</source> <translation>正在启动…</translation> </message> <message> - <location filename="../eric6.py" line="396"/> + <location filename="../eric6.py" line="404"/> <source>Generating Main Window...</source> <translation>正在产生主窗口…</translation> </message>
--- a/scripts/install.py Sat May 02 14:04:18 2020 +0200 +++ b/scripts/install.py Sun May 31 17:26:14 2020 +0200 @@ -48,6 +48,8 @@ defaultMacAppBundlePath = "/Applications" defaultMacPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format( sys.exec_prefix) +if not os.path.exists(defaultMacPythonExe): + defaultMacPythonExe = "" macAppBundleName = defaultMacAppBundleName macAppBundlePath = defaultMacAppBundlePath macPythonExe = defaultMacPythonExe @@ -1027,11 +1029,12 @@ # 1. create desktop shortcuts regName = "Desktop" - desktopFolder = os.path.normpath( - os.path.expandvars(getWinregEntry(regName, regPath))) - for linkName, targetPath, iconPath in windowsDesktopEntries(): - linkPath = os.path.join(desktopFolder, linkName) - createWindowsShortcut(linkPath, targetPath, iconPath) + desktopEntry = getWinregEntry(regName, regPath) + if desktopEntry: + desktopFolder = os.path.normpath(os.path.expandvars(desktopEntry)) + for linkName, targetPath, iconPath in windowsDesktopEntries(): + linkPath = os.path.join(desktopFolder, linkName) + createWindowsShortcut(linkPath, targetPath, iconPath) # 2. create start menu entry and shortcuts regName = "Programs" @@ -1073,7 +1076,7 @@ if not os.path.exists(directory): os.makedirs(directory) - if macPythonExe == defaultMacPythonExe: + if macPythonExe == defaultMacPythonExe and macPythonExe: starter = os.path.join(directories["exe"], "eric") os.symlink(macPythonExe, starter) else:
