Sun, 30 Sep 2018 11:38:40 +0200
Merged with "default" branch to prepare the next release.
--- a/APIs/Python3/eric6.api Sun Sep 02 11:07:03 2018 +0200 +++ b/APIs/Python3/eric6.api Sun Sep 30 11:38:40 2018 +0200 @@ -59,6 +59,7 @@ eric6.Cooperation.Connection.PingInterval?7 eric6.Cooperation.Connection.PongTimeout?7 eric6.Cooperation.Connection.SeparatorToken?7 +eric6.Cooperation.Connection.SeparatorToken_b?7 eric6.Cooperation.Connection.TransferTimeout?7 eric6.Cooperation.CooperationClient.CooperationClient.banKickUser?4(nick) eric6.Cooperation.CooperationClient.CooperationClient.banUser?4(nick) @@ -1279,6 +1280,7 @@ eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findNextButton_clicked?4() eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findPrevButton_clicked?4() eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findtextCombo_editTextChanged?4(txt) +eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.setWidthForHeight?4(widthForHeight) eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget?1(parent=None, widthForHeight=True) eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.addItem?4(txt, data=None) eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.currentIndex?4() @@ -3651,11 +3653,15 @@ eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.UrlRe?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.addMessage?4(sender, msg) eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.addUsers?4(users) +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.awayCommand?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.channelClosed?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.getUsersCount?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.handleMessage?4(line) eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.hideEvent?4(evt) eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.initAutoWho?4() +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveAllChannels?7 +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveChannel?4() +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveChannels?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.name?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_editTopicButton_clicked?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messageEdit_returnPressed?4() @@ -3667,6 +3673,7 @@ eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.partMessage?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.requestLeave?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendCtcpReply?7 +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendCtcpRequest?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendData?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.setMarkerLine?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.setName?4(name) @@ -3690,8 +3697,10 @@ eric6.Network.IRC.IrcChannelWidget.IrcUserItem.canChangeTopic?4() eric6.Network.IRC.IrcChannelWidget.IrcUserItem.changePrivilege?4(privilege) eric6.Network.IRC.IrcChannelWidget.IrcUserItem.clearPrivileges?4() +eric6.Network.IRC.IrcChannelWidget.IrcUserItem.isIgnored?4() eric6.Network.IRC.IrcChannelWidget.IrcUserItem.name?4() eric6.Network.IRC.IrcChannelWidget.IrcUserItem.parseWhoFlags?4(flags) +eric6.Network.IRC.IrcChannelWidget.IrcUserItem.setIgnored?4(ignored) eric6.Network.IRC.IrcChannelWidget.IrcUserItem.setName?4(name) eric6.Network.IRC.IrcChannelWidget.IrcUserItem?1(name, parent=None) eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.accept?4() @@ -3835,6 +3844,7 @@ eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.editNetwork?7 eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.getNetworkChannels?4() eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.getNickname?4() +eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.handleAwayCommand?4(awayMessage) eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.initialize?4(manager) eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.isConnected?4() eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.joinChannel?7 @@ -3866,6 +3876,7 @@ eric6.Network.IRC.IrcWidget.IrcWidget.autoConnect?4() eric6.Network.IRC.IrcWidget.IrcWidget.autoConnected?7 eric6.Network.IRC.IrcWidget.IrcWidget.isChannelName?4(name) +eric6.Network.IRC.IrcWidget.IrcWidget.joinChannel?4(name, key="") eric6.Network.IRC.IrcWidget.IrcWidget.on_channelsWidget_tabCloseRequested?4(index) eric6.Network.IRC.IrcWidget.IrcWidget.shutdown?4() eric6.Network.IRC.IrcWidget.IrcWidget?1(parent=None) @@ -9699,13 +9710,9 @@ eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.shutdown?4() eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.unregisterProvider?4(providerName) eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer?1(parent=None) -eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.clear?4() -eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.preferencesChanged?4() -eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.setText?4(text) -eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer?1(parent=None) -eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.clear?4() -eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.setHtml?4(html) -eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer?1(parent=None) +eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.clear?4() +eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.setHtml?4(html) +eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget?1(parent=None) eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocWarningDocument?4(text) eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocument?4(documentationInfo) eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlWarningDocument?4(text) @@ -10641,9 +10648,11 @@ eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog.getData?4() eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog.on_pythonExecPicker_textChanged?4(txt) eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog?1(venvName, venvDirectory, parent=None) +eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.DefaultKey?7 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.addVirtualEnv?4(venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.createVirtualEnv?4() eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.deleteVirtualEnvs?4(venvNames) +eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getDefaultEnvironment?4() eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getEnvironmentEntries?4() eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvDirectory?4(venvName) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvInterpreter?4(venvName) @@ -12657,6 +12666,9 @@ eric6.install.apisDir?7 eric6.install.cfg?7 eric6.install.cleanUp?4() +eric6.install.cleanUpLinuxSpecifics?4() +eric6.install.cleanUpMacAppBundle?4() +eric6.install.cleanUpWindowsLinks?4() eric6.install.cleanupSource?4(dirName) eric6.install.compileUiFiles?4() eric6.install.configLength?7 @@ -12668,8 +12680,11 @@ eric6.install.createConfig?4() eric6.install.createGlobalPluginsDir?4() eric6.install.createInstallConfig?4() +eric6.install.createLinuxSpecifics?4() eric6.install.createMacAppBundle?4(pydir) eric6.install.createPyWrapper?4(pydir, wfile, isGuiScript=True) +eric6.install.createWindowsLinks?4() +eric6.install.createWindowsShortcut?4(linkPath, targetPath, iconPath) eric6.install.currDir?7 eric6.install.defaultMacAppBundleName?7 eric6.install.defaultMacAppBundlePath?7 @@ -12680,6 +12695,7 @@ eric6.install.doCompile?7 eric6.install.doDependancyChecks?4() eric6.install.exit?4(rcode=0) +eric6.install.getWinregEntry?4(name, path) eric6.install.includePythonVariant?7 eric6.install.initGlobals?4() eric6.install.installApis?7 @@ -12701,7 +12717,10 @@ eric6.install.shutilCopy?4(src, dst, perm=0o644) eric6.install.sourceDir?7 eric6.install.usage?4(rcode=2) -eric6.install.wrapperName?4(dname, wfile) +eric6.install.windowsDesktopEntries?4() +eric6.install.windowsDesktopNames?4() +eric6.install.windowsProgramsEntry?4() +eric6.install.wrapperNames?4(dname, wfile) eric6.patch_modpython.initGlobals?4() eric6.patch_modpython.main?4(argv) eric6.patch_modpython.modDir?7 @@ -12723,6 +12742,7 @@ eric6.uninstall.defaultMacAppBundlePath?7 eric6.uninstall.exit?4(rcode=0) eric6.uninstall.getConfigDir?4() +eric6.uninstall.getWinregEntry?4(name, path) eric6.uninstall.includePythonVariant?7 eric6.uninstall.initGlobals?4() eric6.uninstall.main?4(argv) @@ -12735,5 +12755,10 @@ eric6.uninstall.settingsNameGlobal?7 eric6.uninstall.settingsNameOrganization?7 eric6.uninstall.uninstallEric?4() +eric6.uninstall.uninstallLinuxSpecifics?4() +eric6.uninstall.uninstallMacAppBundle?4() +eric6.uninstall.uninstallWindowsLinks?4() eric6.uninstall.usage?4(rcode=2) -eric6.uninstall.wrapperName?4(dname, wfile) +eric6.uninstall.windowsDesktopNames?4() +eric6.uninstall.windowsProgramsEntry?4() +eric6.uninstall.wrapperNames?4(dname, wfile)
--- a/APIs/Python3/eric6.bas Sun Sep 02 11:07:03 2018 +0200 +++ b/APIs/Python3/eric6.bas Sun Sep 30 11:38:40 2018 +0200 @@ -143,6 +143,7 @@ DispositionParm str DispositionParmList UniqueNamespace DispositionType peg.List +DocumentationViewerWidget QWidget DotDesktopListSelectionDialog QDialog Ui_DotDesktopListSelectionDialog DotDesktopWizard QObject DotDesktopWizardDialog QDialog Ui_DotDesktopWizardDialog @@ -669,7 +670,6 @@ PipSelectionDialog QDialog Ui_PipSelectionDialog PixmapDiagram E5MainWindow PlainStrList list -PlainTextDocumentationViewer QWidget PluginActivationError PluginError PluginClassFormatError PluginError PluginDetailsDialog QDialog Ui_PluginDetailsDialog @@ -1011,7 +1011,6 @@ WebIconProvider QObject WebInspector QWebEngineView WebPluginFactory QWebPluginFactory -WebViewDocumentationViewer QWidget WidgetArea QMdiArea WidgetView QWidget WizardEricPluginWizard QObject
--- a/Debugger/DebugServer.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Debugger/DebugServer.py Sun Sep 30 11:38:40 2018 +0200 @@ -14,6 +14,7 @@ pass import os +import sys from PyQt5.QtCore import pyqtSignal, QModelIndex from PyQt5.QtNetwork import QTcpServer, QHostAddress, QHostInfo, \ @@ -210,18 +211,17 @@ self.clientType = \ Preferences.Prefs.settings.value('DebugClient/Type') if self.clientType is None: - import sys if sys.version_info[0] == 2: self.clientType = 'Python2' else: self.clientType = 'Python3' - # Change clientType if dependent interpreter not exist anymore + # Change clientType if dependent interpreter does not exist anymore # (maybe deinstalled,...) elif self.clientType == 'Python2' and Preferences.getDebugger( - "Python2VirtualEnv") == '': + "Python2VirtualEnv") == '' and sys.version_info[0] == 3: self.clientType = 'Python3' elif self.clientType == 'Python3' and Preferences.getDebugger( - "Python3VirtualEnv") == '': + "Python3VirtualEnv") == '' and sys.version_info[0] == 2: self.clientType = 'Python2' self.lastClientType = ''
--- a/Debugger/DebuggerInterfacePython.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Debugger/DebuggerInterfacePython.py Sun Sep 30 11:38:40 2018 +0200 @@ -1202,13 +1202,15 @@ py3Exts.append(".{0}".format(ext)) registryData = [] - if py2Exts and Preferences.getDebugger("Python2VirtualEnv"): + if py2Exts and (Preferences.getDebugger("Python2VirtualEnv") or + sys.version_info[0] == 2): registryData.append( ("Python2", ClientDefaultCapabilities, py2Exts, createDebuggerInterfacePython2) ) - if py3Exts and Preferences.getDebugger("Python3VirtualEnv"): + if py3Exts and (Preferences.getDebugger("Python3VirtualEnv") or + sys.version_info[0] == 3): registryData.append( ("Python3", ClientDefaultCapabilities, py3Exts, createDebuggerInterfacePython3)
--- a/Documentation/Help/source.qhp Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Help/source.qhp Sun Sep 30 11:38:40 2018 +0200 @@ -2956,11 +2956,8 @@ <keyword name="CodeDocumentationViewer (Constructor)" id="CodeDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__init__" /> <keyword name="CodeDocumentationViewer (Module)" id="CodeDocumentationViewer (Module)" ref="eric6.UI.CodeDocumentationViewer.html" /> <keyword name="CodeDocumentationViewer.__selectProvider" id="CodeDocumentationViewer.__selectProvider" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__selectProvider" /> - <keyword name="CodeDocumentationViewer.__setHtml" id="CodeDocumentationViewer.__setHtml" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__setHtml" /> - <keyword name="CodeDocumentationViewer.__setHtmlWarning" id="CodeDocumentationViewer.__setHtmlWarning" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__setHtmlWarning" /> <keyword name="CodeDocumentationViewer.__setupUi" id="CodeDocumentationViewer.__setupUi" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__setupUi" /> <keyword name="CodeDocumentationViewer.__showDisabledMessage" id="CodeDocumentationViewer.__showDisabledMessage" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__showDisabledMessage" /> - <keyword name="CodeDocumentationViewer.__showTextViewer" id="CodeDocumentationViewer.__showTextViewer" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__showTextViewer" /> <keyword name="CodeDocumentationViewer.__unregisterTimerTimeout" id="CodeDocumentationViewer.__unregisterTimerTimeout" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__unregisterTimerTimeout" /> <keyword name="CodeDocumentationViewer.documentationReady" id="CodeDocumentationViewer.documentationReady" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.documentationReady" /> <keyword name="CodeDocumentationViewer.finalizeSetup" id="CodeDocumentationViewer.finalizeSetup" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.finalizeSetup" /> @@ -4115,6 +4112,11 @@ <keyword name="DocStyleContext.start" id="DocStyleContext.start" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html#DocStyleContext.start" /> <keyword name="DocumentationPlugins (Package)" id="DocumentationPlugins (Package)" ref="index-eric6.Plugins.DocumentationPlugins.html" /> <keyword name="DocumentationTools (Package)" id="DocumentationTools (Package)" ref="index-eric6.DocumentationTools.html" /> + <keyword name="DocumentationViewerWidget" id="DocumentationViewerWidget" ref="eric6.UI.CodeDocumentationViewer.html#DocumentationViewerWidget" /> + <keyword name="DocumentationViewerWidget (Constructor)" id="DocumentationViewerWidget (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#DocumentationViewerWidget.__init__" /> + <keyword name="DocumentationViewerWidget.__showLink" id="DocumentationViewerWidget.__showLink" ref="eric6.UI.CodeDocumentationViewer.html#DocumentationViewerWidget.__showLink" /> + <keyword name="DocumentationViewerWidget.clear" id="DocumentationViewerWidget.clear" ref="eric6.UI.CodeDocumentationViewer.html#DocumentationViewerWidget.clear" /> + <keyword name="DocumentationViewerWidget.setHtml" id="DocumentationViewerWidget.setHtml" ref="eric6.UI.CodeDocumentationViewer.html#DocumentationViewerWidget.setHtml" /> <keyword name="DotDesktopListSelectionDialog" id="DotDesktopListSelectionDialog" ref="eric6.Plugins.WizardPlugins.DotDesktopWizard.DotDesktopListSelectionDialog.html#DotDesktopListSelectionDialog" /> <keyword name="DotDesktopListSelectionDialog (Constructor)" id="DotDesktopListSelectionDialog (Constructor)" ref="eric6.Plugins.WizardPlugins.DotDesktopWizard.DotDesktopListSelectionDialog.html#DotDesktopListSelectionDialog.__init__" /> <keyword name="DotDesktopListSelectionDialog (Module)" id="DotDesktopListSelectionDialog (Module)" ref="eric6.Plugins.WizardPlugins.DotDesktopWizard.DotDesktopListSelectionDialog.html" /> @@ -4935,6 +4937,7 @@ <keyword name="E5TextEditSearchWidget" id="E5TextEditSearchWidget" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget" /> <keyword name="E5TextEditSearchWidget (Constructor)" id="E5TextEditSearchWidget (Constructor)" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__init__" /> <keyword name="E5TextEditSearchWidget (Module)" id="E5TextEditSearchWidget (Module)" ref="eric6.E5Gui.E5TextEditSearchWidget.html" /> + <keyword name="E5TextEditSearchWidget.__addWidthForHeightLayout" id="E5TextEditSearchWidget.__addWidthForHeightLayout" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__addWidthForHeightLayout" /> <keyword name="E5TextEditSearchWidget.__find" id="E5TextEditSearchWidget.__find" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__find" /> <keyword name="E5TextEditSearchWidget.__findByReturnPressed" id="E5TextEditSearchWidget.__findByReturnPressed" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findByReturnPressed" /> <keyword name="E5TextEditSearchWidget.__findNextPrevCallback" id="E5TextEditSearchWidget.__findNextPrevCallback" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findNextPrevCallback" /> @@ -4949,6 +4952,7 @@ <keyword name="E5TextEditSearchWidget.on_findNextButton_clicked" id="E5TextEditSearchWidget.on_findNextButton_clicked" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.on_findNextButton_clicked" /> <keyword name="E5TextEditSearchWidget.on_findPrevButton_clicked" id="E5TextEditSearchWidget.on_findPrevButton_clicked" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.on_findPrevButton_clicked" /> <keyword name="E5TextEditSearchWidget.on_findtextCombo_editTextChanged" id="E5TextEditSearchWidget.on_findtextCombo_editTextChanged" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.on_findtextCombo_editTextChanged" /> + <keyword name="E5TextEditSearchWidget.setWidthForHeight" id="E5TextEditSearchWidget.setWidthForHeight" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.setWidthForHeight" /> <keyword name="E5TextSpinBox" id="E5TextSpinBox" ref="eric6.E5Gui.E5TextSpinBox.html#E5TextSpinBox" /> <keyword name="E5TextSpinBox (Constructor)" id="E5TextSpinBox (Constructor)" ref="eric6.E5Gui.E5TextSpinBox.html#E5TextSpinBox.__init__" /> <keyword name="E5TextSpinBox (Module)" id="E5TextSpinBox (Module)" ref="eric6.E5Gui.E5TextSpinBox.html" /> @@ -10143,6 +10147,7 @@ <keyword name="IrcChannelWidget.handleMessage" id="IrcChannelWidget.handleMessage" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.handleMessage" /> <keyword name="IrcChannelWidget.hideEvent" id="IrcChannelWidget.hideEvent" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.hideEvent" /> <keyword name="IrcChannelWidget.initAutoWho" id="IrcChannelWidget.initAutoWho" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.initAutoWho" /> + <keyword name="IrcChannelWidget.leaveChannel" id="IrcChannelWidget.leaveChannel" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.leaveChannel" /> <keyword name="IrcChannelWidget.name" id="IrcChannelWidget.name" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.name" /> <keyword name="IrcChannelWidget.on_editTopicButton_clicked" id="IrcChannelWidget.on_editTopicButton_clicked" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.on_editTopicButton_clicked" /> <keyword name="IrcChannelWidget.on_messageEdit_returnPressed" id="IrcChannelWidget.on_messageEdit_returnPressed" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.on_messageEdit_returnPressed" /> @@ -10310,6 +10315,7 @@ <keyword name="IrcNetworkWidget.autoConnect" id="IrcNetworkWidget.autoConnect" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.autoConnect" /> <keyword name="IrcNetworkWidget.getNetworkChannels" id="IrcNetworkWidget.getNetworkChannels" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.getNetworkChannels" /> <keyword name="IrcNetworkWidget.getNickname" id="IrcNetworkWidget.getNickname" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.getNickname" /> + <keyword name="IrcNetworkWidget.handleAwayCommand" id="IrcNetworkWidget.handleAwayCommand" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.handleAwayCommand" /> <keyword name="IrcNetworkWidget.initialize" id="IrcNetworkWidget.initialize" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.initialize" /> <keyword name="IrcNetworkWidget.isConnected" id="IrcNetworkWidget.isConnected" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.isConnected" /> <keyword name="IrcNetworkWidget.on_awayButton_clicked" id="IrcNetworkWidget.on_awayButton_clicked" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.on_awayButton_clicked" /> @@ -10351,11 +10357,14 @@ <keyword name="IrcUserItem (Constructor)" id="IrcUserItem (Constructor)" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__init__" /> <keyword name="IrcUserItem.__awayIcon" id="IrcUserItem.__awayIcon" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__awayIcon" /> <keyword name="IrcUserItem.__setIcon" id="IrcUserItem.__setIcon" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__setIcon" /> + <keyword name="IrcUserItem.__setText" id="IrcUserItem.__setText" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__setText" /> <keyword name="IrcUserItem.canChangeTopic" id="IrcUserItem.canChangeTopic" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.canChangeTopic" /> <keyword name="IrcUserItem.changePrivilege" id="IrcUserItem.changePrivilege" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.changePrivilege" /> <keyword name="IrcUserItem.clearPrivileges" id="IrcUserItem.clearPrivileges" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.clearPrivileges" /> + <keyword name="IrcUserItem.isIgnored" id="IrcUserItem.isIgnored" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.isIgnored" /> <keyword name="IrcUserItem.name" id="IrcUserItem.name" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.name" /> <keyword name="IrcUserItem.parseWhoFlags" id="IrcUserItem.parseWhoFlags" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.parseWhoFlags" /> + <keyword name="IrcUserItem.setIgnored" id="IrcUserItem.setIgnored" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.setIgnored" /> <keyword name="IrcUserItem.setName" id="IrcUserItem.setName" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.setName" /> <keyword name="IrcUtilities (Module)" id="IrcUtilities (Module)" ref="eric6.Network.IRC.IrcUtilities.html" /> <keyword name="IrcWidget" id="IrcWidget" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget" /> @@ -10369,6 +10378,7 @@ <keyword name="IrcWidget.__connectNetwork" id="IrcWidget.__connectNetwork" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__connectNetwork" /> <keyword name="IrcWidget.__editNetwork" id="IrcWidget.__editNetwork" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__editNetwork" /> <keyword name="IrcWidget.__handleCtcp" id="IrcWidget.__handleCtcp" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleCtcp" /> + <keyword name="IrcWidget.__handleCtcpReply" id="IrcWidget.__handleCtcpReply" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleCtcpReply" /> <keyword name="IrcWidget.__handleNamedMessage" id="IrcWidget.__handleNamedMessage" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleNamedMessage" /> <keyword name="IrcWidget.__handleNickInUse" id="IrcWidget.__handleNickInUse" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleNickInUse" /> <keyword name="IrcWidget.__handleNickInUseLogin" id="IrcWidget.__handleNickInUseLogin" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleNickInUseLogin" /> @@ -10378,8 +10388,9 @@ <keyword name="IrcWidget.__hostConnected" id="IrcWidget.__hostConnected" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__hostConnected" /> <keyword name="IrcWidget.__hostDisconnected" id="IrcWidget.__hostDisconnected" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__hostDisconnected" /> <keyword name="IrcWidget.__hostFound" id="IrcWidget.__hostFound" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__hostFound" /> - <keyword name="IrcWidget.__joinChannel" id="IrcWidget.__joinChannel" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__joinChannel" /> + <keyword name="IrcWidget.__leaveAllChannels" id="IrcWidget.__leaveAllChannels" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__leaveAllChannels" /> <keyword name="IrcWidget.__leaveChannel" id="IrcWidget.__leaveChannel" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__leaveChannel" /> + <keyword name="IrcWidget.__leaveChannels" id="IrcWidget.__leaveChannels" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__leaveChannels" /> <keyword name="IrcWidget.__networkDataChanged" id="IrcWidget.__networkDataChanged" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__networkDataChanged" /> <keyword name="IrcWidget.__openPrivate" id="IrcWidget.__openPrivate" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__openPrivate" /> <keyword name="IrcWidget.__ping" id="IrcWidget.__ping" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__ping" /> @@ -10388,6 +10399,7 @@ <keyword name="IrcWidget.__registerWithServices" id="IrcWidget.__registerWithServices" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__registerWithServices" /> <keyword name="IrcWidget.__send" id="IrcWidget.__send" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__send" /> <keyword name="IrcWidget.__sendCtcpReply" id="IrcWidget.__sendCtcpReply" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__sendCtcpReply" /> + <keyword name="IrcWidget.__sendCtcpRequest" id="IrcWidget.__sendCtcpRequest" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__sendCtcpRequest" /> <keyword name="IrcWidget.__setChannelTypePrefixes" id="IrcWidget.__setChannelTypePrefixes" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__setChannelTypePrefixes" /> <keyword name="IrcWidget.__setUserPrivilegePrefix" id="IrcWidget.__setUserPrivilegePrefix" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__setUserPrivilegePrefix" /> <keyword name="IrcWidget.__sslErrors" id="IrcWidget.__sslErrors" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__sslErrors" /> @@ -10395,6 +10407,7 @@ <keyword name="IrcWidget.__updateUsersCount" id="IrcWidget.__updateUsersCount" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__updateUsersCount" /> <keyword name="IrcWidget.autoConnect" id="IrcWidget.autoConnect" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.autoConnect" /> <keyword name="IrcWidget.isChannelName" id="IrcWidget.isChannelName" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.isChannelName" /> + <keyword name="IrcWidget.joinChannel" id="IrcWidget.joinChannel" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.joinChannel" /> <keyword name="IrcWidget.on_channelsWidget_tabCloseRequested" id="IrcWidget.on_channelsWidget_tabCloseRequested" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.on_channelsWidget_tabCloseRequested" /> <keyword name="IrcWidget.shutdown" id="IrcWidget.shutdown" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.shutdown" /> <keyword name="JavaScript (Package)" id="JavaScript (Package)" ref="index-eric6.WebBrowser.JavaScript.html" /> @@ -12214,11 +12227,6 @@ <keyword name="PlainStrList.__convert" id="PlainStrList.__convert" ref="eric6.Globals.compatibility_fixes.html#PlainStrList.__convert" /> <keyword name="PlainStrList.__setitem__" id="PlainStrList.__setitem__" ref="eric6.Globals.compatibility_fixes.html#PlainStrList.__setitem__" /> <keyword name="PlainStrList.insert" id="PlainStrList.insert" ref="eric6.Globals.compatibility_fixes.html#PlainStrList.insert" /> - <keyword name="PlainTextDocumentationViewer" id="PlainTextDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer" /> - <keyword name="PlainTextDocumentationViewer (Constructor)" id="PlainTextDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.__init__" /> - <keyword name="PlainTextDocumentationViewer.clear" id="PlainTextDocumentationViewer.clear" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.clear" /> - <keyword name="PlainTextDocumentationViewer.preferencesChanged" id="PlainTextDocumentationViewer.preferencesChanged" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.preferencesChanged" /> - <keyword name="PlainTextDocumentationViewer.setText" id="PlainTextDocumentationViewer.setText" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.setText" /> <keyword name="PlistReader" id="PlistReader" ref="eric6.Utilities.binplistlib.html#PlistReader" /> <keyword name="PlistReader (Constructor)" id="PlistReader (Constructor)" ref="eric6.Utilities.binplistlib.html#PlistReader.__init__" /> <keyword name="PlistReader.getSizedInteger" id="PlistReader.getSizedInteger" ref="eric6.Utilities.binplistlib.html#PlistReader.getSizedInteger" /> @@ -13631,6 +13639,7 @@ <keyword name="QtHelpSchemeHandler.requestStarted" id="QtHelpSchemeHandler.requestStarted" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeHandler.requestStarted" /> <keyword name="QtHelpSchemeReply" id="QtHelpSchemeReply" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeReply" /> <keyword name="QtHelpSchemeReply (Constructor)" id="QtHelpSchemeReply (Constructor)" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeReply.__init__" /> + <keyword name="QtHelpSchemeReply.__loadQtHelpPage" id="QtHelpSchemeReply.__loadQtHelpPage" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeReply.__loadQtHelpPage" /> <keyword name="QtHelpSchemeReply.__mimeFromUrl" id="QtHelpSchemeReply.__mimeFromUrl" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeReply.__mimeFromUrl" /> <keyword name="QtHelpSchemeReply.bytesAvailable" id="QtHelpSchemeReply.bytesAvailable" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeReply.bytesAvailable" /> <keyword name="QtHelpSchemeReply.close" id="QtHelpSchemeReply.close" ref="eric6.WebBrowser.Network.QtHelpSchemeHandler.html#QtHelpSchemeReply.close" /> @@ -17520,6 +17529,7 @@ <keyword name="VirtualenvManager.addVirtualEnv" id="VirtualenvManager.addVirtualEnv" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.addVirtualEnv" /> <keyword name="VirtualenvManager.createVirtualEnv" id="VirtualenvManager.createVirtualEnv" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.createVirtualEnv" /> <keyword name="VirtualenvManager.deleteVirtualEnvs" id="VirtualenvManager.deleteVirtualEnvs" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.deleteVirtualEnvs" /> + <keyword name="VirtualenvManager.getDefaultEnvironment" id="VirtualenvManager.getDefaultEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getDefaultEnvironment" /> <keyword name="VirtualenvManager.getEnvironmentEntries" id="VirtualenvManager.getEnvironmentEntries" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getEnvironmentEntries" /> <keyword name="VirtualenvManager.getVirtualenvDirectory" id="VirtualenvManager.getVirtualenvDirectory" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvDirectory" /> <keyword name="VirtualenvManager.getVirtualenvInterpreter" id="VirtualenvManager.getVirtualenvInterpreter" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvInterpreter" /> @@ -18278,11 +18288,6 @@ <keyword name="WebPluginInterface.isAnonymous" id="WebPluginInterface.isAnonymous" ref="eric6.Helpviewer.WebPlugins.WebPluginInterface.html#WebPluginInterface.isAnonymous" /> <keyword name="WebPluginInterface.metaPlugin" id="WebPluginInterface.metaPlugin" ref="eric6.Helpviewer.WebPlugins.WebPluginInterface.html#WebPluginInterface.metaPlugin" /> <keyword name="WebPlugins (Package)" id="WebPlugins (Package)" ref="index-eric6.Helpviewer.WebPlugins.html" /> - <keyword name="WebViewDocumentationViewer" id="WebViewDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer" /> - <keyword name="WebViewDocumentationViewer (Constructor)" id="WebViewDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.__init__" /> - <keyword name="WebViewDocumentationViewer.__showLink" id="WebViewDocumentationViewer.__showLink" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.__showLink" /> - <keyword name="WebViewDocumentationViewer.clear" id="WebViewDocumentationViewer.clear" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.clear" /> - <keyword name="WebViewDocumentationViewer.setHtml" id="WebViewDocumentationViewer.setHtml" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.setHtml" /> <keyword name="Whitespace" id="Whitespace" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#Whitespace" /> <keyword name="Whitespace (Constructor)" id="Whitespace (Constructor)" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#Whitespace.__init__" /> <keyword name="Whitespace.equal" id="Whitespace.equal" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#Whitespace.equal" /> @@ -18547,6 +18552,9 @@ <keyword name="check_physical" id="check_physical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_physical" /> <keyword name="cleanUp" id="cleanUp" ref="eric6.install-debugclients.html#cleanUp" /> <keyword name="cleanUp" id="cleanUp" ref="eric6.install.html#cleanUp" /> + <keyword name="cleanUpLinuxSpecifics" id="cleanUpLinuxSpecifics" ref="eric6.install.html#cleanUpLinuxSpecifics" /> + <keyword name="cleanUpMacAppBundle" id="cleanUpMacAppBundle" ref="eric6.install.html#cleanUpMacAppBundle" /> + <keyword name="cleanUpWindowsLinks" id="cleanUpWindowsLinks" ref="eric6.install.html#cleanUpWindowsLinks" /> <keyword name="cleanupSource" id="cleanupSource" ref="eric6.cleanupSource.html#cleanupSource" /> <keyword name="cleanupSource" id="cleanupSource" ref="eric6.install-debugclients.html#cleanupSource" /> <keyword name="cleanupSource" id="cleanupSource" ref="eric6.install.html#cleanupSource" /> @@ -18653,6 +18661,7 @@ <keyword name="createDefaultConfig" id="createDefaultConfig" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#createDefaultConfig" /> <keyword name="createGlobalPluginsDir" id="createGlobalPluginsDir" ref="eric6.install.html#createGlobalPluginsDir" /> <keyword name="createInstallConfig" id="createInstallConfig" ref="eric6.install.html#createInstallConfig" /> + <keyword name="createLinuxSpecifics" id="createLinuxSpecifics" ref="eric6.install.html#createLinuxSpecifics" /> <keyword name="createMacAppBundle" id="createMacAppBundle" ref="eric6.install.html#createMacAppBundle" /> <keyword name="createMainWidget" id="createMainWidget" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html#createMainWidget" /> <keyword name="createMainWidget" id="createMainWidget" ref="eric6.eric6_browser.html#createMainWidget" /> @@ -18679,6 +18688,8 @@ <keyword name="createPipPage" id="createPipPage" ref="eric6.Plugins.PluginPipInterface.html#createPipPage" /> <keyword name="createPyWrapper" id="createPyWrapper" ref="eric6.install.html#createPyWrapper" /> <keyword name="createTranslatorPage" id="createTranslatorPage" ref="eric6.Plugins.PluginTranslator.html#createTranslatorPage" /> + <keyword name="createWindowsLinks" id="createWindowsLinks" ref="eric6.install.html#createWindowsLinks" /> + <keyword name="createWindowsShortcut" id="createWindowsShortcut" ref="eric6.install.html#createWindowsShortcut" /> <keyword name="critical" id="critical" ref="eric6.E5Gui.E5MessageBox.html#critical" /> <keyword name="crypto (Package)" id="crypto (Package)" ref="index-eric6.Utilities.crypto.html" /> <keyword name="cursors (Package)" id="cursors (Package)" ref="index-eric6.IconEditor.cursors.html" /> @@ -18940,6 +18951,8 @@ <keyword name="getWebBrowser" id="getWebBrowser" ref="eric6.Preferences.__init__.html#getWebBrowser" /> <keyword name="getWebEngineVersions" id="getWebEngineVersions" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#getWebEngineVersions" /> <keyword name="getWindowsExecutablePath" id="getWindowsExecutablePath" ref="eric6.Utilities.__init__.html#getWindowsExecutablePath" /> + <keyword name="getWinregEntry" id="getWinregEntry" ref="eric6.install.html#getWinregEntry" /> + <keyword name="getWinregEntry" id="getWinregEntry" ref="eric6.uninstall.html#getWinregEntry" /> <keyword name="get_checks" id="get_checks" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_checks" /> <keyword name="get_class_members" id="get_class_members" ref="eric6.DebugClients.Python.FlexCompleter.html#get_class_members" /> <keyword name="get_coding" id="get_coding" ref="eric6.Utilities.__init__.html#get_coding" /> @@ -19318,6 +19331,9 @@ <keyword name="uninstall-debugclients (Module)" id="uninstall-debugclients (Module)" ref="eric6.uninstall-debugclients.html" /> <keyword name="uninstallEric" id="uninstallEric" ref="eric6.uninstall.html#uninstallEric" /> <keyword name="uninstallEricDebugClients" id="uninstallEricDebugClients" ref="eric6.uninstall-debugclients.html#uninstallEricDebugClients" /> + <keyword name="uninstallLinuxSpecifics" id="uninstallLinuxSpecifics" ref="eric6.uninstall.html#uninstallLinuxSpecifics" /> + <keyword name="uninstallMacAppBundle" id="uninstallMacAppBundle" ref="eric6.uninstall.html#uninstallMacAppBundle" /> + <keyword name="uninstallWindowsLinks" id="uninstallWindowsLinks" ref="eric6.uninstall.html#uninstallWindowsLinks" /> <keyword name="unregisterLexer" id="unregisterLexer" ref="eric6.QScintilla.Lexers.__init__.html#unregisterLexer" /> <keyword name="unregisterView" id="unregisterView" ref="eric6.WebBrowser.WebInspector.html#unregisterView" /> <keyword name="update_counts" id="update_counts" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#update_counts" /> @@ -19350,12 +19366,17 @@ <keyword name="win32_GetUserName" id="win32_GetUserName" ref="eric6.Utilities.__init__.html#win32_GetUserName" /> <keyword name="win32_Kill" id="win32_Kill" ref="eric6.Utilities.__init__.html#win32_Kill" /> <keyword name="win32_getRealName" id="win32_getRealName" ref="eric6.Utilities.__init__.html#win32_getRealName" /> + <keyword name="windowsDesktopEntries" id="windowsDesktopEntries" ref="eric6.install.html#windowsDesktopEntries" /> + <keyword name="windowsDesktopNames" id="windowsDesktopNames" ref="eric6.install.html#windowsDesktopNames" /> + <keyword name="windowsDesktopNames" id="windowsDesktopNames" ref="eric6.uninstall.html#windowsDesktopNames" /> + <keyword name="windowsProgramsEntry" id="windowsProgramsEntry" ref="eric6.install.html#windowsProgramsEntry" /> + <keyword name="windowsProgramsEntry" id="windowsProgramsEntry" ref="eric6.uninstall.html#windowsProgramsEntry" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#worker" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html#worker" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#worker" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#worker" /> - <keyword name="wrapperName" id="wrapperName" ref="eric6.install.html#wrapperName" /> - <keyword name="wrapperName" id="wrapperName" ref="eric6.uninstall.html#wrapperName" /> + <keyword name="wrapperNames" id="wrapperNames" ref="eric6.install.html#wrapperNames" /> + <keyword name="wrapperNames" id="wrapperNames" ref="eric6.uninstall.html#wrapperNames" /> <keyword name="writeEncodedFile" id="writeEncodedFile" ref="eric6.Utilities.__init__.html#writeEncodedFile" /> <keyword name="writePlist" id="writePlist" ref="eric6.Utilities.binplistlib.html#writePlist" /> <keyword name="writePlistToBytes" id="writePlistToBytes" ref="eric6.Utilities.binplistlib.html#writePlistToBytes" />
--- a/Documentation/Source/eric6.Cooperation.Connection.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.Cooperation.Connection.html Sun Sep 30 11:38:40 2018 +0200 @@ -25,7 +25,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>MaxBufferSize</td></tr><tr><td>PingInterval</td></tr><tr><td>PongTimeout</td></tr><tr><td>SeparatorToken</td></tr><tr><td>TransferTimeout</td></tr> +<tr><td>MaxBufferSize</td></tr><tr><td>PingInterval</td></tr><tr><td>PongTimeout</td></tr><tr><td>SeparatorToken</td></tr><tr><td>SeparatorToken_b</td></tr><tr><td>TransferTimeout</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html Sun Sep 30 11:38:40 2018 +0200 @@ -60,6 +60,9 @@ <td><a href="#E5TextEditSearchWidget.__init__">E5TextEditSearchWidget</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#E5TextEditSearchWidget.__addWidthForHeightLayout">__addWidthForHeightLayout</a></td> +<td>Private method to set the middle part of the layout.</td> +</tr><tr> <td><a href="#E5TextEditSearchWidget.__find">__find</a></td> <td>Private method to search the associated text edit.</td> </tr><tr> @@ -101,6 +104,9 @@ </tr><tr> <td><a href="#E5TextEditSearchWidget.on_findtextCombo_editTextChanged">on_findtextCombo_editTextChanged</a></td> <td>Private slot to enable/disable the find buttons.</td> +</tr><tr> +<td><a href="#E5TextEditSearchWidget.setWidthForHeight">setWidthForHeight</a></td> +<td>Public method to set the 'width for height'.</td> </tr> </table> <h3>Static Methods</h3> @@ -122,6 +128,16 @@ If this parameter is False, some widgets are shown in a third line. </dd> +</dl><a NAME="E5TextEditSearchWidget.__addWidthForHeightLayout" ID="E5TextEditSearchWidget.__addWidthForHeightLayout"></a> +<h4>E5TextEditSearchWidget.__addWidthForHeightLayout</h4> +<b>__addWidthForHeightLayout</b>(<i>widthForHeight</i>) +<p> + Private method to set the middle part of the layout. +</p><dl> +<dt><i>widthForHeight</i> (bool)</dt> +<dd> +flag indicating to prefer width +</dd> </dl><a NAME="E5TextEditSearchWidget.__find" ID="E5TextEditSearchWidget.__find"></a> <h4>E5TextEditSearchWidget.__find</h4> <b>__find</b>(<i>backwards</i>) @@ -275,6 +291,16 @@ <dd> text of the combobox (string) </dd> +</dl><a NAME="E5TextEditSearchWidget.setWidthForHeight" ID="E5TextEditSearchWidget.setWidthForHeight"></a> +<h4>E5TextEditSearchWidget.setWidthForHeight</h4> +<b>setWidthForHeight</b>(<i>widthForHeight</i>) +<p> + Public method to set the 'width for height'. +</p><dl> +<dt><i>widthForHeight</i> (bool)</dt> +<dd> +flag indicating to prefer width +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric6.Network.IRC.IrcChannelWidget.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcChannelWidget.html Sun Sep 30 11:38:40 2018 +0200 @@ -48,9 +48,19 @@ Class implementing the IRC channel widget. </p><h3>Signals</h3> <dl> -<dt>channelClosed(str)</dt> +<dt>awayCommand(str)</dt> +<dd> +emitted to set the away status via the /away + command +</dd><dt>channelClosed(str)</dt> <dd> emitted after the user has left the channel +</dd><dt>leaveAllChannels()</dt> +<dd> +emitted to leave all channels +</dd><dt>leaveChannels(list)</dt> +<dd> +emitted to leave a list of channels </dd><dt>openPrivateChat(str)</dt> <dd> emitted to open a "channel" for private @@ -58,6 +68,9 @@ </dd><dt>sendCtcpReply(str, str)</dt> <dd> emitted to send a CTCP reply +</dd><dt>sendCtcpRequest(str, str, str)</dt> +<dd> +emitted to send a CTCP request </dd><dt>sendData(str)</dt> <dd> emitted to send a message to the channel @@ -238,6 +251,9 @@ <td><a href="#IrcChannelWidget.initAutoWho">initAutoWho</a></td> <td>Public method to initialize the Auto Who system.</td> </tr><tr> +<td><a href="#IrcChannelWidget.leaveChannel">leaveChannel</a></td> +<td>Public slot to leave the channel.</td> +</tr><tr> <td><a href="#IrcChannelWidget.name">name</a></td> <td>Public method to get the name of the channel.</td> </tr><tr> @@ -966,6 +982,11 @@ <b>initAutoWho</b>(<i></i>) <p> Public method to initialize the Auto Who system. +</p><a NAME="IrcChannelWidget.leaveChannel" ID="IrcChannelWidget.leaveChannel"></a> +<h4>IrcChannelWidget.leaveChannel</h4> +<b>leaveChannel</b>(<i></i>) +<p> + Public slot to leave the channel. </p><a NAME="IrcChannelWidget.name" ID="IrcChannelWidget.name"></a> <h4>IrcChannelWidget.name</h4> <b>name</b>(<i></i>) @@ -1165,6 +1186,9 @@ <td><a href="#IrcUserItem.__setIcon">__setIcon</a></td> <td>Private method to set the icon dependent on user privileges.</td> </tr><tr> +<td><a href="#IrcUserItem.__setText">__setText</a></td> +<td>Private method to set the user item text.</td> +</tr><tr> <td><a href="#IrcUserItem.canChangeTopic">canChangeTopic</a></td> <td>Public method to check, if the user is allowed to change the topic.</td> </tr><tr> @@ -1174,12 +1198,18 @@ <td><a href="#IrcUserItem.clearPrivileges">clearPrivileges</a></td> <td>Public method to clear the user privileges.</td> </tr><tr> +<td><a href="#IrcUserItem.isIgnored">isIgnored</a></td> +<td>Public method to check, if this user is ignored.</td> +</tr><tr> <td><a href="#IrcUserItem.name">name</a></td> <td>Public method to get the user name.</td> </tr><tr> <td><a href="#IrcUserItem.parseWhoFlags">parseWhoFlags</a></td> <td>Public method to parse the user flags reported by a WHO command.</td> </tr><tr> +<td><a href="#IrcUserItem.setIgnored">setIgnored</a></td> +<td>Public method to set the user status to ignored.</td> +</tr><tr> <td><a href="#IrcUserItem.setName">setName</a></td> <td>Public method to set a new nick name.</td> </tr> @@ -1222,6 +1252,11 @@ <b>__setIcon</b>(<i></i>) <p> Private method to set the icon dependent on user privileges. +</p><a NAME="IrcUserItem.__setText" ID="IrcUserItem.__setText"></a> +<h4>IrcUserItem.__setText</h4> +<b>__setText</b>(<i></i>) +<p> + Private method to set the user item text. </p><a NAME="IrcUserItem.canChangeTopic" ID="IrcUserItem.canChangeTopic"></a> <h4>IrcUserItem.canChangeTopic</h4> <b>canChangeTopic</b>(<i></i>) @@ -1247,7 +1282,22 @@ <b>clearPrivileges</b>(<i></i>) <p> Public method to clear the user privileges. -</p><a NAME="IrcUserItem.name" ID="IrcUserItem.name"></a> +</p><a NAME="IrcUserItem.isIgnored" ID="IrcUserItem.isIgnored"></a> +<h4>IrcUserItem.isIgnored</h4> +<b>isIgnored</b>(<i></i>) +<p> + Public method to check, if this user is ignored. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the ignored status +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="IrcUserItem.name" ID="IrcUserItem.name"></a> <h4>IrcUserItem.name</h4> <b>name</b>(<i></i>) <p> @@ -1267,6 +1317,16 @@ <dd> user flags as reported by WHO (string) </dd> +</dl><a NAME="IrcUserItem.setIgnored" ID="IrcUserItem.setIgnored"></a> +<h4>IrcUserItem.setIgnored</h4> +<b>setIgnored</b>(<i>ignored</i>) +<p> + Public method to set the user status to ignored. +</p><dl> +<dt><i>ignored</i> (bool)</dt> +<dd> +flag indicating the new ignored status +</dd> </dl><a NAME="IrcUserItem.setName" ID="IrcUserItem.setName"></a> <h4>IrcUserItem.setName</h4> <b>setName</b>(<i>name</i>)
--- a/Documentation/Source/eric6.Network.IRC.IrcNetworkWidget.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcNetworkWidget.html Sun Sep 30 11:38:40 2018 +0200 @@ -130,6 +130,9 @@ <td><a href="#IrcNetworkWidget.getNickname">getNickname</a></td> <td>Public method to get the currently selected nick name.</td> </tr><tr> +<td><a href="#IrcNetworkWidget.handleAwayCommand">handleAwayCommand</a></td> +<td>Public slot to process an away command.</td> +</tr><tr> <td><a href="#IrcNetworkWidget.initialize">initialize</a></td> <td>Public method to initialize the widget.</td> </tr><tr> @@ -308,6 +311,16 @@ <dd> selected nick name (string) </dd> +</dl><a NAME="IrcNetworkWidget.handleAwayCommand" ID="IrcNetworkWidget.handleAwayCommand"></a> +<h4>IrcNetworkWidget.handleAwayCommand</h4> +<b>handleAwayCommand</b>(<i>awayMessage</i>) +<p> + Public slot to process an away command. +</p><dl> +<dt><i>awayMessage</i> (str)</dt> +<dd> +message to be set for being away +</dd> </dl><a NAME="IrcNetworkWidget.initialize" ID="IrcNetworkWidget.initialize"></a> <h4>IrcNetworkWidget.initialize</h4> <b>initialize</b>(<i>manager</i>)
--- a/Documentation/Source/eric6.Network.IRC.IrcWidget.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcWidget.html Sun Sep 30 11:38:40 2018 +0200 @@ -90,6 +90,9 @@ <td><a href="#IrcWidget.__handleCtcp">__handleCtcp</a></td> <td>Private method to handle a CTCP command.</td> </tr><tr> +<td><a href="#IrcWidget.__handleCtcpReply">__handleCtcpReply</a></td> +<td>Private method to handle a server message containing a CTCP reply.</td> +</tr><tr> <td><a href="#IrcWidget.__handleNamedMessage">__handleNamedMessage</a></td> <td>Private method to handle a server message containing a message name.</td> </tr><tr> @@ -117,12 +120,15 @@ <td><a href="#IrcWidget.__hostFound">__hostFound</a></td> <td>Private slot to indicate the host was found.</td> </tr><tr> -<td><a href="#IrcWidget.__joinChannel">__joinChannel</a></td> -<td>Private slot to join a channel.</td> +<td><a href="#IrcWidget.__leaveAllChannels">__leaveAllChannels</a></td> +<td>Private slot to leave all channels and close their tabs.</td> </tr><tr> <td><a href="#IrcWidget.__leaveChannel">__leaveChannel</a></td> <td>Private slot to leave a channel and close the associated tab.</td> </tr><tr> +<td><a href="#IrcWidget.__leaveChannels">__leaveChannels</a></td> +<td>Private slot to leave a list of channels and close their associated tabs.</td> +</tr><tr> <td><a href="#IrcWidget.__networkDataChanged">__networkDataChanged</a></td> <td>Private slot handling changes of the network and identity definitions.</td> </tr><tr> @@ -147,6 +153,9 @@ <td><a href="#IrcWidget.__sendCtcpReply">__sendCtcpReply</a></td> <td>Private slot to send a CTCP reply.</td> </tr><tr> +<td><a href="#IrcWidget.__sendCtcpRequest">__sendCtcpRequest</a></td> +<td>Private slot to send a CTCP request.</td> +</tr><tr> <td><a href="#IrcWidget.__setChannelTypePrefixes">__setChannelTypePrefixes</a></td> <td>Private method to set the channel type prefixes.</td> </tr><tr> @@ -168,6 +177,9 @@ <td><a href="#IrcWidget.isChannelName">isChannelName</a></td> <td>Public method to check, if the given name is a channel name.</td> </tr><tr> +<td><a href="#IrcWidget.joinChannel">joinChannel</a></td> +<td>Public slot to join a channel.</td> +</tr><tr> <td><a href="#IrcWidget.on_channelsWidget_tabCloseRequested">on_channelsWidget_tabCloseRequested</a></td> <td>Private slot to close a channel by pressing the close button of the channels widget.</td> </tr><tr> @@ -271,6 +283,16 @@ <dd> flag indicating, if the message was handled (boolean) </dd> +</dl><a NAME="IrcWidget.__handleCtcpReply" ID="IrcWidget.__handleCtcpReply"></a> +<h4>IrcWidget.__handleCtcpReply</h4> +<b>__handleCtcpReply</b>(<i>match</i>) +<p> + Private method to handle a server message containing a CTCP reply. +</p><dl> +<dt><i>match</i></dt> +<dd> +reference to the match object +</dd> </dl><a NAME="IrcWidget.__handleNamedMessage" ID="IrcWidget.__handleNamedMessage"></a> <h4>IrcWidget.__handleNamedMessage</h4> <b>__handleNamedMessage</b>(<i>match</i>) @@ -369,25 +391,28 @@ <b>__hostFound</b>(<i></i>) <p> Private slot to indicate the host was found. -</p><a NAME="IrcWidget.__joinChannel" ID="IrcWidget.__joinChannel"></a> -<h4>IrcWidget.__joinChannel</h4> -<b>__joinChannel</b>(<i>name, key=""</i>) +</p><a NAME="IrcWidget.__leaveAllChannels" ID="IrcWidget.__leaveAllChannels"></a> +<h4>IrcWidget.__leaveAllChannels</h4> +<b>__leaveAllChannels</b>(<i></i>) <p> - Private slot to join a channel. -</p><dl> -<dt><i>name</i></dt> -<dd> -name of the channel (string) -</dd><dt><i>key</i></dt> -<dd> -key of the channel (string) -</dd> -</dl><a NAME="IrcWidget.__leaveChannel" ID="IrcWidget.__leaveChannel"></a> + Private slot to leave all channels and close their tabs. +</p><a NAME="IrcWidget.__leaveChannel" ID="IrcWidget.__leaveChannel"></a> <h4>IrcWidget.__leaveChannel</h4> <b>__leaveChannel</b>(<i></i>) <p> Private slot to leave a channel and close the associated tab. -</p><a NAME="IrcWidget.__networkDataChanged" ID="IrcWidget.__networkDataChanged"></a> +</p><a NAME="IrcWidget.__leaveChannels" ID="IrcWidget.__leaveChannels"></a> +<h4>IrcWidget.__leaveChannels</h4> +<b>__leaveChannels</b>(<i>channelNames</i>) +<p> + Private slot to leave a list of channels and close their associated + tabs. +</p><dl> +<dt><i>channelNames</i> (list of str)</dt> +<dd> +list of channels to leave +</dd> +</dl><a NAME="IrcWidget.__networkDataChanged" ID="IrcWidget.__networkDataChanged"></a> <h4>IrcWidget.__networkDataChanged</h4> <b>__networkDataChanged</b>(<i></i>) <p> @@ -458,12 +483,28 @@ <p> Private slot to send a CTCP reply. </p><dl> -<dt><i>receiver</i></dt> +<dt><i>receiver</i> (str)</dt> +<dd> +nick name of the receiver +</dd><dt><i>text</i> (str)</dt> <dd> -nick name of the receiver (string) -</dd><dt><i>text</i></dt> +text to be sent +</dd> +</dl><a NAME="IrcWidget.__sendCtcpRequest" ID="IrcWidget.__sendCtcpRequest"></a> +<h4>IrcWidget.__sendCtcpRequest</h4> +<b>__sendCtcpRequest</b>(<i>receiver, request, arguments</i>) +<p> + Private slot to send a CTCP request. +</p><dl> +<dt><i>receiver</i> (str)</dt> <dd> -text to be sent (string) +nick name of the receiver +</dd><dt><i>request</i> (str)</dt> +<dd> +CTCP request to be sent +</dd><dt><i>arguments</i> (str)</dt> +<dd> +arguments to be sent </dd> </dl><a NAME="IrcWidget.__setChannelTypePrefixes" ID="IrcWidget.__setChannelTypePrefixes"></a> <h4>IrcWidget.__setChannelTypePrefixes</h4> @@ -534,6 +575,19 @@ <dd> flag indicating a channel name (boolean) </dd> +</dl><a NAME="IrcWidget.joinChannel" ID="IrcWidget.joinChannel"></a> +<h4>IrcWidget.joinChannel</h4> +<b>joinChannel</b>(<i>name, key=""</i>) +<p> + Public slot to join a channel. +</p><dl> +<dt><i>name</i></dt> +<dd> +name of the channel (string) +</dd><dt><i>key</i></dt> +<dd> +key of the channel (string) +</dd> </dl><a NAME="IrcWidget.on_channelsWidget_tabCloseRequested" ID="IrcWidget.on_channelsWidget_tabCloseRequested"></a> <h4>IrcWidget.on_channelsWidget_tabCloseRequested</h4> <b>on_channelsWidget_tabCloseRequested</b>(<i>index</i>)
--- a/Documentation/Source/eric6.UI.CodeDocumentationViewer.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.UI.CodeDocumentationViewer.html Sun Sep 30 11:38:40 2018 +0200 @@ -34,11 +34,8 @@ <td><a href="#CodeDocumentationViewer">CodeDocumentationViewer</a></td> <td>Class implementing a widget to show some source code information provided by plug-ins.</td> </tr><tr> -<td><a href="#PlainTextDocumentationViewer">PlainTextDocumentationViewer</a></td> -<td>Class implementing the plain text documentation viewer.</td> -</tr><tr> -<td><a href="#WebViewDocumentationViewer">WebViewDocumentationViewer</a></td> -<td>Class implementing the rich text documentation viewer.</td> +<td><a href="#DocumentationViewerWidget">DocumentationViewerWidget</a></td> +<td>Class implementing a rich text documentation viewer.</td> </tr> </table> <h3>Functions</h3> @@ -81,21 +78,12 @@ <td><a href="#CodeDocumentationViewer.__selectProvider">__selectProvider</a></td> <td>Private method to select a provider programmatically.</td> </tr><tr> -<td><a href="#CodeDocumentationViewer.__setHtml">__setHtml</a></td> -<td>Private slot to set the prepared HTML text.</td> -</tr><tr> -<td><a href="#CodeDocumentationViewer.__setHtmlWarning">__setHtmlWarning</a></td> -<td>Private slot to set a display message.</td> -</tr><tr> <td><a href="#CodeDocumentationViewer.__setupUi">__setupUi</a></td> <td>Private method to generate the UI layout.</td> </tr><tr> <td><a href="#CodeDocumentationViewer.__showDisabledMessage">__showDisabledMessage</a></td> <td>Private method to show a message giving the reason for being disabled.</td> </tr><tr> -<td><a href="#CodeDocumentationViewer.__showTextViewer">__showTextViewer</a></td> -<td>Private slot to show the selected viewer.</td> -</tr><tr> <td><a href="#CodeDocumentationViewer.__unregisterTimerTimeout">__unregisterTimerTimeout</a></td> <td>Private slot handling the timeout signal of the unregister timer.</td> </tr><tr> @@ -154,26 +142,6 @@ <dd> name of the provider to be selected </dd> -</dl><a NAME="CodeDocumentationViewer.__setHtml" ID="CodeDocumentationViewer.__setHtml"></a> -<h4>CodeDocumentationViewer.__setHtml</h4> -<b>__setHtml</b>(<i>html</i>) -<p> - Private slot to set the prepared HTML text. -</p><dl> -<dt><i>html</i> (str)</dt> -<dd> -prepared HTML text -</dd> -</dl><a NAME="CodeDocumentationViewer.__setHtmlWarning" ID="CodeDocumentationViewer.__setHtmlWarning"></a> -<h4>CodeDocumentationViewer.__setHtmlWarning</h4> -<b>__setHtmlWarning</b>(<i>warningText</i>) -<p> - Private slot to set a display message. -</p><dl> -<dt><i>warningText</i> (str)</dt> -<dd> -text to be shown as a warning -</dd> </dl><a NAME="CodeDocumentationViewer.__setupUi" ID="CodeDocumentationViewer.__setupUi"></a> <h4>CodeDocumentationViewer.__setupUi</h4> <b>__setupUi</b>(<i></i>) @@ -184,17 +152,7 @@ <b>__showDisabledMessage</b>(<i></i>) <p> Private method to show a message giving the reason for being disabled. -</p><a NAME="CodeDocumentationViewer.__showTextViewer" ID="CodeDocumentationViewer.__showTextViewer"></a> -<h4>CodeDocumentationViewer.__showTextViewer</h4> -<b>__showTextViewer</b>(<i>richText</i>) -<p> - Private slot to show the selected viewer. -</p><dl> -<dt><i>richText</i> (bool)</dt> -<dd> -flag indicating the rich text viewer -</dd> -</dl><a NAME="CodeDocumentationViewer.__unregisterTimerTimeout" ID="CodeDocumentationViewer.__unregisterTimerTimeout"></a> +</p><a NAME="CodeDocumentationViewer.__unregisterTimerTimeout" ID="CodeDocumentationViewer.__unregisterTimerTimeout"></a> <h4>CodeDocumentationViewer.__unregisterTimerTimeout</h4> <b>__unregisterTimerTimeout</b>(<i></i>) <p> @@ -335,10 +293,10 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="PlainTextDocumentationViewer" ID="PlainTextDocumentationViewer"></a> -<h2>PlainTextDocumentationViewer</h2> +<a NAME="DocumentationViewerWidget" ID="DocumentationViewerWidget"></a> +<h2>DocumentationViewerWidget</h2> <p> - Class implementing the plain text documentation viewer. + Class implementing a rich text documentation viewer. </p> <h3>Derived from</h3> QWidget @@ -353,26 +311,26 @@ <h3>Methods</h3> <table> <tr> -<td><a href="#PlainTextDocumentationViewer.__init__">PlainTextDocumentationViewer</a></td> +<td><a href="#DocumentationViewerWidget.__init__">DocumentationViewerWidget</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#PlainTextDocumentationViewer.clear">clear</a></td> -<td>Public method to clear the contents.</td> +<td><a href="#DocumentationViewerWidget.__showLink">__showLink</a></td> +<td>Private slot to show the hovered link in a tooltip.</td> </tr><tr> -<td><a href="#PlainTextDocumentationViewer.preferencesChanged">preferencesChanged</a></td> -<td>Public slot to handle a change of preferences.</td> +<td><a href="#DocumentationViewerWidget.clear">clear</a></td> +<td>Public method to clear the shown contents.</td> </tr><tr> -<td><a href="#PlainTextDocumentationViewer.setText">setText</a></td> -<td>Public method to set the text to be shown.</td> +<td><a href="#DocumentationViewerWidget.setHtml">setHtml</a></td> +<td>Public method to set the HTML text of the widget.</td> </tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="PlainTextDocumentationViewer.__init__" ID="PlainTextDocumentationViewer.__init__"></a> -<h4>PlainTextDocumentationViewer (Constructor)</h4> -<b>PlainTextDocumentationViewer</b>(<i>parent=None</i>) +<a NAME="DocumentationViewerWidget.__init__" ID="DocumentationViewerWidget.__init__"></a> +<h4>DocumentationViewerWidget (Constructor)</h4> +<b>DocumentationViewerWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -380,76 +338,8 @@ <dd> reference to the parent widget </dd> -</dl><a NAME="PlainTextDocumentationViewer.clear" ID="PlainTextDocumentationViewer.clear"></a> -<h4>PlainTextDocumentationViewer.clear</h4> -<b>clear</b>(<i></i>) -<p> - Public method to clear the contents. -</p><a NAME="PlainTextDocumentationViewer.preferencesChanged" ID="PlainTextDocumentationViewer.preferencesChanged"></a> -<h4>PlainTextDocumentationViewer.preferencesChanged</h4> -<b>preferencesChanged</b>(<i></i>) -<p> - Public slot to handle a change of preferences. -</p><a NAME="PlainTextDocumentationViewer.setText" ID="PlainTextDocumentationViewer.setText"></a> -<h4>PlainTextDocumentationViewer.setText</h4> -<b>setText</b>(<i>text</i>) -<p> - Public method to set the text to be shown. -</p><dl> -<dt><i>text</i> (str)</dt> -<dd> -text to be shown -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="WebViewDocumentationViewer" ID="WebViewDocumentationViewer"></a> -<h2>WebViewDocumentationViewer</h2> -<p> - Class implementing the rich text documentation viewer. -</p> -<h3>Derived from</h3> -QWidget -<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="#WebViewDocumentationViewer.__init__">WebViewDocumentationViewer</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#WebViewDocumentationViewer.__showLink">__showLink</a></td> -<td>Private slot to show the hovered link in a tooltip.</td> -</tr><tr> -<td><a href="#WebViewDocumentationViewer.clear">clear</a></td> -<td>Public method to clear the shown contents.</td> -</tr><tr> -<td><a href="#WebViewDocumentationViewer.setHtml">setHtml</a></td> -<td>Public method to set the HTML text of the widget.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="WebViewDocumentationViewer.__init__" ID="WebViewDocumentationViewer.__init__"></a> -<h4>WebViewDocumentationViewer (Constructor)</h4> -<b>WebViewDocumentationViewer</b>(<i>parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl><a NAME="WebViewDocumentationViewer.__showLink" ID="WebViewDocumentationViewer.__showLink"></a> -<h4>WebViewDocumentationViewer.__showLink</h4> +</dl><a NAME="DocumentationViewerWidget.__showLink" ID="DocumentationViewerWidget.__showLink"></a> +<h4>DocumentationViewerWidget.__showLink</h4> <b>__showLink</b>(<i>urlStr</i>) <p> Private slot to show the hovered link in a tooltip. @@ -458,13 +348,13 @@ <dd> hovered URL </dd> -</dl><a NAME="WebViewDocumentationViewer.clear" ID="WebViewDocumentationViewer.clear"></a> -<h4>WebViewDocumentationViewer.clear</h4> +</dl><a NAME="DocumentationViewerWidget.clear" ID="DocumentationViewerWidget.clear"></a> +<h4>DocumentationViewerWidget.clear</h4> <b>clear</b>(<i></i>) <p> Public method to clear the shown contents. -</p><a NAME="WebViewDocumentationViewer.setHtml" ID="WebViewDocumentationViewer.setHtml"></a> -<h4>WebViewDocumentationViewer.setHtml</h4> +</p><a NAME="DocumentationViewerWidget.setHtml" ID="DocumentationViewerWidget.setHtml"></a> +<h4>DocumentationViewerWidget.setHtml</h4> <b>setHtml</b>(<i>html</i>) <p> Public method to set the HTML text of the widget.
--- a/Documentation/Source/eric6.Utilities.__init__.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.Utilities.__init__.html Sun Sep 30 11:38:40 2018 +0200 @@ -1156,9 +1156,9 @@ Function to build the full path of an executable file from the environment on Windows platforms. </p><p> - First an executable with the extension .exe is searched for, thereafter one - with the extension .bat and finally the given file name as is. The first - match is returned. + First an executable with the extension .exe is searched for, thereafter + such with the extensions .cmd or .bat and finally the given file name as + is. The first match is returned. </p><dl> <dt><i>file</i></dt> <dd>
--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html Sun Sep 30 11:38:40 2018 +0200 @@ -48,7 +48,7 @@ QObject <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>DefaultKey</td></tr> </table> <h3>Class Methods</h3> <table> @@ -78,6 +78,9 @@ <td><a href="#VirtualenvManager.deleteVirtualEnvs">deleteVirtualEnvs</a></td> <td>Public method to delete virtual environments from the list and disk.</td> </tr><tr> +<td><a href="#VirtualenvManager.getDefaultEnvironment">getDefaultEnvironment</a></td> +<td>Public method to get the default virtual environment.</td> +</tr><tr> <td><a href="#VirtualenvManager.getEnvironmentEntries">getEnvironmentEntries</a></td> <td>Public method to get a dictionary containing the defined virtual environment entries.</td> </tr><tr> @@ -197,6 +200,26 @@ <dd> list of logical names for the virtual environments </dd> +</dl><a NAME="VirtualenvManager.getDefaultEnvironment" ID="VirtualenvManager.getDefaultEnvironment"></a> +<h4>VirtualenvManager.getDefaultEnvironment</h4> +<b>getDefaultEnvironment</b>(<i></i>) +<p> + Public method to get the default virtual environment. +</p><p> + Default is an environment with the key '<default>' or the first one + having an interpreter matching sys.executable (i.e. the one used to + execute eric6 with) +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the environment name and a dictionary + containing a copy of the default virtual environment +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, dict) +</dd> </dl><a NAME="VirtualenvManager.getEnvironmentEntries" ID="VirtualenvManager.getEnvironmentEntries"></a> <h4>VirtualenvManager.getEnvironmentEntries</h4> <b>getEnvironmentEntries</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.Network.QtHelpSchemeHandler.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.Network.QtHelpSchemeHandler.html Sun Sep 30 11:38:40 2018 +0200 @@ -138,6 +138,9 @@ <td><a href="#QtHelpSchemeReply.__init__">QtHelpSchemeReply</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#QtHelpSchemeReply.__loadQtHelpPage">__loadQtHelpPage</a></td> +<td>Private method to load the requested QtHelp page.</td> +</tr><tr> <td><a href="#QtHelpSchemeReply.__mimeFromUrl">__mimeFromUrl</a></td> <td>Private method to guess the mime type given an URL.</td> </tr><tr> @@ -174,6 +177,16 @@ <dd> reference to the parent object </dd> +</dl><a NAME="QtHelpSchemeReply.__loadQtHelpPage" ID="QtHelpSchemeReply.__loadQtHelpPage"></a> +<h4>QtHelpSchemeReply.__loadQtHelpPage</h4> +<b>__loadQtHelpPage</b>(<i>url</i>) +<p> + Private method to load the requested QtHelp page. +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +URL of the requested page +</dd> </dl><a NAME="QtHelpSchemeReply.__mimeFromUrl" ID="QtHelpSchemeReply.__mimeFromUrl"></a> <h4>QtHelpSchemeReply.__mimeFromUrl</h4> <b>__mimeFromUrl</b>(<i>url</i>)
--- a/Documentation/Source/eric6.install.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.install.html Sun Sep 30 11:38:40 2018 +0200 @@ -40,6 +40,15 @@ <td><a href="#cleanUp">cleanUp</a></td> <td>Uninstall the old eric files.</td> </tr><tr> +<td><a href="#cleanUpLinuxSpecifics">cleanUpLinuxSpecifics</a></td> +<td>Clean up Linux specific files.</td> +</tr><tr> +<td><a href="#cleanUpMacAppBundle">cleanUpMacAppBundle</a></td> +<td>Uninstall the macOS application bundle.</td> +</tr><tr> +<td><a href="#cleanUpWindowsLinks">cleanUpWindowsLinks</a></td> +<td>Clean up the Desktop and Start Menu entries for Windows.</td> +</tr><tr> <td><a href="#cleanupSource">cleanupSource</a></td> <td>Cleanup the sources directory to get rid of leftover files and directories.</td> </tr><tr> @@ -67,12 +76,21 @@ <td><a href="#createInstallConfig">createInstallConfig</a></td> <td>Create the installation config dictionary.</td> </tr><tr> +<td><a href="#createLinuxSpecifics">createLinuxSpecifics</a></td> +<td>Install Linux specific files.</td> +</tr><tr> <td><a href="#createMacAppBundle">createMacAppBundle</a></td> <td>Create a Mac application bundle.</td> </tr><tr> <td><a href="#createPyWrapper">createPyWrapper</a></td> <td>Create an executable wrapper for a Python script.</td> </tr><tr> +<td><a href="#createWindowsLinks">createWindowsLinks</a></td> +<td>Create Desktop and Start Menu links.</td> +</tr><tr> +<td><a href="#createWindowsShortcut">createWindowsShortcut</a></td> +<td>Create Windows shortcut.</td> +</tr><tr> <td><a href="#determinePyQtVariant">determinePyQtVariant</a></td> <td>Module function to determine the PyQt variant to be used.</td> </tr><tr> @@ -82,6 +100,9 @@ <td><a href="#exit">exit</a></td> <td>Exit the install script.</td> </tr><tr> +<td><a href="#getWinregEntry">getWinregEntry</a></td> +<td>Function to get an entry from the Windows Registry.</td> +</tr><tr> <td><a href="#initGlobals">initGlobals</a></td> <td>Module function to set the values of globals that need more than a simple assignment.</td> </tr><tr> @@ -103,8 +124,17 @@ <td><a href="#usage">usage</a></td> <td>Display a usage message and exit.</td> </tr><tr> -<td><a href="#wrapperName">wrapperName</a></td> -<td>Create the platform specific name for the wrapper script.</td> +<td><a href="#windowsDesktopEntries">windowsDesktopEntries</a></td> +<td>Function to generate data for the Windows Desktop links.</td> +</tr><tr> +<td><a href="#windowsDesktopNames">windowsDesktopNames</a></td> +<td>Function to generate the link names for the Windows Desktop.</td> +</tr><tr> +<td><a href="#windowsProgramsEntry">windowsProgramsEntry</a></td> +<td>Function to generate the name of the Start Menu top entry.</td> +</tr><tr> +<td><a href="#wrapperNames">wrapperNames</a></td> +<td>Create the platform specific names for the wrapper script.</td> </tr> </table> <hr /><hr /> @@ -138,6 +168,30 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="cleanUpLinuxSpecifics" ID="cleanUpLinuxSpecifics"></a> +<h2>cleanUpLinuxSpecifics</h2> +<b>cleanUpLinuxSpecifics</b>(<i></i>) +<p> + Clean up Linux specific files. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="cleanUpMacAppBundle" ID="cleanUpMacAppBundle"></a> +<h2>cleanUpMacAppBundle</h2> +<b>cleanUpMacAppBundle</b>(<i></i>) +<p> + Uninstall the macOS application bundle. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="cleanUpWindowsLinks" ID="cleanUpWindowsLinks"></a> +<h2>cleanUpWindowsLinks</h2> +<b>cleanUpWindowsLinks</b>(<i></i>) +<p> + Clean up the Desktop and Start Menu entries for Windows. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="cleanupSource" ID="cleanupSource"></a> <h2>cleanupSource</h2> <b>cleanupSource</b>(<i>dirName</i>) @@ -265,16 +319,24 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="createLinuxSpecifics" ID="createLinuxSpecifics"></a> +<h2>createLinuxSpecifics</h2> +<b>createLinuxSpecifics</b>(<i></i>) +<p> + Install Linux specific files. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="createMacAppBundle" ID="createMacAppBundle"></a> <h2>createMacAppBundle</h2> <b>createMacAppBundle</b>(<i>pydir</i>) <p> Create a Mac application bundle. </p><dl> -<dt><i>pydir</i></dt> +<dt><i>pydir</i> (str)</dt> <dd> the name of the directory where the Python script will - eventually be installed (string) + eventually be installed </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -305,6 +367,33 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="createWindowsLinks" ID="createWindowsLinks"></a> +<h2>createWindowsLinks</h2> +<b>createWindowsLinks</b>(<i></i>) +<p> + Create Desktop and Start Menu links. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="createWindowsShortcut" ID="createWindowsShortcut"></a> +<h2>createWindowsShortcut</h2> +<b>createWindowsShortcut</b>(<i>linkPath, targetPath, iconPath</i>) +<p> + Create Windows shortcut. +</p><dl> +<dt><i>linkPath</i> (str)</dt> +<dd> +path of the shortcut file +</dd><dt><i>targetPath</i> (str)</dt> +<dd> +path the shortcut shall point to +</dd><dt><i>iconPath</i> (str)</dt> +<dd> +path of the icon file +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="determinePyQtVariant" ID="determinePyQtVariant"></a> <h2>determinePyQtVariant</h2> <b>determinePyQtVariant</b>(<i></i>) @@ -334,6 +423,32 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="getWinregEntry" ID="getWinregEntry"></a> +<h2>getWinregEntry</h2> +<b>getWinregEntry</b>(<i>name, path</i>) +<p> + Function to get an entry from the Windows Registry. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +variable name +</dd><dt><i>path</i> (str)</dt> +<dd> +registry path of the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +value of requested registry variable +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="initGlobals" ID="initGlobals"></a> <h2>initGlobals</h2> <b>initGlobals</b>(<i></i>) @@ -440,11 +555,66 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="wrapperName" ID="wrapperName"></a> -<h2>wrapperName</h2> -<b>wrapperName</b>(<i>dname, wfile</i>) +<a NAME="windowsDesktopEntries" ID="windowsDesktopEntries"></a> +<h2>windowsDesktopEntries</h2> +<b>windowsDesktopEntries</b>(<i></i>) +<p> + Function to generate data for the Windows Desktop links. +</p><dl> +<dt>Returns:</dt> +<dd> +list of tuples containing the desktop link name, + the link target and the icon target +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of tuples of (str, str, str) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="windowsDesktopNames" ID="windowsDesktopNames"></a> +<h2>windowsDesktopNames</h2> +<b>windowsDesktopNames</b>(<i></i>) <p> - Create the platform specific name for the wrapper script. + Function to generate the link names for the Windows Desktop. +</p><dl> +<dt>Returns:</dt> +<dd> +list of desktop link names +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="windowsProgramsEntry" ID="windowsProgramsEntry"></a> +<h2>windowsProgramsEntry</h2> +<b>windowsProgramsEntry</b>(<i></i>) +<p> + Function to generate the name of the Start Menu top entry. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the Start Menu top entry +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="wrapperNames" ID="wrapperNames"></a> +<h2>wrapperNames</h2> +<b>wrapperNames</b>(<i>dname, wfile</i>) +<p> + Create the platform specific names for the wrapper script. </p><dl> <dt><i>dname</i></dt> <dd> @@ -456,7 +626,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -the name of the wrapper script +the names of the wrapper scripts </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.uninstall.html Sun Sep 02 11:07:03 2018 +0200 +++ b/Documentation/Source/eric6.uninstall.html Sun Sep 30 11:38:40 2018 +0200 @@ -40,6 +40,9 @@ <td><a href="#getConfigDir">getConfigDir</a></td> <td>Module function to get the name of the directory storing the config data.</td> </tr><tr> +<td><a href="#getWinregEntry">getWinregEntry</a></td> +<td>Function to get an entry from the Windows Registry.</td> +</tr><tr> <td><a href="#initGlobals">initGlobals</a></td> <td>Set the values of globals that need more than a simple assignment.</td> </tr><tr> @@ -58,11 +61,26 @@ <td><a href="#uninstallEric">uninstallEric</a></td> <td>Uninstall the eric files.</td> </tr><tr> +<td><a href="#uninstallLinuxSpecifics">uninstallLinuxSpecifics</a></td> +<td>Uninstall Linux specific files.</td> +</tr><tr> +<td><a href="#uninstallMacAppBundle">uninstallMacAppBundle</a></td> +<td>Uninstall the macOS application bundle.</td> +</tr><tr> +<td><a href="#uninstallWindowsLinks">uninstallWindowsLinks</a></td> +<td>Clean up the Desktop and Start Menu entries for Windows.</td> +</tr><tr> <td><a href="#usage">usage</a></td> <td>Display a usage message and exit.</td> </tr><tr> -<td><a href="#wrapperName">wrapperName</a></td> -<td>Create the platform specific name for the wrapper script.</td> +<td><a href="#windowsDesktopNames">windowsDesktopNames</a></td> +<td>Function to generate the link names for the Windows Desktop.</td> +</tr><tr> +<td><a href="#windowsProgramsEntry">windowsProgramsEntry</a></td> +<td>Function to generate the name of the Start Menu top entry.</td> +</tr><tr> +<td><a href="#wrapperNames">wrapperNames</a></td> +<td>Create the platform specific names for the wrapper script.</td> </tr> </table> <hr /><hr /> @@ -92,6 +110,32 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="getWinregEntry" ID="getWinregEntry"></a> +<h2>getWinregEntry</h2> +<b>getWinregEntry</b>(<i>name, path</i>) +<p> + Function to get an entry from the Windows Registry. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +variable name +</dd><dt><i>path</i> (str)</dt> +<dd> +registry path of the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +value of requested registry variable +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="initGlobals" ID="initGlobals"></a> <h2>initGlobals</h2> <b>initGlobals</b>(<i></i>) @@ -145,6 +189,30 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="uninstallLinuxSpecifics" ID="uninstallLinuxSpecifics"></a> +<h2>uninstallLinuxSpecifics</h2> +<b>uninstallLinuxSpecifics</b>(<i></i>) +<p> + Uninstall Linux specific files. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="uninstallMacAppBundle" ID="uninstallMacAppBundle"></a> +<h2>uninstallMacAppBundle</h2> +<b>uninstallMacAppBundle</b>(<i></i>) +<p> + Uninstall the macOS application bundle. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="uninstallWindowsLinks" ID="uninstallWindowsLinks"></a> +<h2>uninstallWindowsLinks</h2> +<b>uninstallWindowsLinks</b>(<i></i>) +<p> + Clean up the Desktop and Start Menu entries for Windows. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> <b>usage</b>(<i>rcode=2</i>) @@ -158,11 +226,47 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="wrapperName" ID="wrapperName"></a> -<h2>wrapperName</h2> -<b>wrapperName</b>(<i>dname, wfile</i>) +<a NAME="windowsDesktopNames" ID="windowsDesktopNames"></a> +<h2>windowsDesktopNames</h2> +<b>windowsDesktopNames</b>(<i></i>) <p> - Create the platform specific name for the wrapper script. + Function to generate the link names for the Windows Desktop. +</p><dl> +<dt>Returns:</dt> +<dd> +list of desktop link names +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="windowsProgramsEntry" ID="windowsProgramsEntry"></a> +<h2>windowsProgramsEntry</h2> +<b>windowsProgramsEntry</b>(<i></i>) +<p> + Function to generate the name of the Start Menu top entry. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the Start Menu top entry +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="wrapperNames" ID="wrapperNames"></a> +<h2>wrapperNames</h2> +<b>wrapperNames</b>(<i>dname, wfile</i>) +<p> + Create the platform specific names for the wrapper script. </p><dl> <dt><i>dname</i></dt> <dd> @@ -174,7 +278,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -the name of the wrapper script +the names of the wrapper scripts </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/E5Gui/E5TextEditSearchWidget.py Sun Sep 02 11:07:03 2018 +0200 +++ b/E5Gui/E5TextEditSearchWidget.py Sun Sep 30 11:38:40 2018 +0200 @@ -135,10 +135,7 @@ # place everything together self.verticalLayout.addLayout(self.horizontalLayout1) - if widthForHeight: - self.horizontalLayout1.addLayout(self.horizontalLayout2) - else: - self.verticalLayout.addLayout(self.horizontalLayout2) + self.__addWidthForHeightLayout(widthForHeight) self.verticalLayout.addWidget(self.infoLabel) QMetaObject.connectSlotsByName(self) @@ -148,6 +145,35 @@ self.setTabOrder(self.wordCheckBox, self.findPrevButton) self.setTabOrder(self.findPrevButton, self.findNextButton) + def setWidthForHeight(self, widthForHeight): + """ + Public method to set the 'width for height'. + + @param widthForHeight flag indicating to prefer width + @type bool + """ + if self.__widthForHeight: + self.horizontalLayout1.takeAt(self.__widthForHeightLayoutIndex) + else: + self.verticalLayout.takeAt(self.__widthForHeightLayoutIndex) + self.__addWidthForHeightLayout(widthForHeight) + + def __addWidthForHeightLayout(self, widthForHeight): + """ + Private method to set the middle part of the layout. + + @param widthForHeight flag indicating to prefer width + @type bool + """ + if widthForHeight: + self.horizontalLayout1.addLayout(self.horizontalLayout2) + self.__widthForHeightLayoutIndex = 2 + else: + self.verticalLayout.insertLayout(1, self.horizontalLayout2) + self.__widthForHeightLayoutIndex = 1 + + self.__widthForHeight = widthForHeight + def attachTextEdit(self, textedit, editType="QTextEdit"): """ Public method to attach a QTextEdit widget.
--- a/Network/IRC/IrcChannelWidget.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Network/IRC/IrcChannelWidget.py Sun Sep 30 11:38:40 2018 +0200 @@ -9,10 +9,15 @@ from __future__ import unicode_literals +try: + from itertools import izip_longest as zip_longest # __IGNORE_EXCEPTION__ +except ImportError: + from itertools import zip_longest + import re from PyQt5.QtCore import pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, \ - QTimer, QUrl + QTimer, QUrl, QCoreApplication from PyQt5.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices from PyQt5.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication, \ QInputDialog, QLineEdit @@ -63,7 +68,9 @@ self.__privilege = IrcUserItem.Normal self.__name = name + self.__ignored = False + self.__setText() self.__setIcon() def name(self): @@ -81,7 +88,7 @@ @param name new nick name for the user (string) """ self.__name = name - self.setText(name) + self.__setText() def changePrivilege(self, privilege): """ @@ -106,6 +113,17 @@ self.__privilege = IrcUserItem.Normal self.__setIcon() + def __setText(self): + """ + Private method to set the user item text. + """ + if self.__ignored: + self.setText(QCoreApplication.translate( + "IrcUserItem", + "{0} (ignored)").format(self.__name)) + else: + self.setText(self.__name) + def __setIcon(self): """ Private method to set the icon dependent on user privileges. @@ -176,6 +194,25 @@ return(bool(self.__privilege & IrcUserItem.Operator) or bool(self.__privilege & IrcUserItem.Admin) or bool(self.__privilege & IrcUserItem.Owner)) + + def setIgnored(self, ignored): + """ + Public method to set the user status to ignored. + + @param ignored flag indicating the new ignored status + @type bool + """ + self.__ignored = ignored + self.__setText() + + def isIgnored(self): + """ + Public method to check, if this user is ignored. + + @return flag indicating the ignored status + @rtype bool + """ + return self.__ignored class IrcChannelWidget(QWidget, Ui_IrcChannelWidget): @@ -183,15 +220,24 @@ Class implementing the IRC channel widget. @signal sendData(str) emitted to send a message to the channel + @signal sendCtcpRequest(str, str, str) emitted to send a CTCP request @signal sendCtcpReply(str, str) emitted to send a CTCP reply @signal channelClosed(str) emitted after the user has left the channel @signal openPrivateChat(str) emitted to open a "channel" for private messages + @signal awayCommand(str) emitted to set the away status via the /away + command + @signal leaveChannels(list) emitted to leave a list of channels + @signal leaveAllChannels() emitted to leave all channels """ sendData = pyqtSignal(str) + sendCtcpRequest = pyqtSignal(str, str, str) sendCtcpReply = pyqtSignal(str, str) channelClosed = pyqtSignal(str) openPrivateChat = pyqtSignal(str) + awayCommand = pyqtSignal(str) + leaveChannels = pyqtSignal(list) + leaveAllChannels = pyqtSignal() UrlRe = re.compile( r"""((?:http|ftp|https):\/\/[\w\-_]+(?:\.[\w\-_]+)+""" @@ -358,6 +404,7 @@ Preferences.getIrc("OwnNickColour"), ircTimestamp(), self.__userName, Utilities.html_encode(msg))) + if msg.startswith("/"): if self.__private: E5MessageBox.information( @@ -367,21 +414,96 @@ """Messages starting with a '/' are not allowed""" """ in private chats.""")) else: + sendData = True + # flag set to False, if command was handled + msgList = msg.split() cmd = msgList[0][1:].upper() - if cmd == "MSG": + if cmd in ["MSG", "QUERY"]: cmd = "PRIVMSG" - if (len(msgList) > 1 and - msgList[1].strip().lower() in - self.__serviceNamesLower): - msg = "PRIVMSG " + msgList[1].strip().lower() + \ - " :" + " ".join(msgList[2:]) + if len(msgList) > 1: + if msgList[1].strip().lower() in \ + self.__serviceNamesLower: + msg = "PRIVMSG " + \ + msgList[1].strip().lower() + \ + " :" + " ".join(msgList[2:]) + else: + msg = "PRIVMSG {0} :{1}".format( + msgList[1], " ".join(msgList[2:])) else: msgList[0] = cmd msg = " ".join(msgList) + elif cmd == "NOTICE": + if len(msgList) > 2: + msg = "NOTICE {0} :{1}".format( + msgList[1], " ".join(msgList[2:])) + else: + msg = "NOTICE {0}".format(" ".join(msgList[1:])) + elif cmd == "PING": + receiver = msgList[1] + msg = "PING {0} " + self.sendCtcpRequest.emit(receiver, "PING", "") + sendData = False + elif cmd == "IGNORE": + sendData = False + if len(msgList) > 1: + if msgList[1] == "-r": + ignored = False + userNamesList = msgList[2:] + else: + ignored = True + userNamesList = msgList[1:] + else: + userNamesList = [] + userNames = ",".join( + u.rstrip(",") for u in userNamesList).split(",") + for userName in userNames: + itm = self.__findUser(userName) + if itm: + itm.setIgnored(ignored) + elif cmd == "UNIGNORE": + sendData = False + if len(msgList) > 1: + userNamesList = msgList[1:] + else: + userNamesList = [] + userNames = ",".join( + u.rstrip(",") for u in userNamesList).split(",") + for userName in userNames: + itm = self.__findUser(userName) + if itm: + itm.setIgnored(False) + elif cmd == "AWAY": + sendData = False + if len(msgList) > 1: + msg = " ".join(msgList[1:]) + else: + msg = "" + self.awayCommand.emit(msg) + elif cmd == "JOIN": + sendData = False + if len(msgList) > 1: + channels = msgList[1].split(",") + if len(msgList) > 2: + keys = msgList[2].split(",") + else: + keys = [] + for channel, key in zip_longest( + channels, keys, fillvalue=""): + self.__ircWidget.joinChannel(channel, key) + elif cmd == "PART": + sendData = False + if len(msgList) == 1: + self.leaveChannel() + else: + self.leaveChannels.emit(msgList[1:]) + elif cmd == "PARTALL": + sendData = False + self.leaveAllChannels.emit() else: msg = msg[1:] - self.sendData.emit(msg) + if sendData: + self.sendData.emit(msg) else: if self.__private: self.sendData.emit( @@ -389,6 +511,7 @@ else: self.sendData.emit( "PRIVMSG " + self.__name + " :" + msg) + self.messageEdit.clear() self.unsetMarkerLine() @@ -400,13 +523,19 @@ self, self.tr("Leave IRC channel"), self.tr( - """Do you really want to leave the IRC channel <b>{0}</b>?""") - .format(self.__name)) + """Do you really want to leave the IRC channel""" + """ <b>{0}</b>?""").format(self.__name)) if ok: - if not self.__private: - self.sendData.emit( - "PART " + self.__name + " :" + self.__partMessage) - self.channelClosed.emit(self.__name) + self.leaveChannel() + + def leaveChannel(self): + """ + Public slot to leave the channel. + """ + if not self.__private: + self.sendData.emit( + "PART " + self.__name + " :" + self.__partMessage) + self.channelClosed.emit(self.__name) def name(self): """ @@ -511,10 +640,16 @@ # group(3) target nick # group(4) message if match.group(3).lower() == self.__name.lower(): + senderName = match.group(1) + itm = self.__findUser(senderName) + if itm and itm.isIgnored(): + # user should be ignored + return True + if match.group(4).startswith("\x01"): return self.__handleCtcp(match) - self.addMessage(match.group(1), match.group(4)) + self.addMessage(senderName, match.group(4)) if self.__private and not self.topicLabel.text(): self.setPrivateInfo( "{0} - {1}".format(match.group(1), match.group(2)))
--- a/Network/IRC/IrcNetworkWidget.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Network/IRC/IrcNetworkWidget.py Sun Sep 30 11:38:40 2018 +0200 @@ -167,20 +167,37 @@ Private slot to toggle the away status. """ if self.__away: - self.sendData.emit("AWAY") - self.awayButton.setIcon( - UI.PixmapCache.getIcon("ircUserPresent.png")) - self.__away = False + self.handleAwayCommand("") else: networkName = self.networkCombo.currentText() identityName = self.__manager.getNetwork(networkName)\ .getIdentityName() awayMessage = self.__manager.getIdentity(identityName)\ .getAwayMessage() + self.handleAwayCommand(awayMessage) + + @pyqtSlot(str) + def handleAwayCommand(self, awayMessage): + """ + Public slot to process an away command. + + @param awayMessage message to be set for being away + @type str + """ + if awayMessage and not self.__away: + # set being away + # don't send away, if the status is already set self.sendData.emit("AWAY :" + awayMessage) self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway.png")) self.__away = True - self.away.emit(self.__away) + self.away.emit(self.__away) + elif not awayMessage and self.__away: + # cancel being away + self.sendData.emit("AWAY") + self.awayButton.setIcon( + UI.PixmapCache.getIcon("ircUserPresent.png")) + self.__away = False + self.away.emit(self.__away) @pyqtSlot() def on_editButton_clicked(self):
--- a/Network/IRC/IrcWidget.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Network/IRC/IrcWidget.py Sun Sep 30 11:38:40 2018 +0200 @@ -16,7 +16,8 @@ import re import logging -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer, \ + QDateTime from PyQt5.QtWidgets import QWidget, QToolButton, QLabel, QTabWidget from PyQt5.QtNetwork import QTcpSocket, QAbstractSocket try: @@ -127,7 +128,7 @@ self.networkWidget.initialize(self.__ircNetworkManager) self.networkWidget.connectNetwork.connect(self.__connectNetwork) self.networkWidget.editNetwork.connect(self.__editNetwork) - self.networkWidget.joinChannel.connect(self.__joinChannel) + self.networkWidget.joinChannel.connect(self.joinChannel) self.networkWidget.nickChanged.connect(self.__changeNick) self.networkWidget.sendData.connect(self.__send) self.networkWidget.away.connect(self.__away) @@ -288,9 +289,9 @@ for channel in self.__channelList: channel.setPartMessage(partMsg) - def __joinChannel(self, name, key=""): + def joinChannel(self, name, key=""): """ - Private slot to join a channel. + Public slot to join a channel. @param name name of the channel (string) @param key key of the channel (string) @@ -310,9 +311,13 @@ channel.initAutoWho() channel.sendData.connect(self.__send) + channel.sendCtcpRequest.connect(self.__sendCtcpRequest) channel.sendCtcpReply.connect(self.__sendCtcpReply) channel.channelClosed.connect(self.__closeChannel) channel.openPrivateChat.connect(self.__openPrivate) + channel.awayCommand.connect(self.networkWidget.handleAwayCommand) + channel.leaveChannels.connect(self.__leaveChannels) + channel.leaveAllChannels.connect(self.__leaveAllChannels) self.channelsWidget.addTab(channel, name) self.__channelList.append(channel) @@ -371,8 +376,12 @@ channel.addUsers([name, self.__nickName]) channel.sendData.connect(self.__send) + channel.sendCtcpRequest.connect(self.__sendCtcpRequest) channel.sendCtcpReply.connect(self.__sendCtcpReply) channel.channelClosed.connect(self.__closeChannel) + channel.awayCommand.connect(self.networkWidget.handleAwayCommand) + channel.leaveChannels.connect(self.__leaveChannels) + channel.leaveAllChannels.connect(self.__leaveAllChannels) self.channelsWidget.addTab(channel, name) self.__channelList.append(channel) @@ -386,6 +395,29 @@ channel = self.channelsWidget.currentWidget() channel.requestLeave() + @pyqtSlot(list) + def __leaveChannels(self, channelNames): + """ + Private slot to leave a list of channels and close their associated + tabs. + + @param channelNames list of channels to leave + @type list of str + """ + for channelName in channelNames: + for channel in self.__channelList: + if channel.name() == channelName: + channel.leaveChannel() + + @pyqtSlot() + def __leaveAllChannels(self): + """ + Private slot to leave all channels and close their tabs. + """ + while self.__channelList: + channel = self.__channelList[0] + channel.leaveChannel() + def __closeAllChannels(self): """ Private method to close all channels. @@ -441,12 +473,33 @@ self.__socket.write( QByteArray("{0}\r\n".format(data).encode("utf-8"))) + def __sendCtcpRequest(self, receiver, request, arguments): + """ + Private slot to send a CTCP request. + + @param receiver nick name of the receiver + @type str + @param request CTCP request to be sent + @type str + @param arguments arguments to be sent + @type str + """ + request = request.upper() + if request == "PING": + arguments = "Eric IRC {0}".format( + QDateTime.currentMSecsSinceEpoch()) + + self.__send("PRIVMSG {0} :\x01{1} {2}\x01".format( + receiver, request, arguments)) + def __sendCtcpReply(self, receiver, text): """ Private slot to send a CTCP reply. - @param receiver nick name of the receiver (string) - @param text text to be sent (string) + @param receiver nick name of the receiver + @type str + @param text text to be sent + @type str """ self.__send("NOTICE {0} :\x01{1}\x01".format(receiver, text)) @@ -551,6 +604,42 @@ self.__updateUsersCount() self.__buffer = "" + def __handleCtcpReply(self, match): + """ + Private method to handle a server message containing a CTCP reply. + + @param match reference to the match object + """ + if "!" in match.group(1): + sender = match.group(1).split("!", 1)[0] + + try: + ctcpCommand = match.group(3).split(":", 1)[1] + except IndexError: + ctcpCommand = match.group(3) + ctcpCommand = ctcpCommand[1:].split("\x01", 1)[0] + if " " in ctcpCommand: + ctcpReply, ctcpArg = ctcpCommand.split(" ", 1) + else: + ctcpReply, ctcpArg = ctcpCommand, "" + ctcpReply = ctcpReply.upper() + + if ctcpReply == "PING" and ctcpArg.startswith("Eric IRC "): + # it is a response to a ping request + pingDateTime = int(ctcpArg.split()[-1]) + latency = QDateTime.currentMSecsSinceEpoch() - pingDateTime + self.networkWidget.addServerMessage( + self.tr("CTCP"), + self.tr( + "Received CTCP-PING response from {0} with latency" + " of {1} ms.").format(sender, latency)) + else: + self.networkWidget.addServerMessage( + self.tr("CTCP"), + self.tr( + "Received unknown CTCP-{0} response from {1}.") + .format(ctcpReply, sender)) + def __handleNamedMessage(self, match): """ Private method to handle a server message containing a message name. @@ -564,6 +653,11 @@ msg = match.group(3).split(":", 1)[1] except IndexError: msg = match.group(3) + + if msg.startswith("\x01"): + self.__handleCtcpReply(match) + return True + if "!" in match.group(1): name = match.group(1).split("!", 1)[0] msg = "-{0}- {1}".format(name, msg) @@ -612,6 +706,11 @@ self.tr("User {0} is now known as {1}.").format( oldNick, newNick)) return True + elif name == "PONG": + nick = match.group(3).split(":", 1)[1] + self.networkWidget.addMessage( + self.tr("Received PONG from {0}").format(nick)) + return True elif name == "ERROR": self.networkWidget.addErrorMessage( self.tr("Server Error"), match.group(3).split(":", 1)[1]) @@ -749,7 +848,7 @@ if channel.autoJoin(): name = channel.getName() key = channel.getKey() - self.__joinChannel(name, key) + self.joinChannel(name, key) def __tcpError(self, error): """
--- a/Plugins/PluginEricapi.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Plugins/PluginEricapi.py Sun Sep 30 11:38:40 2018 +0200 @@ -51,7 +51,9 @@ """ exe = 'eric6_api' if Utilities.isWindowsPlatform(): - exe = os.path.join(getConfig("bindir"), exe + '.bat') + exe = os.path.join(getConfig("bindir"), exe + '.cmd') + if not os.path.exists(exe): + exe = os.path.join(getConfig("bindir"), exe + '.bat') else: exe = os.path.join(getConfig("bindir"), exe)
--- a/Plugins/PluginEricdoc.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Plugins/PluginEricdoc.py Sun Sep 30 11:38:40 2018 +0200 @@ -54,7 +54,9 @@ # 1. eric6_doc exe = 'eric6_doc' if Utilities.isWindowsPlatform(): - exe = os.path.join(getConfig("bindir"), exe + '.bat') + exe = os.path.join(getConfig("bindir"), exe + '.cmd') + if not os.path.exists(exe): + exe = os.path.join(getConfig("bindir"), exe + '.bat') else: exe = os.path.join(getConfig("bindir"), exe) dataList.append({
--- a/Plugins/VcsPlugins/vcsGit/git.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/git.py Sun Sep 30 11:38:40 2018 +0200 @@ -190,9 +190,9 @@ if finished and process.exitCode() == 0: output = str(process.readAllStandardOutput(), ioEncoding, 'replace') - self.versionStr = output.splitlines()[0].split()[-1] + versionLine = output.splitlines()[0] v = list(re.match(r'.*?(\d+)\.(\d+)\.?(\d+)?\.?(\d+)?', - self.versionStr).groups()) + versionLine).groups()) for i in range(4): try: v[i] = int(v[i]) @@ -201,6 +201,7 @@ except IndexError: v.append(0) self.version = tuple(v) + self.versionStr = '.'.join([str(v) for v in self.version]) return True, errMsg else: if finished:
--- a/Preferences/ConfigurationPages/EditorDocViewerPage.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Preferences/ConfigurationPages/EditorDocViewerPage.py Sun Sep 30 11:38:40 2018 +0200 @@ -36,8 +36,6 @@ # set initial values self.parenthesisCheckBox.setChecked( Preferences.getDocuViewer("ShowInfoOnOpenParenthesis")) - self.richTextCheckBox.setChecked( - Preferences.getDocuViewer("ShowInfoAsRichText")) provider = Preferences.getDocuViewer("Provider") self.viewerGroupBox.setChecked(provider != "disabled") @@ -56,9 +54,6 @@ "ShowInfoOnOpenParenthesis", self.parenthesisCheckBox.isChecked()) Preferences.setDocuViewer( - "ShowInfoAsRichText", - self.richTextCheckBox.isChecked()) - Preferences.setDocuViewer( "Provider", self.providerComboBox.itemData( self.providerComboBox.currentIndex())
--- a/Preferences/ConfigurationPages/EditorDocViewerPage.ui Sun Sep 02 11:07:03 2018 +0200 +++ b/Preferences/ConfigurationPages/EditorDocViewerPage.ui Sun Sep 30 11:38:40 2018 +0200 @@ -54,16 +54,6 @@ </widget> </item> <item> - <widget class="QCheckBox" name="richTextCheckBox"> - <property name="toolTip"> - <string>Select to show code documentation as rich text</string> - </property> - <property name="text"> - <string>Show documentation as rich text</string> - </property> - </widget> - </item> - <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QLabel" name="label"> @@ -111,7 +101,6 @@ <tabstops> <tabstop>viewerGroupBox</tabstop> <tabstop>parenthesisCheckBox</tabstop> - <tabstop>richTextCheckBox</tabstop> <tabstop>providerComboBox</tabstop> </tabstops> <resources/>
--- a/Project/DebuggerPropertiesDialog.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Project/DebuggerPropertiesDialog.py Sun Sep 30 11:38:40 2018 +0200 @@ -55,10 +55,10 @@ self.debugClientClearHistoryButton.setIcon( UI.PixmapCache.getIcon("editDelete.png")) + venvManager = e5App().getObject("VirtualEnvManager") + self.venvComboBox.addItem("") - self.venvComboBox.addItems( - sorted(e5App().getObject("VirtualEnvManager") - .getVirtualenvNames())) + self.venvComboBox.addItems(sorted(venvManager.getVirtualenvNames())) self.translationLocalCompleter = E5DirCompleter( self.translationLocalEdit) @@ -75,6 +75,8 @@ venvName = Preferences.getDebugger("Python3VirtualEnv") else: venvName = "" + if not venvName: + venvName, _ = venvManager.getDefaultEnvironment() if venvName: venvIndex = max(0, self.venvComboBox.findText(venvName)) else:
--- a/QScintilla/Editor.py Sun Sep 02 11:07:03 2018 +0200 +++ b/QScintilla/Editor.py Sun Sep 30 11:38:40 2018 +0200 @@ -2626,6 +2626,10 @@ lineIndex += 1 shouldBreak = False + if line.endswith("__NO-TASK__"): + # ignore potential task marker + continue + for taskType, taskMarkers in markers.items(): for taskMarker in taskMarkers: index = line.find(taskMarker) @@ -4751,8 +4755,10 @@ self.__acCompletionsFinished += 1 # Got all results from auto completer? - if self.__acCompletionsFinished >= len( - self.__completionListAsyncHookFunctions): + if self.__acCompletionsFinished >= ( + len(self.__completionListAsyncHookFunctions) + + len(self.__completionListHookFunctions) + ): self.__acWatchdog.stop() # Autocomplete with QScintilla if no results present
--- a/Tasks/TaskViewer.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Tasks/TaskViewer.py Sun Sep 30 11:38:40 2018 +0200 @@ -741,6 +741,10 @@ lineIndex += 1 shouldBreak = False + if line.endswith("__NO-TASK__"): + # ignore potential task marker + continue + for taskType, taskMarkers in markers.items(): for taskMarker in taskMarkers: index = line.find(taskMarker) @@ -854,6 +858,10 @@ lineIndex += 1 found = False + if line.endswith("__NO-TASK__"): + # ignore potential task marker + continue + for taskType, taskMarkers in markers.items(): for taskMarker in taskMarkers: index = line.find(taskMarker)
--- a/UI/CodeDocumentationViewer.py Sun Sep 02 11:07:03 2018 +0200 +++ b/UI/CodeDocumentationViewer.py Sun Sep 30 11:38:40 2018 +0200 @@ -17,14 +17,11 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QTimer from PyQt5.QtGui import QCursor from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, \ - QComboBox, QSizePolicy, QLineEdit, QTextEdit, QToolTip, QToolButton, \ - QActionGroup, QMenu + QComboBox, QSizePolicy, QLineEdit, QTextBrowser, QToolTip from E5Gui.E5TextEditSearchWidget import E5TextEditSearchWidget -from E5Gui.E5ToolButton import E5ToolButton import Preferences -import UI.PixmapCache from .CodeDocumentationViewerTemplate import \ prepareDocumentationViewerHtmlDocument, \ @@ -34,9 +31,9 @@ from .data import codeDocumentationViewer_rc # __IGNORE_WARNING__ -class PlainTextDocumentationViewer(QWidget): +class DocumentationViewerWidget(QWidget): """ - Class implementing the plain text documentation viewer. + Class implementing a rich text documentation viewer. """ def __init__(self, parent=None): """ @@ -45,66 +42,8 @@ @param parent reference to the parent widget @type QWidget """ - super(PlainTextDocumentationViewer, self).__init__(parent) - self.setObjectName("PlainTextDocumentationViewer") - - self.__verticalLayout = QVBoxLayout(self) - self.__verticalLayout.setObjectName("verticalLayout") - self.__verticalLayout.setContentsMargins(0, 0, 0, 0) - - self.__contents = QTextEdit(self) - self.__contents.setTabChangesFocus(True) - self.__contents.setReadOnly(True) - self.__contents.setLineWrapMode(QTextEdit.NoWrap) - self.__contents.setObjectName("contents") - self.__verticalLayout.addWidget(self.__contents) - - self.__searchWidget = E5TextEditSearchWidget(self, False) - self.__searchWidget.setFocusPolicy(Qt.WheelFocus) - self.__searchWidget.setObjectName("searchWidget") - self.__verticalLayout.addWidget(self.__searchWidget) - - self.__searchWidget.attachTextEdit(self.__contents, "QTextEdit") - - self.preferencesChanged() - - def clear(self): - """ - Public method to clear the contents. - """ - self.__contents.clear() - - def setText(self, text): - """ - Public method to set the text to be shown. - - @param text text to be shown - @type str - """ - self.__contents.setPlainText(text) - - def preferencesChanged(self): - """ - Public slot to handle a change of preferences. - """ - font = Preferences.getEditorOtherFonts("MonospacedFont") - self.__contents.setFontFamily(font.family()) - self.__contents.setFontPointSize(font.pointSize()) - - -class WebViewDocumentationViewer(QWidget): - """ - Class implementing the rich text documentation viewer. - """ - def __init__(self, parent=None): - """ - Constructor - - @param parent reference to the parent widget - @type QWidget - """ - super(WebViewDocumentationViewer, self).__init__(parent) - self.setObjectName("WebViewDocumentationViewer") + super(DocumentationViewerWidget, self).__init__(parent) + self.setObjectName("DocumentationViewerWidget") self.__verticalLayout = QVBoxLayout(self) self.__verticalLayout.setObjectName("verticalLayout") @@ -121,13 +60,18 @@ except AttributeError: # pre Qt 5.8 pass - self.__usesWebKit = False + self.__viewerType = "QWebEngineView" except ImportError: - from PyQt5.QtWebKitWidgets import QWebPage, QWebView - self.__contents = QWebView(self) - self.__contents.page().setLinkDelegationPolicy( - QWebPage.DelegateAllLinks) - self.__usesWebKit = True + try: + from PyQt5.QtWebKitWidgets import QWebPage, QWebView + self.__contents = QWebView(self) + self.__contents.page().setLinkDelegationPolicy( + QWebPage.DelegateAllLinks) + self.__viewerType = "QWebView" + except ImportError: + self.__contents = QTextBrowser(self) + self.__contents.setOpenExternalLinks(True) + self.__viewerType = "QTextEdit" sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -136,7 +80,8 @@ self.__contents.sizePolicy().hasHeightForWidth()) self.__contents.setSizePolicy(sizePolicy) self.__contents.setContextMenuPolicy(Qt.NoContextMenu) - self.__contents.setUrl(QUrl("about:blank")) + if self.__viewerType != "QTextEdit": + self.__contents.setUrl(QUrl("about:blank")) self.__verticalLayout.addWidget(self.__contents) self.__searchWidget = E5TextEditSearchWidget(self, False) @@ -145,9 +90,7 @@ self.__verticalLayout.addWidget(self.__searchWidget) self.__searchWidget.attachTextEdit( - self.__contents, - "QWebView" if self.__usesWebKit else "QWebEngineView", - ) + self.__contents, self.__viewerType) @pyqtSlot(str) def __showLink(self, urlStr): @@ -174,7 +117,10 @@ """ Public method to clear the shown contents. """ - self.__contents.setHtml("") + if self.__viewerType == "QTextEdit": + self.__contents.clear() + else: + self.__contents.setHtml("") class CodeDocumentationViewer(QWidget): @@ -252,62 +198,20 @@ self.horizontalLayout1.addWidget(self.providerComboBox) # top row 2 of widgets - self.horizontalLayout2 = QHBoxLayout() - self.horizontalLayout2.setObjectName("horizontalLayout2") - self.objectLineEdit = QLineEdit(self) self.objectLineEdit.setReadOnly(True) self.objectLineEdit.setObjectName("objectLineEdit") - self.horizontalLayout2.addWidget(self.objectLineEdit) self.verticalLayout.addLayout(self.horizontalLayout1) - self.verticalLayout.addLayout(self.horizontalLayout2) - - # Plain Text Viewer - self.__plainTextViewer = PlainTextDocumentationViewer(self) - self.__plainTextViewer.setObjectName("__plainTextViewer") - self.verticalLayout.addWidget(self.__plainTextViewer) + self.verticalLayout.addWidget(self.objectLineEdit) # Rich Text (Web) Viewer - try: - self.__richTextViewer = WebViewDocumentationViewer(self) - self.__richTextViewer.setObjectName("__richTextViewer") - self.verticalLayout.addWidget(self.__richTextViewer) - except ImportError: - # neither QtWebEngineWidgets nor QtWebKitWidgets is available - self.__richTextViewer = None - - self.__toolButton = E5ToolButton(self) - self.__toolButton.setObjectName( - "navigation_supermenu_button") - self.__toolButton.setIcon(UI.PixmapCache.getIcon("superMenu.png")) - self.__toolButton.setToolTip(self.tr("Main Menu")) - self.__toolButton.setPopupMode(QToolButton.InstantPopup) - self.__toolButton.setToolButtonStyle(Qt.ToolButtonIconOnly) - self.__toolButton.setFocusPolicy(Qt.NoFocus) - self.__toolButton.setAutoRaise(True) - self.__toolButton.setShowMenuInside(True) + self.__viewerWidget = DocumentationViewerWidget(self) + self.__viewerWidget.setObjectName("__viewerWidget") + self.verticalLayout.addWidget(self.__viewerWidget) - self.__optionsActionGroup = QActionGroup(self) - self.__optionsActionGroup.setExclusive(True) - self.__optionsMenu = QMenu(self) - if self.__richTextViewer: - self.__richTextAct = self.__optionsMenu.addAction( - self.tr("Rich Text"), - lambda: self.__showTextViewer(True)) - self.__richTextAct.setCheckable(True) - self.__optionsActionGroup.addAction(self.__richTextAct) - else: - # neither QtWebEngineWidgets nor QtWebKitWidgets is available - self.__richTextAct = None - self.__plainTextAct = self.__optionsMenu.addAction( - self.tr("Plain Text"), - lambda: self.__showTextViewer(False)) - self.__plainTextAct.setCheckable(True) - self.__optionsActionGroup.addAction(self.__plainTextAct) - - self.__toolButton.setMenu(self.__optionsMenu) - self.horizontalLayout2.addWidget(self.__toolButton) + # backward compatibility for plug-ins before 2018-09-17 + Preferences.setDocuViewer("ShowInfoAsRichText", True) self.providerComboBox.currentIndexChanged[int].connect( self.on_providerComboBox_currentIndexChanged) @@ -316,12 +220,6 @@ """ Public method to finalize the setup of the documentation viewer. """ - if self.__richTextViewer is None: - showRichText = False - else: - showRichText = Preferences.getDocuViewer("ShowInfoAsRichText") - self.__showTextViewer(showRichText) - self.__startingUp = False provider = Preferences.getDocuViewer("Provider") if provider in self.__providers: @@ -443,9 +341,7 @@ self.objectLineEdit.setText(word) if self.__selectedProvider != self.__disabledProvider: - self.__plainTextViewer.clear() - if self.__richTextViewer: - self.__richTextViewer.clear() + self.__viewerWidget.clear() self.__providers[self.__selectedProvider][0](editor) def documentationReady(self, documentationInfo, isWarning=False, @@ -482,70 +378,18 @@ self.documentationReady(self.tr("No documentation available"), isDocWarning=True) else: - if self.__showMarkdown: - if isWarning: - html = prepareDocumentationViewerHtmlWarningDocument( - documentationInfo) - elif isDocWarning: - html = prepareDocumentationViewerHtmlDocWarningDocument( - documentationInfo) - elif isinstance(documentationInfo, dict): - html = prepareDocumentationViewerHtmlDocument( - documentationInfo) - else: - html = documentationInfo - self.__setHtml(html) + if isWarning: + html = prepareDocumentationViewerHtmlWarningDocument( + documentationInfo) + elif isDocWarning: + html = prepareDocumentationViewerHtmlDocWarningDocument( + documentationInfo) + elif isinstance(documentationInfo, dict): + html = prepareDocumentationViewerHtmlDocument( + documentationInfo) else: - if isinstance(documentationInfo, basestring): - fullText = documentationInfo - elif isinstance(documentationInfo, dict): - name = documentationInfo["name"] - if name: - title = "".join([name, "\n", - "=" * len(name), "\n\n"]) - - if "argspec" in documentationInfo and \ - documentationInfo["argspec"]: - definition = self.tr("Definition: {0}{1}\n")\ - .format(name, documentationInfo["argspec"]) - elif name: - definition = self.tr("Definition: {0}\n")\ - .format(name) - else: - definition = "" - - if "typ" in documentationInfo and \ - documentationInfo["typ"]: - typeInfo = self.tr("Type: {0}\n").format( - documentationInfo["typ"]) - else: - typeInfo = "" - - if "note" in documentationInfo and \ - documentationInfo["note"]: - note = self.tr("Note: {0}\n").format( - documentationInfo["note"]) - else: - note = "" - - header = "".join([title, definition, typeInfo, note]) - else: - header = "" - - if "docstring" not in documentationInfo or \ - not documentationInfo["docstring"]: - docString = self.tr( - "No further documentation available") - else: - if header: - docString = "\n----\n\n{0}".format( - documentationInfo["docstring"]) - else: - docString = documentationInfo["docstring"] - - fullText = "".join([header, docString]) - - self.__plainTextViewer.setText(fullText) + html = documentationInfo + self.__viewerWidget.setHtml(html) def __showDisabledMessage(self): """ @@ -561,27 +405,6 @@ self.tr("This function has been disabled."), isWarning=True) - def __setHtml(self, html): - """ - Private slot to set the prepared HTML text. - - @param html prepared HTML text - @type str - """ - if self.__richTextViewer: - self.__richTextViewer.setHtml(html) - - def __setHtmlWarning(self, warningText): - """ - Private slot to set a display message. - - @param warningText text to be shown as a warning - @type str - """ - if self.__richTextViewer: - html = prepareDocumentationViewerHtmlWarningDocument(warningText) - self.__richTextViewer.setHtml(html) - @pyqtSlot(int) def on_providerComboBox_currentIndexChanged(self, index): """ @@ -591,9 +414,7 @@ @type int """ if not self.__shuttingDown and not self.__startingUp: - self.__plainTextViewer.clear() - if self.__richTextViewer: - self.__richTextViewer.clear() + self.__viewerWidget.clear() self.objectLineEdit.clear() provider = self.providerComboBox.itemData(index) @@ -616,13 +437,6 @@ """ Public slot to handle a change of preferences. """ - if self.__richTextViewer is None: - showRichText = False - else: - showRichText = Preferences.getDocuViewer("ShowInfoAsRichText") - if showRichText != self.__showMarkdown: - self.__showTextViewer(showRichText) - provider = Preferences.getDocuViewer("Provider") self.__selectProvider(provider) @@ -638,27 +452,3 @@ if index < 0: index = 0 self.providerComboBox.setCurrentIndex(index) - - def __showTextViewer(self, richText): - """ - Private slot to show the selected viewer. - - @param richText flag indicating the rich text viewer - @type bool - """ - self.__showMarkdown = richText - - self.__plainTextViewer.clear() - self.__plainTextViewer.setVisible(not richText) - - if self.__richTextViewer: - self.__richTextViewer.clear() - self.__richTextViewer.setVisible(richText) - - self.__plainTextAct.setChecked(not richText) - if self.__richTextAct: - self.__richTextAct.setChecked(richText) - - self.documentationReady(self.__lastDocumentation) - - Preferences.setDocuViewer("ShowInfoAsRichText", richText)
--- a/Utilities/__init__.py Sun Sep 02 11:07:03 2018 +0200 +++ b/Utilities/__init__.py Sun Sep 30 11:38:40 2018 +0200 @@ -1014,9 +1014,9 @@ Function to build the full path of an executable file from the environment on Windows platforms. - First an executable with the extension .exe is searched for, thereafter one - with the extension .bat and finally the given file name as is. The first - match is returned. + First an executable with the extension .exe is searched for, thereafter + such with the extensions .cmd or .bat and finally the given file name as + is. The first match is returned. @param file filename of the executable to check (string) @return full executable name, if the executable file is accessible @@ -1029,7 +1029,7 @@ else: return "" - filenames = [file + ".exe", file + ".bat", file] + filenames = [file + ".exe", file + ".cmd", file + ".bat", file] for filename in filenames: cur_path = os.path.join(os.curdir, filename)
--- a/VirtualEnv/VirtualenvExecDialog.py Sun Sep 02 11:07:03 2018 +0200 +++ b/VirtualEnv/VirtualenvExecDialog.py Sun Sep 30 11:38:40 2018 +0200 @@ -302,7 +302,7 @@ else: basename = "create_virtualenv" if isWindowsPlatform(): - script = os.path.join(self.__targetDir, basename + ".bat") + script = os.path.join(self.__targetDir, basename + ".cmd") txt = self.__cmd else: script = os.path.join(self.__targetDir, basename + ".sh")
--- a/VirtualEnv/VirtualenvManager.py Sun Sep 02 11:07:03 2018 +0200 +++ b/VirtualEnv/VirtualenvManager.py Sun Sep 30 11:38:40 2018 +0200 @@ -27,6 +27,8 @@ """ Class implementing an object to manage Python virtual environments. """ + DefaultKey = "<default>" + def __init__(self, parent=None): """ Constructor @@ -76,7 +78,7 @@ break if not found: # add an environment entry for the default interpreter - self.__virtualEnvironments["<default>"] = { + self.__virtualEnvironments[VirtualenvManager.DefaultKey] = { "path": "", "interpreter": defaultPy, "variant": sys.version_info[0], @@ -94,6 +96,37 @@ json.dumps(self.__virtualEnvironments) ) + def getDefaultEnvironment(self): + """ + Public method to get the default virtual environment. + + Default is an environment with the key '<default>' or the first one + having an interpreter matching sys.executable (i.e. the one used to + execute eric6 with) + + @return tuple containing the environment name and a dictionary + containing a copy of the default virtual environment + @rtype tuple of (str, dict) + """ + if VirtualenvManager.DefaultKey in self.__virtualEnvironments: + return ( + VirtualenvManager.DefaultKey, + copy.copy( + self.__virtualEnvironments[VirtualenvManager.DefaultKey]) + ) + + else: + defaultPy = sys.executable.replace("w.exe", ".exe") + for venvName in self.__virtualEnvironments: + if (defaultPy == + self.__virtualEnvironments[venvName]["interpreter"]): + return ( + venvName, + copy.copy(self.__virtualEnvironments[venvName]) + ) + + return ("", {}) + @pyqtSlot() def createVirtualEnv(self): """
--- a/WebBrowser/Network/EricSchemeHandler.py Sun Sep 02 11:07:03 2018 +0200 +++ b/WebBrowser/Network/EricSchemeHandler.py Sun Sep 30 11:38:40 2018 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals from PyQt5.QtCore import pyqtSignal, QByteArray, QBuffer, QIODevice, \ - QTextStream, QUrlQuery + QUrlQuery, QMutex, QMutexLocker, QTimer from PyQt5.QtWidgets import qApp from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler @@ -89,13 +89,12 @@ self.__loaded = False self.__job = job + self.__mutex = QMutex() self.__pageName = self.__job.requestUrl().path() self.__buffer = QBuffer() - self.open(QIODevice.ReadOnly) - self.__buffer.open(QIODevice.ReadWrite) - self.__loadPage() + QTimer.singleShot(0, self.__loadPage) def __loadPage(self): """ @@ -104,18 +103,23 @@ if self.__loaded: return - stream = QTextStream(self.__buffer) - stream.setCodec("utf-8") - if self.__pageName == "adblock": - stream << self.__adBlockPage() + contents = self.__adBlockPage() elif self.__pageName in ["home", "start", "startpage"]: - stream << self.__startPage() + contents = self.__startPage() elif self.__pageName == "speeddial": - stream << self.__speedDialPage() + contents = self.__speedDialPage() + else: + contents = "" - stream.flush() - self.__buffer.reset() + lock = QMutexLocker(self.__mutex) + self.__buffer.setData(contents.encode("utf-8")) + self.__buffer.open(QIODevice.ReadOnly) + lock.unlock() + + self.open(QIODevice.ReadOnly) + self.readyRead.emit() + self.__loaded = True def bytesAvailable(self): @@ -125,6 +129,7 @@ @return number of available bytes @rtype int """ + lock = QMutexLocker(self.__mutex) # __IGNORE_WARNING__ return self.__buffer.bytesAvailable() def readData(self, maxlen): @@ -134,6 +139,7 @@ @param maxlen maximum number of bytes to read (integer) @return string containing the data (bytes) """ + lock = QMutexLocker(self.__mutex) # __IGNORE_WARNING__ return self.__buffer.read(maxlen) def close(self):
--- a/WebBrowser/Network/QtHelpSchemeHandler.py Sun Sep 02 11:07:03 2018 +0200 +++ b/WebBrowser/Network/QtHelpSchemeHandler.py Sun Sep 30 11:38:40 2018 +0200 @@ -12,7 +12,8 @@ import mimetypes import os -from PyQt5.QtCore import pyqtSignal, QByteArray, QIODevice, QBuffer +from PyQt5.QtCore import pyqtSignal, QByteArray, QIODevice, QBuffer, QTimer, \ + QMutex, QMutexLocker from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, \ QWebEngineUrlRequestJob @@ -118,19 +119,24 @@ """ super(QtHelpSchemeReply, self).__init__(parent) - url = job.requestUrl() - strUrl = url.toString() + self.__job = job + self.__engine = engine + self.__mutex = QMutex() self.__buffer = QBuffer() + # determine mimetype + url = self.__job.requestUrl() + strUrl = url.toString() + # For some reason the url to load maybe wrong (passed from web engine) # though the css file and the references inside should work that way. # One possible problem might be that the css is loaded at the same # level as the html, thus a path inside the css like # (../images/foo.png) might cd out of the virtual folder - if not engine.findFile(url).isValid(): + if not self.__engine.findFile(url).isValid(): if strUrl.startswith(QtDocPath): - newUrl = job.requestUrl() + newUrl = self.__job.requestUrl() if not newUrl.path().startswith("/qdoc/"): newUrl.setPath("/qdoc" + newUrl.path()) url = newUrl @@ -141,8 +147,18 @@ # do our own (limited) guessing self.__mimeType = self.__mimeFromUrl(url) - if engine.findFile(url).isValid(): - data = engine.fileData(url) + QTimer.singleShot(0, lambda: self.__loadQtHelpPage(url)) + + def __loadQtHelpPage(self, url): + """ + Private method to load the requested QtHelp page. + + @param url URL of the requested page + @type QUrl + """ + + if self.__engine.findFile(url).isValid(): + data = self.__engine.fileData(url) else: data = QByteArray(self.tr( """<html>""" @@ -150,12 +166,16 @@ """<body><div align="center"><br><br>""" """<h1>The page could not be found</h1><br>""" """<h3>'{0}'</h3></div></body>""" - """</html>""").format(strUrl) + """</html>""").format(url.toString()) .encode("utf-8")) + lock = QMutexLocker(self.__mutex) self.__buffer.setData(data) self.__buffer.open(QIODevice.ReadOnly) + lock.unlock() + self.open(QIODevice.ReadOnly) + self.readyRead.emit() def bytesAvailable(self): """ @@ -164,6 +184,7 @@ @return number of available bytes @rtype int """ + lock = QMutexLocker(self.__mutex) # __IGNORE_WARNING__ return self.__buffer.bytesAvailable() def readData(self, maxlen): @@ -173,6 +194,7 @@ @param maxlen maximum number of bytes to read (integer) @return string containing the data (bytes) """ + lock = QMutexLocker(self.__mutex) # __IGNORE_WARNING__ return self.__buffer.read(maxlen) def close(self):
--- a/WebBrowser/WebBrowserPage.py Sun Sep 02 11:07:03 2018 +0200 +++ b/WebBrowser/WebBrowserPage.py Sun Sep 30 11:38:40 2018 +0200 @@ -8,7 +8,7 @@ Module implementing the helpbrowser using QWebView. """ -from __future__ import unicode_literals +from __future__ import unicode_literals, print_function try: str = unicode # __IGNORE_EXCEPTION__ except NameError:
--- a/changelog Sun Sep 02 11:07:03 2018 +0200 +++ b/changelog Sun Sep 30 11:38:40 2018 +0200 @@ -1,5 +1,19 @@ Change Log ---------- +Version 18.10: +- bug fixes +- General + -- changed the extension of the generated script files for Windows from + '.bat' to '.cmd' +- Debugger + -- added code to use the default virtual environment, if none has been + configured yet +- IRC + -- added support for the /query, /notice, /ping, /ignore, /unignore, /away, + /join, /part and /partall commands +- Tasks + -- added code to mark a line as not containing a task with '__NO-TASK__' + Version 18.09: - bug fixes - Mercurial Interface
--- a/cleanupSource.py Sun Sep 02 11:07:03 2018 +0200 +++ b/cleanupSource.py Sun Sep 30 11:38:40 2018 +0200 @@ -8,8 +8,7 @@ Script for eric6 to clean up the source tree. """ -from __future__ import unicode_literals -from __future__ import print_function +from __future__ import unicode_literals, print_function import os import sys
--- a/compileUiFiles.py Sun Sep 02 11:07:03 2018 +0200 +++ b/compileUiFiles.py Sun Sep 30 11:38:40 2018 +0200 @@ -8,8 +8,7 @@ Script for eric6 to compile all .ui files to Python source. """ -from __future__ import unicode_literals -from __future__ import print_function +from __future__ import unicode_literals, print_function import sys
--- a/i18n/eric6_cs.ts Sun Sep 02 11:07:03 2018 +0200 +++ b/i18n/eric6_cs.ts Sun Sep 30 11:38:40 2018 +0200 @@ -3072,59 +3072,32 @@ <context> <name>CodeDocumentationViewer</name> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="237"/> + <location filename="../UI/CodeDocumentationViewer.py" line="183"/> <source>Code Info Provider:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="250"/> + <location filename="../UI/CodeDocumentationViewer.py" line="196"/> <source>Select the code info provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="252"/> + <location filename="../UI/CodeDocumentationViewer.py" line="198"/> <source><disabled></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="285"/> - <source>Main Menu</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="296"/> - <source>Rich Text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="304"/> - <source>Plain Text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="483"/> + <location filename="../UI/CodeDocumentationViewer.py" line="379"/> <source>No documentation available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="510"/> - <source>Definition: {0}{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="513"/> - <source>Definition: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="560"/> + <location filename="../UI/CodeDocumentationViewer.py" line="400"/> <source>No source code documentation provider has been registered. This function has been disabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="565"/> + <location filename="../UI/CodeDocumentationViewer.py" line="405"/> <source>This function has been disabled.</source> <translation type="unfinished"></translation> </message> @@ -3146,18 +3119,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="521"/> - <source>Type: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="529"/> - <source>Note: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/> <source><p><b>Type:</b> @TYPE@</p></source> <comment>Just translate 'Type:' and leave the rest intact.</comment> @@ -5633,13 +5594,13 @@ <context> <name>DebugServer</name> <message> - <location filename="../Debugger/DebugServer.py" line="179"/> + <location filename="../Debugger/DebugServer.py" line="180"/> <source>created</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>vytvořeno</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="181"/> + <location filename="../Debugger/DebugServer.py" line="182"/> <source>changed</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>změněno</translation> @@ -7216,7 +7177,7 @@ <translation type="obsolete">Výběr interpretru pro Debug klienta</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="133"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="135"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> @@ -10122,7 +10083,7 @@ <translation type="obsolete">Hledat</translation> </message> <message> - <location filename="../E5Gui/E5TextEditSearchWidget.py" line="336"/> + <location filename="../E5Gui/E5TextEditSearchWidget.py" line="362"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> @@ -10468,7 +10429,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2942"/> + <location filename="../QScintilla/Editor.py" line="2946"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> @@ -10728,7 +10689,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5310"/> + <location filename="../QScintilla/Editor.py" line="5316"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -10808,207 +10769,207 @@ <translation>Tisk byl zrušen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3115"/> + <location filename="../QScintilla/Editor.py" line="3119"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2882"/> + <location filename="../QScintilla/Editor.py" line="2886"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4518"/> + <location filename="../QScintilla/Editor.py" line="4522"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4518"/> + <location filename="../QScintilla/Editor.py" line="4522"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5313"/> + <location filename="../QScintilla/Editor.py" line="5319"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5670"/> + <location filename="../QScintilla/Editor.py" line="5676"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5670"/> + <location filename="../QScintilla/Editor.py" line="5676"/> <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="5733"/> + <location filename="../QScintilla/Editor.py" line="5739"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5726"/> + <location filename="../QScintilla/Editor.py" line="5732"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5733"/> + <location filename="../QScintilla/Editor.py" line="5739"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5848"/> + <location filename="../QScintilla/Editor.py" line="5854"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5848"/> + <location filename="../QScintilla/Editor.py" line="5854"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6008"/> + <location filename="../QScintilla/Editor.py" line="6014"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6008"/> + <location filename="../QScintilla/Editor.py" line="6014"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6396"/> + <location filename="../QScintilla/Editor.py" line="6402"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6396"/> + <location filename="../QScintilla/Editor.py" line="6402"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6424"/> + <location filename="../QScintilla/Editor.py" line="6430"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6473"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6447"/> + <location filename="../QScintilla/Editor.py" line="6453"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6473"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6484"/> + <location filename="../QScintilla/Editor.py" line="6490"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6500"/> + <location filename="../QScintilla/Editor.py" line="6506"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6519"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6519"/> <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="6539"/> + <location filename="../QScintilla/Editor.py" line="6545"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6539"/> + <location filename="../QScintilla/Editor.py" line="6545"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6677"/> + <location filename="../QScintilla/Editor.py" line="6683"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6981"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7002"/> - <source>Resources</source> - <translation>Zdroje</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7004"/> - <source>Add file...</source> - <translation>Přidat soubor...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7006"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7008"/> + <source>Resources</source> + <translation>Zdroje</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7010"/> + <source>Add file...</source> + <translation>Přidat soubor...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7012"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7014"/> <source>Add aliased file...</source> <translation>Přidat zástupce souboru...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7011"/> + <location filename="../QScintilla/Editor.py" line="7017"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7015"/> + <location filename="../QScintilla/Editor.py" line="7021"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7034"/> + <location filename="../QScintilla/Editor.py" line="7040"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7050"/> + <location filename="../QScintilla/Editor.py" line="7056"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7078"/> + <location filename="../QScintilla/Editor.py" line="7084"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7142"/> + <location filename="../QScintilla/Editor.py" line="7148"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7142"/> + <location filename="../QScintilla/Editor.py" line="7148"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7176"/> + <location filename="../QScintilla/Editor.py" line="7182"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7176"/> + <location filename="../QScintilla/Editor.py" line="7182"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -11028,12 +10989,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7162"/> + <location filename="../QScintilla/Editor.py" line="7168"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7162"/> + <location filename="../QScintilla/Editor.py" line="7168"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -11108,7 +11069,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7469"/> + <location filename="../QScintilla/Editor.py" line="7475"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -11118,12 +11079,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7472"/> + <location filename="../QScintilla/Editor.py" line="7478"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7474"/> + <location filename="../QScintilla/Editor.py" line="7480"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -11148,47 +11109,47 @@ <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2882"/> + <location filename="../QScintilla/Editor.py" line="2886"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Soubor <b>{0}</b> obsahuje neuložené změny.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2942"/> + <location filename="../QScintilla/Editor.py" line="2946"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <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="3056"/> + <location filename="../QScintilla/Editor.py" line="3060"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <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="6438"/> + <location filename="../QScintilla/Editor.py" line="6444"/> <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="6447"/> + <location filename="../QScintilla/Editor.py" line="6453"/> <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="6500"/> + <location filename="../QScintilla/Editor.py" line="6506"/> <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="6841"/> + <location filename="../QScintilla/Editor.py" line="6847"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6981"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <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="7078"/> + <location filename="../QScintilla/Editor.py" line="7084"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -11213,27 +11174,27 @@ <translation>Vyčistit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3115"/> + <location filename="../QScintilla/Editor.py" line="3119"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <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="6484"/> + <location filename="../QScintilla/Editor.py" line="6490"/> <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="6286"/> + <location filename="../QScintilla/Editor.py" line="6292"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6299"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6673"/> + <location filename="../QScintilla/Editor.py" line="6679"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11258,27 +11219,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7886"/> + <location filename="../QScintilla/Editor.py" line="7892"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7886"/> + <location filename="../QScintilla/Editor.py" line="7892"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6222"/> + <location filename="../QScintilla/Editor.py" line="6228"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6222"/> + <location filename="../QScintilla/Editor.py" line="6228"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6283"/> + <location filename="../QScintilla/Editor.py" line="6289"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11303,7 +11264,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6667"/> + <location filename="../QScintilla/Editor.py" line="6673"/> <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> @@ -11318,32 +11279,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4643"/> + <location filename="../QScintilla/Editor.py" line="4647"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4643"/> + <location filename="../QScintilla/Editor.py" line="4647"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4901"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4901"/> <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="7973"/> + <location filename="../QScintilla/Editor.py" line="7979"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7973"/> + <location filename="../QScintilla/Editor.py" line="7979"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11373,12 +11334,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8094"/> + <location filename="../QScintilla/Editor.py" line="8100"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8094"/> + <location filename="../QScintilla/Editor.py" line="8100"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -12054,22 +12015,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="59"/> - <source>Select to show code documentation as rich text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="62"/> - <source>Show documentation as rich text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="71"/> + <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="61"/> <source>Documentation Provider:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="84"/> + <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="74"/> <source>Select the documentation provider to be used</source> <translation type="unfinished"></translation> </message> @@ -15566,117 +15517,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation type="unfinished">Hledat!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation type="unfinished">Titulek</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation type="unfinished">Použít</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation type="unfinished">Zavřít</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> - <translation type="unfinished">Odebrat</translation> + <source>Speed Dial</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> - <translation type="unfinished">Obnovit</translation> + <source>URL</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> - <translation type="unfinished"></translation> + <source>Title</source> + <translation type="unfinished">Titulek</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation type="unfinished">Použít</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> + <translation type="unfinished">Zavřít</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> - <translation type="unfinished"></translation> + <source>New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> + <source>Reload</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> + <source>Are you sure you want to reload all speed dials?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> + <source>Load title from page</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation type="unfinished"></translation> </message> @@ -15881,27 +15832,27 @@ <context> <name>EricapiPlugin</name> <message> - <location filename="../Plugins/PluginEricapi.py" line="61"/> + <location filename="../Plugins/PluginEricapi.py" line="63"/> <source>Eric6 API File Generator</source> <translation type="unfinished">Generátor Eric5 API souboru {6 ?}</translation> </message> <message> - <location filename="../Plugins/PluginEricapi.py" line="102"/> + <location filename="../Plugins/PluginEricapi.py" line="104"/> <source>Generate API file (eric6_api)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/PluginEricapi.py" line="102"/> + <location filename="../Plugins/PluginEricapi.py" line="104"/> <source>Generate &API file (eric6_api)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/PluginEricapi.py" line="106"/> - <source>Generate an API file using eric6_api</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/PluginEricapi.py" line="108"/> + <source>Generate an API file using eric6_api</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginEricapi.py" line="110"/> <source><b>Generate API file</b><p>Generate an API file using eric6_api.</p></source> <translation type="unfinished"></translation> </message> @@ -16301,32 +16252,32 @@ <context> <name>EricdocPlugin</name> <message> - <location filename="../Plugins/PluginEricdoc.py" line="93"/> + <location filename="../Plugins/PluginEricdoc.py" line="95"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="61"/> + <location filename="../Plugins/PluginEricdoc.py" line="63"/> <source>Eric6 Documentation Generator</source> <translation type="unfinished">Generátor Eric5 dokumentace {6 ?}</translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="137"/> + <location filename="../Plugins/PluginEricdoc.py" line="139"/> <source>Generate documentation (eric6_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="137"/> + <location filename="../Plugins/PluginEricdoc.py" line="139"/> <source>Generate &documentation (eric6_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="141"/> - <source>Generate API documentation using eric6_doc</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/PluginEricdoc.py" line="143"/> + <source>Generate API documentation using eric6_doc</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginEricdoc.py" line="145"/> <source><b>Generate documentation</b><p>Generate API documentation using eric6_doc.</p></source> <translation type="unfinished"></translation> </message> @@ -18278,182 +18229,182 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation type="unfinished">Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation type="unfinished">Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source><p>Do you really want to switch to <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation type="unfinished">Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="889"/> <source>Reverting changes</source> <translation type="unfinished">Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="941"/> <source>Merging</source> <translation type="unfinished">Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="966"/> <source>Master branch head</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1199"/> <source>Git Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1286"/> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1290"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1294"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1298"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1301"/> <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1303"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1304"/> <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1307"/> <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1310"/> <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1313"/> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1320"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1321"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -18463,432 +18414,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source>Create {0} file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source>Git Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source>Git Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> <source>Fetching from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> <source>Pulling from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> <source>Pushing to a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1784"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> <source>Committing failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1811"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> <source>Aborting uncommitted/failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> <source>Applying patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> <source>Tagging in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> <source>Branching in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> <source>Delete Remote Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source>Current Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> <source>Create Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> <source>Git Bundle Files (*.bundle)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2299"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2347"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> <source>Verify Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2377"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> <source>List Bundle Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Apply Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2500"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> <source>Applying a bundle file (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2527"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished">Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> <source>Git Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source>Create Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> <source>Git Bisect Replay Files (*.replay)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2691"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> <source>Edit Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Bisect Replay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> <source>Enter a branch name to restore a stash to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> <source>Creating branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Delete Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> <source>Deleting stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Delete All Stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> <source>Deleting all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> <source>Showing the combined configuration settings</source> <translation type="unfinished">Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> <source>Verifying the integrity of the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> <source>Performing Repository Housekeeping</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -41737,122 +41688,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Send Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Messages starting with a '/' are not allowed in private chats.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Leave IRC channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Do you really want to leave the IRC channel <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="681"/> <source>Channel Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="686"/> <source>Nick mentioned</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="576"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="711"/> <source>{0} has joined the channel {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="582"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="717"/> <source>You have joined the channel {0} ({1}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="589"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="724"/> <source>Join Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="608"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="743"/> <source>{0} has left {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="616"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="751"/> <source>{0} has left {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="622"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="757"/> <source>Leave Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="776"/> <source>{0} has quit {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="646"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="781"/> <source>{0} has quit {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="652"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="787"/> <source>Quit</source> <translation type="unfinished">Konec</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="805"/> <source>You are now known as {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="676"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="811"/> <source>User {0} is now known as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>Away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>{0} is away: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="731"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="866"/> <source>The channel topic is: "{0}".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="747"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> <source>The topic was set by {0} on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="899"/> <source>Channel URL: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="924"/> <source>password protected ({0})</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="793"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="928"/> <source>limited to %n user(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -41861,77 +41812,77 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="800"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="935"/> <source>Channel modes: {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="816"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="951"/> <source>This channel was created on {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="851"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="986"/> <source>{0} sets the channel mode to 'anonymous'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="855"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="990"/> <source>{0} removes the 'anonymous' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="860"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="995"/> <source>{0} sets a ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="864"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="999"/> <source>{0} removes the ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="869"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1004"/> <source>{0} sets the channel mode to 'no colors allowed'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="873"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1008"/> <source>{0} sets the channel mode to 'allow color codes'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="878"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1013"/> <source>{0} sets a ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1017"/> <source>{0} removes the ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="887"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1022"/> <source>{0} sets the channel mode to 'invite only'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="891"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1026"/> <source>{0} removes the 'invite only' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="896"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1031"/> <source>{0} sets the channel key to '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="900"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1035"/> <source>{0} removes the channel key.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="904"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1039"/> <source>{0} sets the channel limit to %n nick(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -41940,242 +41891,242 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="908"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1043"/> <source>{0} removes the channel limit.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="912"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1047"/> <source>{0} sets the channel mode to 'moderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="916"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1051"/> <source>{0} sets the channel mode to 'unmoderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="921"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1056"/> <source>{0} sets the channel mode to 'no messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="925"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> <source>{0} sets the channel mode to 'allow messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="930"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1065"/> <source>{0} sets the channel mode to 'private'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="934"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1069"/> <source>{0} sets the channel mode to 'public'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="939"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1074"/> <source>{0} sets the channel mode to 'quiet'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="943"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1078"/> <source>{0} removes the 'quiet' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="950"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1085"/> <source>{0} sets the channel mode to 'secret'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="954"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1089"/> <source>{0} sets the channel mode to 'visible'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="959"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1094"/> <source>{0} switches on 'topic protection'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="962"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1097"/> <source>{0} switches off 'topic protection'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="967"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1102"/> <source>{0} sets invitation mask {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="971"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1106"/> <source>{0} removes the invitation mask {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="975"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1110"/> <source>Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="993"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1128"/> <source>{0} sets mode for {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1020"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1155"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1154"/> - <source>--- New From Here ---</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source>Save Messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1220"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source>Error saving Messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1270"/> - <source>Copy</source> - <translation type="unfinished">Kopírovat</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1275"/> - <source>Cut all</source> - <translation type="unfinished">Vyjmout vše</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1279"/> - <source>Copy all</source> - <translation type="unfinished">Kopírovat vše</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1284"/> - <source>Clear</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1289"/> + <source>--- New From Here ---</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source>Save Messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1355"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source>Error saving Messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1405"/> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1410"/> + <source>Cut all</source> + <translation type="unfinished">Vyjmout vše</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1414"/> + <source>Copy all</source> + <translation type="unfinished">Kopírovat vše</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1419"/> + <source>Clear</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1424"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1293"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1428"/> <source>Mark Current Position</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1295"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1430"/> <source>Remove Position Marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1345"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1480"/> <source>Who Is</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1348"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1483"/> <source>Private Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>Who</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1437"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1572"/> <source>End of WHO list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1460"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1595"/> <source> (Away)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>Whois</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1485"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1620"/> <source>{0} is {1}@{2} ({3}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1531"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1666"/> <source>{0} is a user on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1536"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1671"/> <source>{0} has voice on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1541"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1676"/> <source>{0} is a halfop on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1681"/> <source>{0} is an operator on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1686"/> <source>{0} is owner of channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1556"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> <source>{0} is admin on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1575"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1710"/> <source>{0} is online via {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1594"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1729"/> <source>{0} is an IRC Operator.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1627"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1762"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42184,7 +42135,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1776"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42193,7 +42144,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1653"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1788"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42202,7 +42153,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1789"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42211,25 +42162,25 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1631"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1766"/> <source>{0} has been idle for {1}, {2}, {3}, and {4}.</source> <comment>{0} = name of person, {1} = (x days), {2} = (x hours), {3} = (x minutes), {4} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1644"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1779"/> <source>{0} has been idle for {1}, {2}, and {3}.</source> <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1655"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> <source>{0} has been idle for {1} and {2}.</source> <comment>{0} = name of person, {1} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1663"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1798"/> <source>{0} has been idle for %n second(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42238,67 +42189,67 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1805"/> <source>{0} has been online since {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1826"/> <source>End of WHOIS list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1709"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1844"/> <source>{0} is an identified user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1727"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1862"/> <source>{0} is available for help.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1745"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1880"/> <source>{0} is logged in as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1899"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1782"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1917"/> <source>{0} is using a secure connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1046"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1181"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1052"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1187"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1195"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -42308,17 +42259,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1351"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1486"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Edit Channel Topic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Enter the topic for this channel:</source> <translation type="unfinished"></translation> </message> @@ -42793,7 +42744,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="333"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="350"/> <source>Press to connect to the selected network</source> <translation type="unfinished"></translation> </message> @@ -42823,57 +42774,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source>Save Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="404"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source>Error saving Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="454"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="471"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="459"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="476"/> <source>Cut all</source> <translation type="unfinished">Vyjmout vše</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="463"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="480"/> <source>Copy all</source> <translation type="unfinished">Kopírovat vše</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="468"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="485"/> <source>Clear</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="473"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="490"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="328"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="345"/> <source>Press to disconnect from the network</source> <translation type="unfinished"></translation> </message> @@ -43230,6 +43181,14 @@ </message> </context> <context> + <name>IrcUserItem</name> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="121"/> + <source>{0} (ignored)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IrcUtilities</name> <message> <location filename="../Network/IRC/IrcUtilities.py" line="157"/> @@ -43310,258 +43269,258 @@ <context> <name>IrcWidget</name> <message> - <location filename="../Network/IRC/IrcWidget.py" line="68"/> + <location filename="../Network/IRC/IrcWidget.py" line="69"/> <source>Press to leave the current channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source>Disconnect from Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source><p>Do you really want to disconnect from <b>{0}</b>?</p><p>All channels will be closed.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>SSL Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>An encrypted connection to the IRC network was requested but SSL is not available. Please change the server configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="221"/> + <location filename="../Network/IRC/IrcWidget.py" line="222"/> <source>Looking for server {0} (port {1}) using an SSL encrypted connection...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="230"/> + <location filename="../Network/IRC/IrcWidget.py" line="231"/> <source>Looking for server {0} (port {1})...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="251"/> + <location filename="../Network/IRC/IrcWidget.py" line="252"/> <source>Disconnecting from server {0}...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="466"/> + <location filename="../Network/IRC/IrcWidget.py" line="519"/> <source>Server found,connecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="475"/> + <location filename="../Network/IRC/IrcWidget.py" line="528"/> <source>Connected,logging in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Server disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Message Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Unknown message received from server:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="583"/> + <location filename="../Network/IRC/IrcWidget.py" line="678"/> <source>Notice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="601"/> - <source>Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="608"/> - <source>You have left channel {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="619"/> - <source>You are now known as {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="624"/> - <source>User {0} is now known as {1}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="629"/> - <source>Server Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="665"/> - <source>Error</source> - <translation type="unfinished">Chyba</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="680"/> - <source>Welcome</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="682"/> - <source>Support</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="684"/> - <source>User</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="686"/> - <source>MOTD</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="688"/> - <source>Away</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="690"/> - <source>Info ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="694"/> - <source>Message of the day</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="696"/> - <source>End of message of the day</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="699"/> - <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="705"/> - <source>Current users on {0}: {1}, max. {2}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="710"/> - <source>Current users on the network: {0}, max. {1}</source> + <source>Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="703"/> + <source>You have left channel {0}.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Network/IRC/IrcWidget.py" line="714"/> + <source>You are now known as {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="719"/> + <source>User {0} is now known as {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="729"/> + <source>Server Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="765"/> + <source>Error</source> + <translation type="unfinished">Chyba</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="780"/> + <source>Welcome</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="782"/> + <source>Support</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="784"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="786"/> + <source>MOTD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="788"/> + <source>Away</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="790"/> + <source>Info ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="794"/> + <source>Message of the day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="796"/> + <source>End of message of the day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="799"/> + <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="805"/> + <source>Current users on {0}: {1}, max. {2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="810"/> + <source>Current users on the network: {0}, max. {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="814"/> <source>You are no longer marked as being away.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="716"/> + <location filename="../Network/IRC/IrcWidget.py" line="816"/> <source>You have been marked as being away.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="777"/> + <location filename="../Network/IRC/IrcWidget.py" line="877"/> <source>Connection to server {0} (port {1}) lost while waiting for user response to an SSL error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="785"/> + <location filename="../Network/IRC/IrcWidget.py" line="885"/> <source>The host was not found. Please check the host name and port settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="791"/> + <location filename="../Network/IRC/IrcWidget.py" line="891"/> <source>The connection was refused by the peer. Please check the host name and port settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="802"/> - <source>The following network error occurred:<br/>{0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="934"/> - <source>{0} ({1})</source> - <comment>channel name, users count</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> - <source>Critical</source> - <translation type="unfinished">Kritický</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="949"/> - <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> - <source>The given nickname is already in use.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> - <source>CTCP</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="896"/> - <source>Received Version request from {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="902"/> + <source>The following network error occurred:<br/>{0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1034"/> + <source>{0} ({1})</source> + <comment>channel name, users count</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> + <source>Critical</source> + <translation type="unfinished">Kritický</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1049"/> + <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> + <source>The given nickname is already in use.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> + <source>CTCP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="996"/> + <source>Received Version request from {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1002"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="910"/> + <location filename="../Network/IRC/IrcWidget.py" line="1010"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="594"/> + <location filename="../Network/IRC/IrcWidget.py" line="689"/> <source>You have set your personal modes to <b>[{0}]</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="598"/> + <location filename="../Network/IRC/IrcWidget.py" line="693"/> <source>{0} has changed your personal modes to <b>[{1}]</b>.</source> <translation type="unfinished"></translation> </message> @@ -43576,35 +43535,50 @@ <translation type="unfinished">Síť</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="797"/> + <location filename="../Network/IRC/IrcWidget.py" line="897"/> <source>The SSL handshake failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>A network error occurred.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="821"/> + <location filename="../Network/IRC/IrcWidget.py" line="921"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="256"/> + <location filename="../Network/IRC/IrcWidget.py" line="257"/> <source>Disconnecting from network {0}...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="261"/> + <location filename="../Network/IRC/IrcWidget.py" line="262"/> <source>Disconnecting from server.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="645"/> + <source>Received CTCP-PING response from {0} with latency of {1} ms.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="651"/> + <source>Received unknown CTCP-{0} response from {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="725"/> + <source>Received PONG from {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name> @@ -52064,7 +52038,7 @@ <translation>Vytvořit adresář projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="2904"/> + <location filename="../Project/Project.py" line="2906"/> <source>New Project</source> <translation>Nový projekt</translation> </message> @@ -52079,7 +52053,7 @@ <translation>Chcete editovat parametry VCS příkazu?</translation> </message> <message> - <location filename="../Project/Project.py" line="3754"/> + <location filename="../Project/Project.py" line="3756"/> <source>New project</source> <translation>Nový projekt</translation> </message> @@ -52094,42 +52068,42 @@ <translation>Výběr verzovacího systému projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3768"/> + <location filename="../Project/Project.py" line="3770"/> <source>Open project</source> <translation>Otevřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3047"/> + <location filename="../Project/Project.py" line="3049"/> <source>Project Files (*.e4p)</source> <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3805"/> + <location filename="../Project/Project.py" line="3807"/> <source>Save project as</source> <translation>Uložit projekt jako</translation> </message> <message> - <location filename="../Project/Project.py" line="3062"/> + <location filename="../Project/Project.py" line="3064"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="3098"/> + <location filename="../Project/Project.py" line="3100"/> <source>Close Project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3098"/> + <location filename="../Project/Project.py" line="3100"/> <source>The current project has unsaved changes.</source> <translation>Aktuální projekt obsahuje neuložené změny.</translation> </message> <message> - <location filename="../Project/Project.py" line="3273"/> + <location filename="../Project/Project.py" line="3275"/> <source>Syntax errors detected</source> <translation>Zjištěny syntaktické chyby</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="3273"/> + <location filename="../Project/Project.py" line="3275"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Projekt obsahuje %n soubor se syntaktickými chybami.</numerusform> @@ -52138,162 +52112,162 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="3754"/> + <location filename="../Project/Project.py" line="3756"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="../Project/Project.py" line="3759"/> + <location filename="../Project/Project.py" line="3761"/> <source>Generate a new project</source> <translation>Vygenerovat nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3760"/> + <location filename="../Project/Project.py" line="3762"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3768"/> + <location filename="../Project/Project.py" line="3770"/> <source>&Open...</source> <translation>&Otevřít...</translation> </message> <message> - <location filename="../Project/Project.py" line="3773"/> + <location filename="../Project/Project.py" line="3775"/> <source>Open an existing project</source> <translation>Otevřít existující projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3774"/> + <location filename="../Project/Project.py" line="3776"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Otevřít....</b><p>Otevře existující projekt.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3781"/> + <location filename="../Project/Project.py" line="3783"/> <source>Close project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3781"/> + <location filename="../Project/Project.py" line="3783"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../Project/Project.py" line="3785"/> + <location filename="../Project/Project.py" line="3787"/> <source>Close the current project</source> <translation>Uzavře aktuální projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3786"/> + <location filename="../Project/Project.py" line="3788"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Zavřít</b><p>Aktuální projekt se uzavře.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3793"/> + <location filename="../Project/Project.py" line="3795"/> <source>Save project</source> <translation>Uložit projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3985"/> + <location filename="../Project/Project.py" line="3987"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="../Project/Project.py" line="3797"/> + <location filename="../Project/Project.py" line="3799"/> <source>Save the current project</source> <translation>Uložit aktuální projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3798"/> + <location filename="../Project/Project.py" line="3800"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Uložit</b><p>Aktuální projekt se uloží.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3805"/> + <location filename="../Project/Project.py" line="3807"/> <source>Save &as...</source> <translation>Uložit j&ako...</translation> </message> <message> - <location filename="../Project/Project.py" line="3809"/> - <source>Save the current project to a new file</source> - <translation>Uloží aktuální projekt do nového souboru</translation> - </message> - <message> <location filename="../Project/Project.py" line="3811"/> + <source>Save the current project to a new file</source> + <translation>Uloží aktuální projekt do nového souboru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3813"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Uložit jako</b><p>Uloží aktuální projekt do nového souboru.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3820"/> + <location filename="../Project/Project.py" line="3822"/> <source>Add files to project</source> <translation>Přidat soubory do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3820"/> + <location filename="../Project/Project.py" line="3822"/> <source>Add &files...</source> <translation>&Přidat soubory...</translation> </message> <message> - <location filename="../Project/Project.py" line="3825"/> - <source>Add files to the current project</source> - <translation>Přidat soubory do aktuálního projektu</translation> - </message> - <message> <location filename="../Project/Project.py" line="3827"/> + <source>Add files to the current project</source> + <translation>Přidat soubory do aktuálního projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3829"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Přidat soubory...</b><p>Otevře dialog pri přidání souborů do aktuálního projektu. Místo pro přidání je definováno extenzí souborů.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3836"/> + <location filename="../Project/Project.py" line="3838"/> <source>Add directory to project</source> <translation>Přidat adresář do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3836"/> + <location filename="../Project/Project.py" line="3838"/> <source>Add directory...</source> <translation>Přidat adresář...</translation> </message> <message> - <location filename="../Project/Project.py" line="3841"/> - <source>Add a directory to the current project</source> - <translation>Přidat adresář do aktuálního projektu</translation> - </message> - <message> <location filename="../Project/Project.py" line="3843"/> + <source>Add a directory to the current project</source> + <translation>Přidat adresář do aktuálního projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3845"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Přidat adresář...</b><p>Otevře dialog pro přičtení adresáře do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3851"/> + <location filename="../Project/Project.py" line="3853"/> <source>Add translation to project</source> <translation>Přidat překlad do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3851"/> + <location filename="../Project/Project.py" line="3853"/> <source>Add &translation...</source> <translation>Přida&t překlad...</translation> </message> <message> - <location filename="../Project/Project.py" line="3856"/> - <source>Add a translation to the current project</source> - <translation>Přidat překlad do aktuálního projektu</translation> - </message> - <message> <location filename="../Project/Project.py" line="3858"/> + <source>Add a translation to the current project</source> + <translation>Přidat překlad do aktuálního projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3860"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Přidat překlad</b><p>Otevře dialog pro přidání překladu do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3866"/> + <location filename="../Project/Project.py" line="3868"/> <source>Search new files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="../Project/Project.py" line="3866"/> + <location filename="../Project/Project.py" line="3868"/> <source>Searc&h new files...</source> <translation>&Hledat nové soubory...</translation> </message> <message> - <location filename="../Project/Project.py" line="3870"/> + <location filename="../Project/Project.py" line="3872"/> <source>Search new files in the project directory.</source> <translation>Hledat nové soubory v adresáři projektu.</translation> </message> @@ -52303,57 +52277,57 @@ <translation type="obsolete"><b>Hledat nové soubory...</b><p>Hledají se nové soubory (zdrojové, *.ui, *.idl) v adresáři projektu a v registrovaných podadresářích.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3896"/> + <location filename="../Project/Project.py" line="3898"/> <source>Project properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3896"/> + <location filename="../Project/Project.py" line="3898"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="../Project/Project.py" line="3901"/> + <location filename="../Project/Project.py" line="3903"/> <source>Show the project properties</source> <translation>Zobrazit nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3902"/> + <location filename="../Project/Project.py" line="3904"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3909"/> + <location filename="../Project/Project.py" line="3911"/> <source>User project properties</source> <translation>Uživatelská nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3909"/> + <location filename="../Project/Project.py" line="3911"/> <source>&User Properties...</source> <translation>Uživat&elská nastavení...</translation> </message> <message> - <location filename="../Project/Project.py" line="3914"/> - <source>Show the user specific project properties</source> - <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> - </message> - <message> <location filename="../Project/Project.py" line="3916"/> + <source>Show the user specific project properties</source> + <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3918"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Uživatelská nastavení...</b><p>Zobrazí dialog s editací uživatelských nastavení projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3924"/> + <location filename="../Project/Project.py" line="3926"/> <source>Filetype Associations</source> <translation>Asociace typů souborů</translation> </message> <message> - <location filename="../Project/Project.py" line="3924"/> + <location filename="../Project/Project.py" line="3926"/> <source>Filetype Associations...</source> <translation>Asociace typů souborů...</translation> </message> <message> - <location filename="../Project/Project.py" line="3928"/> + <location filename="../Project/Project.py" line="3930"/> <source>Show the project filetype associations</source> <translation>Zobrazit asociace typů souborů</translation> </message> @@ -52363,347 +52337,347 @@ <translation type="obsolete"><b>Asociace typů souborů...</b><p>Zobrazí se dialog s editací asociace typů souborů v projektu. Na základě vzorku souborového jména tyto asociace určují typ souboru (zdrojový kód, formulář, interface nebo jiné). Tyto asociace jsou použity při přidávání souborů do projektu a při vyhledávání.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3960"/> + <location filename="../Project/Project.py" line="3962"/> <source>Debugger Properties</source> <translation>Nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3960"/> + <location filename="../Project/Project.py" line="3962"/> <source>Debugger &Properties...</source> <translation>Nastavení &debuggeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3964"/> + <location filename="../Project/Project.py" line="3966"/> <source>Show the debugger properties</source> <translation>Zobrazit nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3965"/> + <location filename="../Project/Project.py" line="3967"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Nastavení debugeru...</b><p>Zobrazí dialog s editací nastavení debugeru.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3973"/> + <location filename="../Project/Project.py" line="3975"/> <source>Load</source> <translation>Načíst</translation> </message> <message> - <location filename="../Project/Project.py" line="3973"/> + <location filename="../Project/Project.py" line="3975"/> <source>&Load</source> <translation>&Načíst</translation> </message> <message> - <location filename="../Project/Project.py" line="3977"/> + <location filename="../Project/Project.py" line="3979"/> <source>Load the debugger properties</source> <translation>Načíst nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3978"/> + <location filename="../Project/Project.py" line="3980"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Načíst nastavení debugeru</b><p>Načtou se nastavení debugeru do projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3985"/> + <location filename="../Project/Project.py" line="3987"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../Project/Project.py" line="3989"/> + <location filename="../Project/Project.py" line="3991"/> <source>Save the debugger properties</source> <translation>Uložit nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3990"/> + <location filename="../Project/Project.py" line="3992"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Uložit nastavení debugeru</b><p>Uloží nastavení debugeru definovaná v projektu..</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3997"/> + <location filename="../Project/Project.py" line="3999"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="../Project/Project.py" line="3997"/> + <location filename="../Project/Project.py" line="3999"/> <source>&Delete</source> <translation>Sma&zat</translation> </message> <message> - <location filename="../Project/Project.py" line="4001"/> + <location filename="../Project/Project.py" line="4003"/> <source>Delete the debugger properties</source> <translation>Smazat nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="4002"/> + <location filename="../Project/Project.py" line="4004"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Smazat nastavení debugeru</b><p>Smaže se soubor obsahující nastavení debugeru v daném projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4010"/> + <location filename="../Project/Project.py" line="4012"/> <source>Reset</source> <translation></translation> </message> <message> - <location filename="../Project/Project.py" line="4010"/> + <location filename="../Project/Project.py" line="4012"/> <source>&Reset</source> <translation>&Reset</translation> </message> <message> - <location filename="../Project/Project.py" line="4014"/> + <location filename="../Project/Project.py" line="4016"/> <source>Reset the debugger properties</source> <translation>Reset nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="4015"/> + <location filename="../Project/Project.py" line="4017"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Reset nastavení debugeru</b><p>Zresetuje nastavení debugeru v projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4024"/> + <location filename="../Project/Project.py" line="4026"/> <source>Load session</source> <translation>Načíst relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="4028"/> + <location filename="../Project/Project.py" line="4030"/> <source>Load the projects session file.</source> <translation>Načíst soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4029"/> + <location filename="../Project/Project.py" line="4031"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Načíst relaci</b><p>Načte soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4042"/> + <location filename="../Project/Project.py" line="4044"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="4046"/> + <location filename="../Project/Project.py" line="4048"/> <source>Save the projects session file.</source> <translation>Uložit soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4047"/> + <location filename="../Project/Project.py" line="4049"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Uložit relaci</b><p>Uloží soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4060"/> + <location filename="../Project/Project.py" line="4062"/> <source>Delete session</source> <translation>Smazat relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="4064"/> + <location filename="../Project/Project.py" line="4066"/> <source>Delete the projects session file.</source> <translation>Smaže soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4065"/> + <location filename="../Project/Project.py" line="4067"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Smazat relaci</b><p>Smaže soubor s relací projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4074"/> + <location filename="../Project/Project.py" line="4076"/> <source>Code Metrics</source> <translation>Metriky kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4074"/> + <location filename="../Project/Project.py" line="4076"/> <source>&Code Metrics...</source> <translation>Metriky &kódu...</translation> </message> <message> - <location filename="../Project/Project.py" line="4078"/> - <source>Show some code metrics for the project.</source> - <translation>Zobrazit metriky kódu projektu.</translation> - </message> - <message> <location filename="../Project/Project.py" line="4080"/> + <source>Show some code metrics for the project.</source> + <translation>Zobrazit metriky kódu projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4082"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Metriky kódu...</b><p>Zobrazí se metriky kódu všech python souborů v projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4088"/> + <location filename="../Project/Project.py" line="4090"/> <source>Python Code Coverage</source> <translation>Pokrytí python kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4088"/> + <location filename="../Project/Project.py" line="4090"/> <source>Code Co&verage...</source> <translation>Pokr&ytí kódu...</translation> </message> <message> - <location filename="../Project/Project.py" line="4092"/> - <source>Show code coverage information for the project.</source> - <translation>Zobrazit informace pokrytí kódu projektu.</translation> - </message> - <message> <location filename="../Project/Project.py" line="4094"/> + <source>Show code coverage information for the project.</source> + <translation>Zobrazit informace pokrytí kódu projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4096"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Pokrytí kódu...</b><p>Zobrazí informace o pokrytí kódu ve všech python souborech projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4947"/> + <location filename="../Project/Project.py" line="4949"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../Project/Project.py" line="4102"/> + <location filename="../Project/Project.py" line="4104"/> <source>&Profile Data...</source> <translation>&Profilovat data...</translation> </message> <message> - <location filename="../Project/Project.py" line="4106"/> - <source>Show profiling data for the project.</source> - <translation>Zobrazit profilování dat projektu.</translation> - </message> - <message> <location filename="../Project/Project.py" line="4108"/> + <source>Show profiling data for the project.</source> + <translation>Zobrazit profilování dat projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4110"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profilovat data</b><p>Zobrazí se profilování dat projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5001"/> + <location filename="../Project/Project.py" line="5003"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../Project/Project.py" line="4117"/> + <location filename="../Project/Project.py" line="4119"/> <source>&Application Diagram...</source> <translation>Diagram &aplikace...</translation> </message> <message> - <location filename="../Project/Project.py" line="4121"/> - <source>Show a diagram of the project.</source> - <translation>Zobrazit diagram projektu.</translation> - </message> - <message> <location filename="../Project/Project.py" line="4123"/> + <source>Show a diagram of the project.</source> + <translation>Zobrazit diagram projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4125"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagram aplikace...</b><p>Zobrazí diagram projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4247"/> - <source>&Project</source> - <translation>&Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4248"/> - <source>Open &Recent Projects</source> - <translation>Otevřít poslední p&rojekty</translation> - </message> - <message> <location filename="../Project/Project.py" line="4249"/> + <source>&Project</source> + <translation>&Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4250"/> + <source>Open &Recent Projects</source> + <translation>Otevřít poslední p&rojekty</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4251"/> <source>&Version Control</source> <translation>Kontrola &verzí</translation> </message> <message> - <location filename="../Project/Project.py" line="4253"/> - <source>Chec&k</source> - <translation>Zkontro&lovat</translation> - </message> - <message> <location filename="../Project/Project.py" line="4255"/> - <source>Sho&w</source> - <translation>Zo&brazit</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4256"/> - <source>&Diagrams</source> - <translation>&Diagramy</translation> + <source>Chec&k</source> + <translation>Zkontro&lovat</translation> </message> <message> <location filename="../Project/Project.py" line="4257"/> - <source>Session</source> - <translation>Relace</translation> + <source>Sho&w</source> + <translation>Zo&brazit</translation> </message> <message> <location filename="../Project/Project.py" line="4258"/> - <source>Source &Documentation</source> - <translation>Zd&rojová dokumentace</translation> + <source>&Diagrams</source> + <translation>&Diagramy</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4259"/> + <source>Session</source> + <translation>Relace</translation> </message> <message> <location filename="../Project/Project.py" line="4260"/> + <source>Source &Documentation</source> + <translation>Zd&rojová dokumentace</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4262"/> <source>Debugger</source> <translation></translation> </message> <message> - <location filename="../Project/Project.py" line="4261"/> + <location filename="../Project/Project.py" line="4263"/> <source>Pac&kagers</source> <translation>Balíč&ky</translation> </message> <message> - <location filename="../Project/Project.py" line="4380"/> + <location filename="../Project/Project.py" line="4382"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="4446"/> + <location filename="../Project/Project.py" line="4448"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> <message> - <location filename="../Project/Project.py" line="4609"/> + <location filename="../Project/Project.py" line="4611"/> <source>Search New Files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="../Project/Project.py" line="4609"/> + <location filename="../Project/Project.py" line="4611"/> <source>There were no new files found to be added.</source> <translation>Nebyly nalezeny žádné soubory, které je možné přidat.</translation> </message> <message> - <location filename="../Project/Project.py" line="4755"/> + <location filename="../Project/Project.py" line="4757"/> <source>Version Control System</source> <translation>Version Control System</translation> </message> <message> - <location filename="../Project/Project.py" line="4874"/> + <location filename="../Project/Project.py" line="4876"/> <source>Coverage Data</source> <translation>Datové pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4924"/> + <location filename="../Project/Project.py" line="4926"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu nebyl určen hlavní skript. Zrušeno</translation> </message> <message> - <location filename="../Project/Project.py" line="4897"/> + <location filename="../Project/Project.py" line="4899"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4897"/> + <location filename="../Project/Project.py" line="4899"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4947"/> + <location filename="../Project/Project.py" line="4949"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../Project/Project.py" line="5001"/> + <location filename="../Project/Project.py" line="5003"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="../Project/Project.py" line="5195"/> + <location filename="../Project/Project.py" line="5197"/> <source>Create Package List</source> <translation>Vytvořit seznam balíčků</translation> </message> <message> - <location filename="../Project/Project.py" line="4146"/> + <location filename="../Project/Project.py" line="4148"/> <source>Create &Package List</source> <translation type="unfinished">Vytvořit Plugin &archiv</translation> </message> <message> - <location filename="../Project/Project.py" line="5472"/> + <location filename="../Project/Project.py" line="5474"/> <source>Create Plugin Archive</source> <translation>Vytvořit Plugin archiv</translation> </message> <message> - <location filename="../Project/Project.py" line="5146"/> + <location filename="../Project/Project.py" line="5148"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> </message> @@ -52713,7 +52687,7 @@ <translation type="obsolete"><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5214"/> + <location filename="../Project/Project.py" line="5216"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> </message> @@ -52723,7 +52697,7 @@ <translation><p>Zdrojový adresář neobsahuje žádné soubory související s danou kategorií.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2904"/> + <location filename="../Project/Project.py" line="2906"/> <source>Select Version Control System</source> <translation>Vybrat Version Control System</translation> </message> @@ -52738,7 +52712,7 @@ <translation>Zaregistrovat typ projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="4162"/> + <location filename="../Project/Project.py" line="4164"/> <source>Create Plugin &Archives</source> <translation type="unfinished"></translation> </message> @@ -52748,32 +52722,32 @@ <translation>Nejdříve musíte specifikovat vzor překladu.</translation> </message> <message> - <location filename="../Project/Project.py" line="2629"/> + <location filename="../Project/Project.py" line="2631"/> <source>Translation Pattern</source> <translation>Vzor překladu</translation> </message> <message> - <location filename="../Project/Project.py" line="2629"/> + <location filename="../Project/Project.py" line="2631"/> <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> <translation>Zadejte vzor cesty pro soubory s překlady (použijte '%language%' na místě s kódem jazyka):</translation> </message> <message> - <location filename="../Project/Project.py" line="3942"/> + <location filename="../Project/Project.py" line="3944"/> <source>Lexer Associations</source> <translation>Spojení lexeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3942"/> + <location filename="../Project/Project.py" line="3944"/> <source>Lexer Associations...</source> <translation>Spojení lexeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3946"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> - </message> - <message> <location filename="../Project/Project.py" line="3948"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3950"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Spojení lexeru...</b><p>Zobrazuje dialog s editací spojení lexeru projektu. Tato spojení přepisují globální lexer spojení. Lexer je použit pro zvýraznění textu v editoru.</p></translation> </message> @@ -52863,7 +52837,7 @@ <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3062"/> + <location filename="../Project/Project.py" line="3064"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> @@ -52888,12 +52862,12 @@ <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4755"/> + <location filename="../Project/Project.py" line="4757"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Kontrola verzí vypnuta.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5195"/> + <location filename="../Project/Project.py" line="5197"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> </message> @@ -52903,12 +52877,12 @@ <translation type="obsolete"><p>Soubor <b>PKGLIST</b> nelze načíst.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5356"/> + <location filename="../Project/Project.py" line="5358"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nelze uložit do archivu. Ingorováno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5430"/> + <location filename="../Project/Project.py" line="5432"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Plugin soubor <b>{0}</b> nelze přečíst.</p><p>Důvod: {1}</p></translation> </message> @@ -52938,22 +52912,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4131"/> + <location filename="../Project/Project.py" line="4133"/> <source>Load Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4131"/> + <location filename="../Project/Project.py" line="4133"/> <source>&Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4135"/> - <source>Load a diagram from file.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="4137"/> + <source>Load a diagram from file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4139"/> <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> <translation type="unfinished"></translation> </message> @@ -52983,37 +52957,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4743"/> + <location filename="../Project/Project.py" line="4745"/> <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5472"/> + <location filename="../Project/Project.py" line="5474"/> <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4151"/> - <source>Create an initial PKGLIST file for an eric6 plugin.</source> - <translation type="unfinished">Vytvořit soubor eric5 plugin archivu. {6 ?}</translation> - </message> - <message> <location filename="../Project/Project.py" line="4153"/> + <source>Create an initial PKGLIST file for an eric6 plugin.</source> + <translation type="unfinished">Vytvořit soubor eric5 plugin archivu. {6 ?}</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4155"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"><b>Vytvořit Plugin archiv</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Jméno archivu je odvozeno ze jména hlavního skriptu.</p> {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="4167"/> - <source>Create eric6 plugin archive files.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="4169"/> + <source>Create eric6 plugin archive files.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4171"/> <source><b>Create Plugin Archives</b><p>This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5321"/> + <location filename="../Project/Project.py" line="5323"/> <source><p>The eric6 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Soubor s eric5 plugin archivem <b>{0}</b> nelze vytvořit. Zrušeno...</p><p>Důvod: {1}</p> {6 ?} {0}?} {1}?}</translation> </message> @@ -53038,83 +53012,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2874"/> + <location filename="../Project/Project.py" line="2876"/> <source>Create project management directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2874"/> + <location filename="../Project/Project.py" line="2876"/> <source><p>The project directory <b>{0}</b> is not writable.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3881"/> + <location filename="../Project/Project.py" line="3883"/> <source>Alt+Ctrl+P</source> <comment>Project|Search Project File</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3887"/> - <source>Search for a file in the project list of files.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3889"/> + <source>Search for a file in the project list of files.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3891"/> <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3881"/> + <location filename="../Project/Project.py" line="3883"/> <source>Search Project File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3881"/> + <location filename="../Project/Project.py" line="3883"/> <source>Search Project File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5250"/> + <location filename="../Project/Project.py" line="5252"/> <source>Create Plugin Archives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4179"/> + <location filename="../Project/Project.py" line="4181"/> <source>Create Plugin Archives (Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4179"/> + <location filename="../Project/Project.py" line="4181"/> <source>Create Plugin Archives (&Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4184"/> - <source>Create eric6 plugin archive files (snapshot releases).</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="4186"/> + <source>Create eric6 plugin archive files (snapshot releases).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4188"/> <source><b>Create Plugin Archives (Snapshot)</b><p>This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5228"/> + <location filename="../Project/Project.py" line="5230"/> <source>Select package lists:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5246"/> + <location filename="../Project/Project.py" line="5248"/> <source>Creating plugin archives...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5246"/> + <location filename="../Project/Project.py" line="5248"/> <source>Abort</source> <translation type="unfinished">Přerušit</translation> </message> <message> - <location filename="../Project/Project.py" line="5246"/> + <location filename="../Project/Project.py" line="5248"/> <source>%v/%m Archives</source> <translation type="unfinished"></translation> </message> @@ -53124,37 +53098,37 @@ <translation type="obsolete">Pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="5263"/> + <location filename="../Project/Project.py" line="5265"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5375"/> + <location filename="../Project/Project.py" line="5377"/> <source><p>The eric6 plugin archive files were created with some errors.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5378"/> + <location filename="../Project/Project.py" line="5380"/> <source><p>The eric6 plugin archive files were created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5239"/> + <location filename="../Project/Project.py" line="5241"/> <source><p>No package list files (PKGLIST*) available or selected. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5293"/> + <location filename="../Project/Project.py" line="5295"/> <source><p>The file <b>{0}</b> is not ready yet.</p><p>Please rework it and delete the'; initial_list' line of the header.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3872"/> + <location filename="../Project/Project.py" line="3874"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3930"/> + <location filename="../Project/Project.py" line="3932"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation type="unfinished"></translation> </message> @@ -53174,82 +53148,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2700"/> + <location filename="../Project/Project.py" line="2702"/> <source>Create Makefile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2700"/> + <location filename="../Project/Project.py" line="2702"/> <source><p>The makefile <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5655"/> + <location filename="../Project/Project.py" line="5657"/> <source>Execute Make</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4200"/> + <location filename="../Project/Project.py" line="4202"/> <source>&Execute Make</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4204"/> - <source>Perform a 'make' run.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="4206"/> + <source>Perform a 'make' run.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4208"/> <source><b>Execute Make</b><p>This performs a 'make' run to rebuild the configured target.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5635"/> + <location filename="../Project/Project.py" line="5637"/> <source>Test for Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4214"/> + <location filename="../Project/Project.py" line="4216"/> <source>&Test for Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4218"/> - <source>Question 'make', if a rebuild is needed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="4220"/> + <source>Question 'make', if a rebuild is needed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4222"/> <source><b>Test for Changes</b><p>This questions 'make', if a rebuild of the configured target is necessary.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4262"/> + <location filename="../Project/Project.py" line="4264"/> <source>Make</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5583"/> + <location filename="../Project/Project.py" line="5585"/> <source>The make process did not start.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5628"/> + <location filename="../Project/Project.py" line="5630"/> <source>The make process crashed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5638"/> + <location filename="../Project/Project.py" line="5640"/> <source><p>There are changes that require the configured make target <b>{0}</b> to be rebuilt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5643"/> + <location filename="../Project/Project.py" line="5645"/> <source><p>There are changes that require the default make target to be rebuilt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5655"/> + <location filename="../Project/Project.py" line="5657"/> <source>The makefile contains errors.</source> <translation type="unfinished"></translation> </message> @@ -60362,7 +60336,7 @@ <context> <name>QtHelpSchemeReply</name> <message> - <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="147"/> + <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="163"/> <source><html><head><title>Error 404...</title></head><body><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'{0}'</h3></div></body></html></source> <translation type="unfinished"></translation> </message> @@ -83194,52 +83168,52 @@ <context> <name>VirtualenvManager</name> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="137"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/> <source>Add Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="137"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/> <source>A virtual environment named <b>{0}</b> exists already. Shall it be replaced?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="185"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="218"/> <source>Change Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="226"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/> <source>A virtual environment named <b>{0}</b> does not exist. Aborting!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="226"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/> <source>Rename Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="304"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>{0} - {1}</source> <translation type="unfinished">{0} - {1}</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="255"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/> <source>Delete Virtual Environments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="255"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/> <source>Do you really want to delete these virtual environments?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="309"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/> <source>Remove Virtual Environments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="309"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/> <source>Do you really want to remove these virtual environments?</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_de.ts Sun Sep 02 11:07:03 2018 +0200 +++ b/i18n/eric6_de.ts Sun Sep 30 11:38:40 2018 +0200 @@ -2968,61 +2968,32 @@ <context> <name>CodeDocumentationViewer</name> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="237"/> + <location filename="../UI/CodeDocumentationViewer.py" line="183"/> <source>Code Info Provider:</source> <translation>Code Info Provider:</translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="250"/> + <location filename="../UI/CodeDocumentationViewer.py" line="196"/> <source>Select the code info provider</source> <translation>Wähle den Code Info Provider</translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="252"/> + <location filename="../UI/CodeDocumentationViewer.py" line="198"/> <source><disabled></source> <translation><deaktiviert></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="285"/> - <source>Main Menu</source> - <translation>Hauptmenü</translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="296"/> - <source>Rich Text</source> - <translation>Rich Text</translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="304"/> - <source>Plain Text</source> - <translation>Normaler Text</translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="483"/> + <location filename="../UI/CodeDocumentationViewer.py" line="379"/> <source>No documentation available</source> <translation>Keine Dokumentation verfügbar</translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="510"/> - <source>Definition: {0}{1} -</source> - <translation>Definition: {0}{1} -</translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="513"/> - <source>Definition: {0} -</source> - <translation>Definition: {0} -</translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="560"/> + <location filename="../UI/CodeDocumentationViewer.py" line="400"/> <source>No source code documentation provider has been registered. This function has been disabled.</source> <translation>Es ist kein Provider für Code Dokumentation registriert. Diese Funktion wurde deaktiviert.</translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="565"/> + <location filename="../UI/CodeDocumentationViewer.py" line="405"/> <source>This function has been disabled.</source> <translation>Diese Funktion wurde deaktiviert.</translation> </message> @@ -3044,20 +3015,6 @@ <translation><p><b>Hinweis:</b> @NOTE@</p></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="521"/> - <source>Type: {0} -</source> - <translation>Typ: {0} -</translation> - </message> - <message> - <location filename="../UI/CodeDocumentationViewer.py" line="529"/> - <source>Note: {0} -</source> - <translation>Hinweis: {0} -</translation> - </message> - <message> <location filename="../UI/CodeDocumentationViewerTemplate.py" line="65"/> <source><p><b>Type:</b> @TYPE@</p></source> <comment>Just translate 'Type:' and leave the rest intact.</comment> @@ -5514,13 +5471,13 @@ <context> <name>DebugServer</name> <message> - <location filename="../Debugger/DebugServer.py" line="179"/> + <location filename="../Debugger/DebugServer.py" line="180"/> <source>created</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>erzeugt</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="181"/> + <location filename="../Debugger/DebugServer.py" line="182"/> <source>changed</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>geändert</translation> @@ -6771,7 +6728,7 @@ <context> <name>DebuggerPropertiesDialog</name> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="133"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="135"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> @@ -9636,7 +9593,7 @@ <translation>Drücken, um das nächste Vorkommen zu suchen</translation> </message> <message> - <location filename="../E5Gui/E5TextEditSearchWidget.py" line="336"/> + <location filename="../E5Gui/E5TextEditSearchWidget.py" line="362"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> @@ -9972,12 +9929,12 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2942"/> + <location filename="../QScintilla/Editor.py" line="2946"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3115"/> + <location filename="../QScintilla/Editor.py" line="3119"/> <source>Save File</source> <translation>Datei sichern</translation> </message> @@ -10082,7 +10039,7 @@ <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6677"/> + <location filename="../QScintilla/Editor.py" line="6683"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -10092,7 +10049,7 @@ <translation>Prüfen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2882"/> + <location filename="../QScintilla/Editor.py" line="2886"/> <source>File Modified</source> <translation>Datei geändert</translation> </message> @@ -10147,57 +10104,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6396"/> + <location filename="../QScintilla/Editor.py" line="6402"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6396"/> + <location filename="../QScintilla/Editor.py" line="6402"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6473"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6424"/> + <location filename="../QScintilla/Editor.py" line="6430"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6447"/> + <location filename="../QScintilla/Editor.py" line="6453"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6473"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6484"/> + <location filename="../QScintilla/Editor.py" line="6490"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6500"/> + <location filename="../QScintilla/Editor.py" line="6506"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6519"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6539"/> + <location filename="../QScintilla/Editor.py" line="6545"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6539"/> + <location filename="../QScintilla/Editor.py" line="6545"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -10247,42 +10204,42 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5310"/> + <location filename="../QScintilla/Editor.py" line="5316"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5313"/> + <location filename="../QScintilla/Editor.py" line="5319"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5670"/> + <location filename="../QScintilla/Editor.py" line="5676"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5670"/> + <location filename="../QScintilla/Editor.py" line="5676"/> <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="5848"/> + <location filename="../QScintilla/Editor.py" line="5854"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5848"/> + <location filename="../QScintilla/Editor.py" line="5854"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4518"/> + <location filename="../QScintilla/Editor.py" line="4522"/> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4518"/> + <location filename="../QScintilla/Editor.py" line="4522"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> </message> @@ -10312,7 +10269,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6981"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -10322,12 +10279,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6008"/> + <location filename="../QScintilla/Editor.py" line="6014"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6008"/> + <location filename="../QScintilla/Editor.py" line="6014"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -10357,42 +10314,42 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5733"/> + <location filename="../QScintilla/Editor.py" line="5739"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5726"/> + <location filename="../QScintilla/Editor.py" line="5732"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5733"/> + <location filename="../QScintilla/Editor.py" line="5739"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2882"/> + <location filename="../QScintilla/Editor.py" line="2886"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6438"/> + <location filename="../QScintilla/Editor.py" line="6444"/> <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="6447"/> + <location filename="../QScintilla/Editor.py" line="6453"/> <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="6500"/> + <location filename="../QScintilla/Editor.py" line="6506"/> <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="6981"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -10432,82 +10389,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6841"/> + <location filename="../QScintilla/Editor.py" line="6847"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7002"/> - <source>Resources</source> - <translation>Ressourcen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7004"/> - <source>Add file...</source> - <translation>Datei hinzufügen...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7006"/> - <source>Add files...</source> - <translation>Dateien hinzufügen...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7008"/> + <source>Resources</source> + <translation>Ressourcen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7010"/> + <source>Add file...</source> + <translation>Datei hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7012"/> + <source>Add files...</source> + <translation>Dateien hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7014"/> <source>Add aliased file...</source> <translation>Aliased-Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7011"/> + <location filename="../QScintilla/Editor.py" line="7017"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7034"/> + <location filename="../QScintilla/Editor.py" line="7040"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7050"/> + <location filename="../QScintilla/Editor.py" line="7056"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7078"/> + <location filename="../QScintilla/Editor.py" line="7084"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7078"/> + <location filename="../QScintilla/Editor.py" line="7084"/> <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="7142"/> + <location filename="../QScintilla/Editor.py" line="7148"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7142"/> + <location filename="../QScintilla/Editor.py" line="7148"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7176"/> + <location filename="../QScintilla/Editor.py" line="7182"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7176"/> + <location filename="../QScintilla/Editor.py" line="7182"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7015"/> + <location filename="../QScintilla/Editor.py" line="7021"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6519"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -10557,12 +10514,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7162"/> + <location filename="../QScintilla/Editor.py" line="7168"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7162"/> + <location filename="../QScintilla/Editor.py" line="7168"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -10637,7 +10594,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7469"/> + <location filename="../QScintilla/Editor.py" line="7475"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -10647,12 +10604,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7472"/> + <location filename="../QScintilla/Editor.py" line="7478"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7474"/> + <location filename="../QScintilla/Editor.py" line="7480"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -10662,12 +10619,12 @@ <translation>Aus dem Wörterbuch entfernen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2942"/> + <location filename="../QScintilla/Editor.py" line="2946"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3056"/> + <location filename="../QScintilla/Editor.py" line="3060"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> </message> @@ -10692,27 +10649,27 @@ <translation>Warnungen löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3115"/> + <location filename="../QScintilla/Editor.py" line="3119"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6484"/> + <location filename="../QScintilla/Editor.py" line="6490"/> <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="6286"/> + <location filename="../QScintilla/Editor.py" line="6292"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6299"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6673"/> + <location filename="../QScintilla/Editor.py" line="6679"/> <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> @@ -10737,27 +10694,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7886"/> + <location filename="../QScintilla/Editor.py" line="7892"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7886"/> + <location filename="../QScintilla/Editor.py" line="7892"/> <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="6222"/> + <location filename="../QScintilla/Editor.py" line="6228"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6222"/> + <location filename="../QScintilla/Editor.py" line="6228"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6283"/> + <location filename="../QScintilla/Editor.py" line="6289"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -10782,7 +10739,7 @@ <translation>Öffnen mit Kodierung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6667"/> + <location filename="../QScintilla/Editor.py" line="6673"/> <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> @@ -10797,32 +10754,32 @@ <translation>Vervollständigen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4643"/> + <location filename="../QScintilla/Editor.py" line="4647"/> <source>Auto-Completion Provider</source> <translation>Provider für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4643"/> + <location filename="../QScintilla/Editor.py" line="4647"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <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="4895"/> + <location filename="../QScintilla/Editor.py" line="4901"/> <source>Call-Tips Provider</source> <translation>Calltipps-Provider</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4901"/> <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="7973"/> + <location filename="../QScintilla/Editor.py" line="7979"/> <source>Register Mouse Click Handler</source> <translation>Maus Klick Handler registrieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7973"/> + <location filename="../QScintilla/Editor.py" line="7979"/> <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> @@ -10852,12 +10809,12 @@ <translation>Auswahl in Konsole ausführen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8094"/> + <location filename="../QScintilla/Editor.py" line="8100"/> <source>EditorConfig Properties</source> <translation>EditorConfig Eigenschaften</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8094"/> + <location filename="../QScintilla/Editor.py" line="8100"/> <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> @@ -11518,22 +11475,12 @@ <translation>Dokumentation bei '(' anzeigen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="59"/> - <source>Select to show code documentation as rich text</source> - <translation>Auswählen, um Codedokumentation als Rich Text anzuzeigen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="62"/> - <source>Show documentation as rich text</source> - <translation>Dokumentation als Rich Text anzeigen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="71"/> + <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="61"/> <source>Documentation Provider:</source> <translation>Dokumentationsprovider:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="84"/> + <location filename="../Preferences/ConfigurationPages/EditorDocViewerPage.ui" line="74"/> <source>Select the documentation provider to be used</source> <translation>Wähle den zu verwendenden Dokumentationsprovider</translation> </message> @@ -14981,117 +14928,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation>Inhalt blockiert durch AdBlock Plus</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation>Blockiert durch Regel: <i>{0} ({1})</i></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation>Willkommen beim eric6-Web-Browser!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation>Über eric6</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation>eric6 Web-Browser</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation>Suchen!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation>Schnellwahl</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation>URL</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation>Titel</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation>Anwenden</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation>Schließen</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation>Neue Seite</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation>Bearbeiten</translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> - <translation>Entfernen</translation> + <source>Speed Dial</source> + <translation>Schnellwahl</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> - <translation>Erneut laden</translation> + <source>URL</source> + <translation>URL</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> - <translation>Soll diese Schnellwahl wirklich entfernt werden?</translation> + <source>Title</source> + <translation>Titel</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation>Anwenden</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> + <translation>Schließen</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> - <translation>Sind sie sicher,dass alle Schnellwahlen neu geladen werden sollen?</translation> + <source>New Page</source> + <translation>Neue Seite</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation>Bearbeiten</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> + <translation>Entfernen</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation>Titel von der Seite laden</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> - <translation>Schnellwahleinstellungen</translation> + <source>Reload</source> + <translation>Erneut laden</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> + <translation>Soll diese Schnellwahl wirklich entfernt werden?</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation>Neue Seite hinzufügen</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> - <translation>Maximale Zahl an Seiten pro Zeile:</translation> + <source>Are you sure you want to reload all speed dials?</source> + <translation>Sind sie sicher,dass alle Schnellwahlen neu geladen werden sollen?</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> - <translation>Größe der Seiten ändern:</translation> + <source>Load title from page</source> + <translation>Titel von der Seite laden</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation>Schnellwahleinstellungen</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation>Neue Seite hinzufügen</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation>Maximale Zahl an Seiten pro Zeile:</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation>Größe der Seiten ändern:</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation>Schnellwahl benötigt aktiviertes JavaScript.</translation> </message> @@ -15278,27 +15225,27 @@ <context> <name>EricapiPlugin</name> <message> - <location filename="../Plugins/PluginEricapi.py" line="61"/> + <location filename="../Plugins/PluginEricapi.py" line="63"/> <source>Eric6 API File Generator</source> <translation>Eric6 API-Datei-Generator</translation> </message> <message> - <location filename="../Plugins/PluginEricapi.py" line="102"/> + <location filename="../Plugins/PluginEricapi.py" line="104"/> <source>Generate API file (eric6_api)</source> <translation>Erzeuge API-Datei (eric6_api)</translation> </message> <message> - <location filename="../Plugins/PluginEricapi.py" line="102"/> + <location filename="../Plugins/PluginEricapi.py" line="104"/> <source>Generate &API file (eric6_api)</source> <translation>Erzeuge &API-Datei (eric6_api)</translation> </message> <message> - <location filename="../Plugins/PluginEricapi.py" line="106"/> - <source>Generate an API file using eric6_api</source> - <translation>Erzeuge eine API-Datei unter Verwendung von eric6_api</translation> - </message> - <message> <location filename="../Plugins/PluginEricapi.py" line="108"/> + <source>Generate an API file using eric6_api</source> + <translation>Erzeuge eine API-Datei unter Verwendung von eric6_api</translation> + </message> + <message> + <location filename="../Plugins/PluginEricapi.py" line="110"/> <source><b>Generate API file</b><p>Generate an API file using eric6_api.</p></source> <translation><b>Erzeuge API-Datei</b><p>Erzeuge eine API-Datei unter Verwendung von eric6_api.</p></translation> </message> @@ -15674,32 +15621,32 @@ <context> <name>EricdocPlugin</name> <message> - <location filename="../Plugins/PluginEricdoc.py" line="93"/> + <location filename="../Plugins/PluginEricdoc.py" line="95"/> <source>Qt Help Tools</source> <translation>Qt Help Werkzeuge</translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="61"/> + <location filename="../Plugins/PluginEricdoc.py" line="63"/> <source>Eric6 Documentation Generator</source> <translation>Eric6 Dokumentationsgenerator</translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="137"/> + <location filename="../Plugins/PluginEricdoc.py" line="139"/> <source>Generate documentation (eric6_doc)</source> <translation>Erzeuge Dokumentation (eric6_doc)</translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="137"/> + <location filename="../Plugins/PluginEricdoc.py" line="139"/> <source>Generate &documentation (eric6_doc)</source> <translation>Erzeuge &Dokumentation (eric6_doc)</translation> </message> <message> - <location filename="../Plugins/PluginEricdoc.py" line="141"/> - <source>Generate API documentation using eric6_doc</source> - <translation>Erzeuge die API Dokumentation unter Verwendung von eric6_doc</translation> - </message> - <message> <location filename="../Plugins/PluginEricdoc.py" line="143"/> + <source>Generate API documentation using eric6_doc</source> + <translation>Erzeuge die API Dokumentation unter Verwendung von eric6_doc</translation> + </message> + <message> + <location filename="../Plugins/PluginEricdoc.py" line="145"/> <source><b>Generate documentation</b><p>Generate API documentation using eric6_doc.</p></source> <translation><b>Erzeuge Dokumentation</b><p>Erzeuge die API Dokumentation unter Verwendung von eric6_doc.</p></translation> </message> @@ -17622,172 +17569,172 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation>Der git-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation>Der git-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation>Das git Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation>Erzeuge Git Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation>Füge Dateien dem Git-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation>Erstes Commit für das Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation>Klone das Projekt aus dem Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation>Änderungen in Git-Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation>Gleiche mit dem Git-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation>Füge Dateien/Verzeichnisse dem Git-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation>Vormerkung rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="889"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="941"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="966"/> <source>Master branch head</source> <translation>Kopf des Hauptzweiges</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1199"/> <source>Git Command</source> <translation>Git Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1286"/> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungs ID</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1290"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1294"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1298"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1301"/> <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1303"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1304"/> <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Datum</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1307"/> <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation><tr><td><b>Bereitsteller</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1310"/> <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Bereitstellungsdatum</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1313"/> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Betreff</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1320"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1321"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -17802,442 +17749,442 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source>Create {0} file</source> <translation>Erzeuge {0}-Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/>