Wed, 13 Feb 2019 20:39:58 +0100
Merged with default branch.
--- a/APIs/Python3/eric6.api Wed Feb 13 20:39:03 2019 +0100 +++ b/APIs/Python3/eric6.api Wed Feb 13 20:39:58 2019 +0100 @@ -9137,6 +9137,7 @@ eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.indicatorDefine?4(indicator, style, color) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.inputMethodEvent?4(evt) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.inputMethodQuery?4(query) +eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.insert?4(txt) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.isModified?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.lineAt?4(pos) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.lineEndPosition?4(line) @@ -9525,6 +9526,7 @@ eric6.Toolbox.SingleApplication.SingleApplicationServer.handleCommand?4(command, arguments) eric6.Toolbox.SingleApplication.SingleApplicationServer.shutdown?4() eric6.Toolbox.SingleApplication.SingleApplicationServer?1(name) +eric6.Toolbox.Startup.application?7 eric6.Toolbox.Startup.handleArgs?4(argv, appinfo) eric6.Toolbox.Startup.initializeResourceSearchPath?4() eric6.Toolbox.Startup.loadTranslatorForLocale?4(dirs, tn) @@ -10692,8 +10694,9 @@ eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_globalCheckBox_toggled?4(checked) eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_nameEdit_textChanged?4(txt) eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_pythonExecPicker_textChanged?4(txt) +eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_remoteCheckBox_toggled?4(checked) eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged?4(txt) -eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog?1(manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath="", parent=None) +eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog?1(manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, isRemote=False, execPath="", parent=None) eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.getData?4() eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged?4(txt) eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pyvenvButton_toggled?4(checked) @@ -10707,7 +10710,7 @@ 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, isConda=False, execPath="") +eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.addVirtualEnv?4(venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, isRemote=False, execPath="") eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.createVirtualEnv?4() eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.deleteVirtualEnvs?4(venvNames) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getDefaultEnvironment?4() @@ -10719,16 +10722,18 @@ eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNamesForVariant?4(variant) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isCondaEnvironment?4(venvName) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isGlobalEnvironment?4(venvName) +eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isRemoteEnvironment?4(venvName) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isUnique?4(venvName) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.removeVirtualEnvs?4(venvNames) -eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.renameVirtualEnv?4(oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath) -eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.setVirtualEnv?4(venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath) +eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.renameVirtualEnv?4(oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, isRemote, execPath) +eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.setVirtualEnv?4(venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, isRemote, execPath) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.showVirtualenvManagerDialog?4(modal=False) eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.shutdown?4() eric6.VirtualEnv.VirtualenvManager.VirtualenvManager?1(parent=None) eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.ExecPathRole?7 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsCondaRole?7 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsGlobalRole?7 +eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsRemoteRole?7 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.PythonVariantRole?7 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_addButton_clicked?4() eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_deleteAllButton_clicked?4() @@ -12671,6 +12676,7 @@ eric6.create_windows_links.windowsDesktopEntries?4() eric6.create_windows_links.windowsDesktopNames?4() eric6.create_windows_links.windowsProgramsEntry?4() +eric6.eric6.app?7 eric6.eric6.args?7 eric6.eric6.excepthook?4(excType, excValue, tracebackobj) eric6.eric6.handleSingleApplication?4(ddindex) @@ -12686,6 +12692,7 @@ eric6.eric6_api.usage?4() eric6.eric6_api.version?4() eric6.eric6_browser.SettingsDir?7 +eric6.eric6_browser.app?7 eric6.eric6_browser.createMainWidget?4(argv) eric6.eric6_browser.main?4() eric6.eric6_compare.createMainWidget?4(argv) @@ -12727,12 +12734,14 @@ eric6.eric6_tray.SettingsDir?7 eric6.eric6_tray.createMainWidget?4(argv) eric6.eric6_tray.main?4() +eric6.eric6_trpreviewer.app?7 eric6.eric6_trpreviewer.createMainWidget?4(argv) eric6.eric6_trpreviewer.main?4() eric6.eric6_uipreviewer.createMainWidget?4(argv) eric6.eric6_uipreviewer.main?4() eric6.eric6_unittest.createMainWidget?4(argv) eric6.eric6_unittest.main?4() +eric6.eric6_webbrowser.app?7 eric6.eric6_webbrowser.createMainWidget?4(argv) eric6.eric6_webbrowser.main?4() eric6.eric6config._pkg_config?8
--- a/DebugClients/Python/DebugClientBase.py Wed Feb 13 20:39:03 2019 +0100 +++ b/DebugClients/Python/DebugClientBase.py Wed Feb 13 20:39:58 2019 +0100 @@ -581,7 +581,7 @@ with codecs.open(sys.argv[0], encoding=self.__coding) as fp: script = fp.read() if script and not script.endswith('\n'): - script += '\n' + script += '\n' if script: self.running = sys.argv[0] @@ -1355,7 +1355,7 @@ elif scope: varDict = f.f_globals elif f.f_globals is f.f_locals: - scope = -1 + scope = -1 else: varDict = f.f_locals @@ -1407,7 +1407,7 @@ elif scope: varDict = f.f_globals elif f.f_globals is f.f_locals: - scope = -1 + scope = -1 else: varDict = f.f_locals
--- a/Debugger/DebuggerInterfacePython.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Debugger/DebuggerInterfacePython.py Wed Feb 13 20:39:58 2019 +0100 @@ -369,8 +369,8 @@ rhost = "localhost" if rexec: args = Utilities.parseOptionString(rexec) + \ - [rhost, interpreter, os.path.abspath(debugClient), - noencoding, str(port), redirect, ipaddr] + [rhost, interpreter, debugClient, noencoding, + str(port), redirect, ipaddr] args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], workingDir=workingDir) @@ -391,7 +391,10 @@ else: self.translate = self.__identityTranslation return process, self.__isNetworked, "" - + else: + # remote shell command is missing + return None, self.__isNetworked, "" + # set translation function self.translate = self.__identityTranslation
--- a/Debugger/StartDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Debugger/StartDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -163,7 +163,7 @@ clear interpreter flag (boolean) and run in console flag (boolean) """ cmdLine = self.ui.cmdlineCombo.currentText() - workdir = self.ui.workdirPicker.currentText() + workdir = self.ui.workdirPicker.currentText(toNative=False) environment = self.ui.environmentCombo.currentText() venvName = self.ui.venvComboBox.currentText()
--- a/Documentation/Help/source.qhp Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Help/source.qhp Wed Feb 13 20:39:58 2019 +0100 @@ -13608,6 +13608,7 @@ <keyword name="QsciScintillaCompat.indicatorDefine" id="QsciScintillaCompat.indicatorDefine" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.indicatorDefine" /> <keyword name="QsciScintillaCompat.inputMethodEvent" id="QsciScintillaCompat.inputMethodEvent" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.inputMethodEvent" /> <keyword name="QsciScintillaCompat.inputMethodQuery" id="QsciScintillaCompat.inputMethodQuery" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.inputMethodQuery" /> + <keyword name="QsciScintillaCompat.insert" id="QsciScintillaCompat.insert" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.insert" /> <keyword name="QsciScintillaCompat.isModified" id="QsciScintillaCompat.isModified" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.isModified" /> <keyword name="QsciScintillaCompat.lineAt" id="QsciScintillaCompat.lineAt" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.lineAt" /> <keyword name="QsciScintillaCompat.lineEndPosition" id="QsciScintillaCompat.lineEndPosition" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.lineEndPosition" /> @@ -17613,6 +17614,7 @@ <keyword name="VirtualenvAddEditDialog.on_globalCheckBox_toggled" id="VirtualenvAddEditDialog.on_globalCheckBox_toggled" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_globalCheckBox_toggled" /> <keyword name="VirtualenvAddEditDialog.on_nameEdit_textChanged" id="VirtualenvAddEditDialog.on_nameEdit_textChanged" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_nameEdit_textChanged" /> <keyword name="VirtualenvAddEditDialog.on_pythonExecPicker_textChanged" id="VirtualenvAddEditDialog.on_pythonExecPicker_textChanged" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_pythonExecPicker_textChanged" /> + <keyword name="VirtualenvAddEditDialog.on_remoteCheckBox_toggled" id="VirtualenvAddEditDialog.on_remoteCheckBox_toggled" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_remoteCheckBox_toggled" /> <keyword name="VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged" id="VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged" /> <keyword name="VirtualenvConfigurationDialog" id="VirtualenvConfigurationDialog" ref="eric6.VirtualEnv.VirtualenvConfigurationDialog.html#VirtualenvConfigurationDialog" /> <keyword name="VirtualenvConfigurationDialog (Constructor)" id="VirtualenvConfigurationDialog (Constructor)" ref="eric6.VirtualEnv.VirtualenvConfigurationDialog.html#VirtualenvConfigurationDialog.__init__" /> @@ -17665,6 +17667,7 @@ <keyword name="VirtualenvManager.getVirtualenvNamesForVariant" id="VirtualenvManager.getVirtualenvNamesForVariant" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvNamesForVariant" /> <keyword name="VirtualenvManager.isCondaEnvironment" id="VirtualenvManager.isCondaEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isCondaEnvironment" /> <keyword name="VirtualenvManager.isGlobalEnvironment" id="VirtualenvManager.isGlobalEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isGlobalEnvironment" /> + <keyword name="VirtualenvManager.isRemoteEnvironment" id="VirtualenvManager.isRemoteEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isRemoteEnvironment" /> <keyword name="VirtualenvManager.isUnique" id="VirtualenvManager.isUnique" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isUnique" /> <keyword name="VirtualenvManager.removeVirtualEnvs" id="VirtualenvManager.removeVirtualEnvs" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.removeVirtualEnvs" /> <keyword name="VirtualenvManager.renameVirtualEnv" id="VirtualenvManager.renameVirtualEnv" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.renameVirtualEnv" />
--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Wed Feb 13 20:39:58 2019 +0100 @@ -280,6 +280,9 @@ <td><a href="#QsciScintillaCompat.inputMethodQuery">inputMethodQuery</a></td> <td>Public method to cope with a glitch in some Qscintilla versions handling input events.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.insert">insert</a></td> +<td>Public method to insert text at the cursor position.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.isModified">isModified</a></td> <td>Public method to return the modification status.</td> </tr><tr> @@ -1281,6 +1284,16 @@ <dd> object containing the requested information </dd> +</dl><a NAME="QsciScintillaCompat.insert" ID="QsciScintillaCompat.insert"></a> +<h4>QsciScintillaCompat.insert</h4> +<b>insert</b>(<i>txt</i>) +<p> + Public method to insert text at the cursor position. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text to be inserted +</dd> </dl><a NAME="QsciScintillaCompat.isModified" ID="QsciScintillaCompat.isModified"></a> <h4>QsciScintillaCompat.isModified</h4> <b>isModified</b>(<i></i>)
--- a/Documentation/Source/eric6.Toolbox.Startup.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.Toolbox.Startup.html Wed Feb 13 20:39:58 2019 +0100 @@ -25,7 +25,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>loaded_translators</td></tr> +<tr><td>application</td></tr><tr><td>loaded_translators</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvAddEditDialog.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvAddEditDialog.html Wed Feb 13 20:39:58 2019 +0100 @@ -78,6 +78,9 @@ <td><a href="#VirtualenvAddEditDialog.on_pythonExecPicker_textChanged">on_pythonExecPicker_textChanged</a></td> <td>Private slot to handle changes of the virtual environment interpreter.</td> </tr><tr> +<td><a href="#VirtualenvAddEditDialog.on_remoteCheckBox_toggled">on_remoteCheckBox_toggled</a></td> +<td>Private slot handling a change of the remote check box state.</td> +</tr><tr> <td><a href="#VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged">on_targetDirectoryPicker_textChanged</a></td> <td>Private slot to handle changes of the virtual environment directory.</td> </tr> @@ -88,7 +91,7 @@ </table> <a NAME="VirtualenvAddEditDialog.__init__" ID="VirtualenvAddEditDialog.__init__"></a> <h4>VirtualenvAddEditDialog (Constructor)</h4> -<b>VirtualenvAddEditDialog</b>(<i>manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath="", parent=None</i>) +<b>VirtualenvAddEditDialog</b>(<i>manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, isRemote=False, execPath="", parent=None</i>) <p> Constructor </p><dl> @@ -113,6 +116,9 @@ </dd><dt><i>isConda</i> (bool)</dt> <dd> flag indicating an Anaconda virtual environment +</dd><dt><i>isRemote</i> (bool)</dt> +<dd> +flag indicating a remotely accessed environment </dd><dt><i>execPath</i> (str)</dt> <dd> search path string to be prepended to the PATH @@ -137,13 +143,14 @@ tuple containing the logical name, the directory, the interpreter of the virtual environment, the Python variant, a flag indicating a global environment, a flag indicating an - Anaconda environment and a string to be prepended to the PATH - environment variable + Anaconda environment, aflag indicating a remotely accessed + environment and a string to be prepended to the PATH environment + variable </dd> </dl><dl> <dt>Return Type:</dt> <dd> -tuple of (str, str, str, int, bool,bool, str) +tuple of (str, str, str, int, bool, bool, bool, str) </dd> </dl><a NAME="VirtualenvAddEditDialog.on_anacondaCheckBox_clicked" ID="VirtualenvAddEditDialog.on_anacondaCheckBox_clicked"></a> <h4>VirtualenvAddEditDialog.on_anacondaCheckBox_clicked</h4> @@ -185,6 +192,16 @@ <dd> virtual environment interpreter </dd> +</dl><a NAME="VirtualenvAddEditDialog.on_remoteCheckBox_toggled" ID="VirtualenvAddEditDialog.on_remoteCheckBox_toggled"></a> +<h4>VirtualenvAddEditDialog.on_remoteCheckBox_toggled</h4> +<b>on_remoteCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of the remote check box state. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +state of the check box +</dd> </dl><a NAME="VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged" ID="VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged"></a> <h4>VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged</h4> <b>on_targetDirectoryPicker_textChanged</b>(<i>txt</i>)
--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html Wed Feb 13 20:39:58 2019 +0100 @@ -105,6 +105,9 @@ <td><a href="#VirtualenvManager.isGlobalEnvironment">isGlobalEnvironment</a></td> <td>Public method to test, if a given environment is a global one.</td> </tr><tr> +<td><a href="#VirtualenvManager.isRemoteEnvironment">isRemoteEnvironment</a></td> +<td>Public method to test, if a given environment is a remotely accessed environment.</td> +</tr><tr> <td><a href="#VirtualenvManager.isUnique">isUnique</a></td> <td>Public method to check, if the give logical name is unique.</td> </tr><tr> @@ -171,7 +174,7 @@ Private slot to save the virtual environments. </p><a NAME="VirtualenvManager.addVirtualEnv" ID="VirtualenvManager.addVirtualEnv"></a> <h4>VirtualenvManager.addVirtualEnv</h4> -<b>addVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath=""</i>) +<b>addVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, isRemote=False, execPath=""</i>) <p> Public method to add a virtual environment. </p><dl> @@ -193,6 +196,9 @@ </dd><dt><i>isConda</i> (bool)</dt> <dd> flag indicating an Anaconda virtual environment +</dd><dt><i>isRemote</i> (bool)</dt> +<dd> +flag indicating a remotely accessed environment </dd><dt><i>execPath</i> (str)</dt> <dd> search path string to be prepended to the PATH @@ -387,6 +393,27 @@ <dd> bool </dd> +</dl><a NAME="VirtualenvManager.isRemoteEnvironment" ID="VirtualenvManager.isRemoteEnvironment"></a> +<h4>VirtualenvManager.isRemoteEnvironment</h4> +<b>isRemoteEnvironment</b>(<i>venvName</i>) +<p> + Public method to test, if a given environment is a remotely accessed + environment. +</p><dl> +<dt><i>venvName</i> (str)</dt> +<dd> +logical name of the virtual environment +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a remotely accessed environment +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="VirtualenvManager.isUnique" ID="VirtualenvManager.isUnique"></a> <h4>VirtualenvManager.isUnique</h4> <b>isUnique</b>(<i>venvName</i>) @@ -419,7 +446,7 @@ </dd> </dl><a NAME="VirtualenvManager.renameVirtualEnv" ID="VirtualenvManager.renameVirtualEnv"></a> <h4>VirtualenvManager.renameVirtualEnv</h4> -<b>renameVirtualEnv</b>(<i>oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath</i>) +<b>renameVirtualEnv</b>(<i>oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, isRemote, execPath</i>) <p> Public method to substitute a virtual environment entry with a new name. @@ -445,6 +472,9 @@ </dd><dt><i>isConda</i> (bool)</dt> <dd> flag indicating an Anaconda virtual environment +</dd><dt><i>isRemote</i> (bool)</dt> +<dd> +flag indicating a remotely accessed environment </dd><dt><i>execPath</i> (str)</dt> <dd> search path string to be prepended to the PATH @@ -452,7 +482,7 @@ </dd> </dl><a NAME="VirtualenvManager.setVirtualEnv" ID="VirtualenvManager.setVirtualEnv"></a> <h4>VirtualenvManager.setVirtualEnv</h4> -<b>setVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath</i>) +<b>setVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, isRemote, execPath</i>) <p> Public method to change a virtual environment. </p><dl> @@ -474,6 +504,9 @@ </dd><dt><i>isConda</i> (bool)</dt> <dd> flag indicating an Anaconda virtual environment +</dd><dt><i>isRemote</i> (bool)</dt> +<dd> +flag indicating a remotely accessed environment </dd><dt><i>execPath</i> (str)</dt> <dd> search path string to be prepended to the PATH
--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvManagerDialog.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvManagerDialog.html Wed Feb 13 20:39:58 2019 +0100 @@ -50,7 +50,7 @@ QDialog, Ui_VirtualenvManagerDialog <h3>Class Attributes</h3> <table> -<tr><td>ExecPathRole</td></tr><tr><td>IsCondaRole</td></tr><tr><td>IsGlobalRole</td></tr><tr><td>PythonVariantRole</td></tr> +<tr><td>ExecPathRole</td></tr><tr><td>IsCondaRole</td></tr><tr><td>IsGlobalRole</td></tr><tr><td>IsRemoteRole</td></tr><tr><td>PythonVariantRole</td></tr> </table> <h3>Class Methods</h3> <table>
--- a/Documentation/Source/eric6.eric6.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.eric6.html Wed Feb 13 20:39:58 2019 +0100 @@ -28,7 +28,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>args</td></tr><tr><td>inMainLoop</td></tr><tr><td>mainWindow</td></tr><tr><td>originalPathString</td></tr><tr><td>restartArgs</td></tr><tr><td>restartArgsList</td></tr><tr><td>splash</td></tr> +<tr><td>app</td></tr><tr><td>args</td></tr><tr><td>inMainLoop</td></tr><tr><td>mainWindow</td></tr><tr><td>originalPathString</td></tr><tr><td>restartArgs</td></tr><tr><td>restartArgsList</td></tr><tr><td>splash</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric6.eric6_browser.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.eric6_browser.html Wed Feb 13 20:39:58 2019 +0100 @@ -29,7 +29,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>SettingsDir</td></tr> +<tr><td>SettingsDir</td></tr><tr><td>app</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric6.eric6_trpreviewer.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.eric6_trpreviewer.html Wed Feb 13 20:39:58 2019 +0100 @@ -29,7 +29,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>app</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric6.eric6_webbrowser.html Wed Feb 13 20:39:03 2019 +0100 +++ b/Documentation/Source/eric6.eric6_webbrowser.html Wed Feb 13 20:39:58 2019 +0100 @@ -29,7 +29,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>app</td></tr> </table> <h3>Classes</h3> <table>
--- a/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Wed Feb 13 20:39:58 2019 +0100 @@ -1,7 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# pycodestyle.py - Check Python source code formatting, according to PEP 8 +# pycodestyle.py - Check Python source code formatting, according to +# PEP 8 # # Copyright (C) 2006-2009 Johann C. Rocholl <johann@rocholl.net> # Copyright (C) 2009-2014 Florent Xicluna <florent.xicluna@gmail.com> @@ -51,9 +52,9 @@ from __future__ import with_statement # -# This is a modified version to make the original pycodestyle.py better suitable -# for being called from within the eric6 IDE. The modifications are as -# follows: +# This is a modified version to make the original pycodestyle.py better +# suitable for being called from within the eric6 IDE. The modifications +# are as follows: # # - made messages translatable via Qt # - added code for eric6 integration @@ -75,9 +76,9 @@ from functools import lru_cache except ImportError: def lru_cache(maxsize=128): # noqa as it's a fake implementation. - """Does not really need a real a lru_cache, it's just optimization, so - let's just do nothing here. Python 3.2+ will just get better - performances, time to upgrade? + """Does not really need a real a lru_cache, it's just + optimization, so let's just do nothing here. Python 3.2+ will + just get better performances, time to upgrade? """ return lambda function: function @@ -90,7 +91,7 @@ except ImportError: from ConfigParser import RawConfigParser # __IGNORE_WARNING__ -__version__ = '2.4.0-eric' +__version__ = '2.5.0-eric' DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox' DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503,W504' @@ -115,6 +116,7 @@ # Methods and nested class and function. 'method': 1, } +MAX_DOC_LENGTH = 72 REPORT_FORMAT = { 'default': '%(path)s:%(row)d:%(col)d: %(code)s %(text)s', 'pylint': '%(path)s:%(row)d: [%(code)s] %(text)s', @@ -126,9 +128,12 @@ UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-']) WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%']) +# Warn for -> function annotation operator in py3.5+ (issue 803) +FUNCTION_RETURN_ANNOTATION_OP = ['->'] if sys.version_info >= (3, 5) else [] WS_NEEDED_OPERATORS = frozenset([ '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>', - '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '=']) + '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '='] + + FUNCTION_RETURN_ANNOTATION_OP) WHITESPACE = frozenset(' \t') NEWLINE = frozenset([tokenize.NL, tokenize.NEWLINE]) SKIP_TOKENS = NEWLINE.union([tokenize.INDENT, tokenize.DEDENT]) @@ -167,11 +172,6 @@ ) DUNDER_REGEX = re.compile(r'^__([^\s]+)__ = ') -# Work around Python < 2.6 behaviour, which does not generate NL after -# a comment which is on a line by itself. -COMMENT_WITH_NL = tokenize.generate_tokens(['#\n'].pop).send(None)[1] == '#\n' - - _checks = {'physical_line': {}, 'logical_line': {}, 'tree': {}} @@ -184,6 +184,7 @@ else: return inspect.getargspec(function)[0] + def register_check(check, codes=None): """Register a new check object.""" def _add_check(check, kind, codes, args): @@ -203,22 +204,23 @@ return check -############################################################################## +######################################################################## # Plugins (check functions) for physical lines -############################################################################## +######################################################################## @register_check def tabs_or_spaces(physical_line, indent_char): r"""Never mix tabs and spaces. The most popular way of indenting Python is with spaces only. The - second-most popular way is with tabs only. Code indented with a mixture - of tabs and spaces should be converted to using spaces exclusively. When - invoking the Python command line interpreter with the -t option, it issues - warnings about code that illegally mixes tabs and spaces. When using -tt - these warnings become errors. These options are highly recommended! + second-most popular way is with tabs only. Code indented with a + mixture of tabs and spaces should be converted to using spaces + exclusively. When invoking the Python command line interpreter with + the -t option, it issues warnings about code that illegally mixes + tabs and spaces. When using -tt these warnings become errors. + These options are highly recommended! - Okay: if a == 0:\n a = 1\n b = 1 + Okay: if a == 0:\n a = 1\n b = 1 E101: if a == 0:\n a = 1\n\tb = 1 """ indent = INDENT_REGEX.match(physical_line).group(1) @@ -229,7 +231,7 @@ @register_check def tabs_obsolete(physical_line): - r"""For new projects, spaces-only are strongly recommended over tabs. + r"""On new projects, spaces-only are strongly recommended over tabs. Okay: if True:\n return W191: if True:\n\treturn @@ -243,8 +245,8 @@ def trailing_whitespace(physical_line): r"""Trailing whitespace is superfluous. - The warning returned varies on whether the line itself is blank, for easier - filtering for those who want to indent their blank lines. + The warning returned varies on whether the line itself is blank, + for easier filtering for those who want to indent their blank lines. Okay: spam(1)\n# W291: spam(1) \n# @@ -272,10 +274,10 @@ """ if line_number == total_lines: stripped_last_line = physical_line.rstrip() - if not stripped_last_line: + if physical_line and not stripped_last_line: return 0, "W391 blank line at end of file" if stripped_last_line == physical_line: - return len(physical_line), "W292 no newline at end of file" + return len(lines[-1]), "W292 no newline at end of file" @register_check @@ -284,11 +286,11 @@ r"""Limit all lines to a maximum of 79 characters. There are still many devices around that are limited to 80 character - lines; plus, limiting windows to 80 characters makes it possible to have - several windows side-by-side. The default wrapping on such devices looks - ugly. Therefore, please limit all lines to a maximum of 79 characters. - For flowing long blocks of text (docstrings or comments), limiting the - length to 72 characters is recommended. + lines; plus, limiting windows to 80 characters makes it possible to + have several windows side-by-side. The default wrapping on such + devices looks ugly. Therefore, please limit all lines to a maximum + of 79 characters. For flowing long blocks of text (docstrings or + comments), limiting the length to 72 characters is recommended. Reports error E501. """ @@ -298,8 +300,9 @@ # Special case: ignore long shebang lines. if line_number == 1 and line.startswith('#!'): return - # Special case for long URLs in multi-line docstrings or comments, - # but still report the error when the 72 first chars are whitespaces. + # Special case for long URLs in multi-line docstrings or + # comments, but still report the error when the 72 first chars + # are whitespaces. chunks = line.split() if ((len(chunks) == 1 and multiline) or (len(chunks) == 2 and chunks[0] == '#')) and \ @@ -317,9 +320,9 @@ length, max_line_length) -############################################################################## +######################################################################## # Plugins (check functions) for logical lines -############################################################################## +######################################################################## @register_check @@ -327,15 +330,18 @@ blank_before, previous_logical, previous_unindented_logical_line, previous_indent_level, lines): - r"""Separate top-level function and class definitions with two blank lines. + r"""Separate top-level function and class definitions with two blank + lines. - Method definitions inside a class are separated by a single blank line. + Method definitions inside a class are separated by a single blank + line. - Extra blank lines may be used (sparingly) to separate groups of related - functions. Blank lines may be omitted between a bunch of related - one-liners (e.g. a set of dummy implementations). + Extra blank lines may be used (sparingly) to separate groups of + related functions. Blank lines may be omitted between a bunch of + related one-liners (e.g. a set of dummy implementations). - Use blank lines in functions, sparingly, to indicate logical sections. + Use blank lines in functions, sparingly, to indicate logical + sections. Okay: def a():\n pass\n\n\ndef b():\n pass Okay: def a():\n pass\n\n\nasync def b():\n pass @@ -374,6 +380,16 @@ yield (0, "E303 too many blank lines (%d), expected %d", blank_lines, top_level_lines) elif STARTSWITH_TOP_LEVEL_REGEX.match(logical_line): + # If this is a one-liner (i.e. the next line is not more + # indented), and the previous line is also not deeper + # (it would be better to check if the previous line is part + # of another def/class at the same level), don't require blank + # lines around this. + prev_line = lines[line_number - 2] if line_number >= 2 else '' + next_line = lines[line_number] if line_number < len(lines) else '' + if (expand_indent(prev_line) <= indent_level and + expand_indent(next_line) <= indent_level): + return if indent_level: if not (blank_before == method_lines or previous_indent_level < indent_level or @@ -381,7 +397,8 @@ ): ancestor_level = indent_level nested = False - # Search backwards for a def ancestor or tree root (top level). + # Search backwards for a def ancestor or tree root + # (top level). for line in lines[line_number - top_level_lines::-1]: if line.strip() and expand_indent(line) < ancestor_level: ancestor_level = expand_indent(line) @@ -467,8 +484,8 @@ @register_check def missing_whitespace_after_import_keyword(logical_line): - r"""Multiple imports in form from x import (a, b, c) should have space - between import statement and parenthesised name list. + r"""Multiple imports in form from x import (a, b, c) should have + space between import statement and parenthesised name list. Okay: from foo import (bar, baz) E275: from foo import(bar, baz) @@ -515,8 +532,8 @@ indent_level, previous_indent_level): r"""Use 4 spaces per indentation level. - For really old code that you don't want to mess up, you can continue to - use 8-space tabs. + For really old code that you don't want to mess up, you can continue + to use 8-space tabs. Okay: a = 1 Okay: if a == 0:\n a = 1 @@ -541,6 +558,10 @@ elif not indent_expect and indent_level > previous_indent_level: yield 0, tmpl % (3 + c, "unexpected indentation") + expected_indent_level = previous_indent_level + 4 + if indent_expect and indent_level > expected_indent_level: + yield 0, tmpl % (7, 'over-indented') + @register_check def continued_indentation(logical_line, tokens, indent_level, hang_closing, @@ -553,8 +574,8 @@ When using a hanging indent these considerations should be applied: - there should be no arguments on the first line, and - - further indentation should be used to clearly distinguish itself as a - continuation line. + - further indentation should be used to clearly distinguish itself + as a continuation line. Okay: a = (\n) E123: a = (\n ) @@ -639,7 +660,8 @@ yield (start, "E124 closing bracket does not match " "visual indentation") elif close_bracket and not hang: - # closing bracket matches indentation of opening bracket's line + # closing bracket matches indentation of opening + # bracket's line if hang_closing: yield start, "E133 closing bracket is missing indentation" elif indent[depth] and start[1] < indent[depth]: @@ -657,7 +679,8 @@ # visual indent is verified indent[depth] = start[1] elif visual_indent in (text, str): - # ignore token lined up with matching one from a previous line + # ignore token lined up with matching one from a + # previous line pass else: # indent is broken @@ -870,7 +893,7 @@ elif text in WS_NEEDED_OPERATORS: need_space = True elif text in UNARY_OPERATORS: - # Check if the operator is being used as a binary operator + # Check if the operator is used as a binary operator # Allow unary operators: -123, -x, +1. # Allow argument unpacking: foo(*args, **kwargs). if (prev_text in '}])' if prev_type == tokenize.OP @@ -916,8 +939,8 @@ r"""Don't use spaces around the '=' sign in function arguments. Don't use spaces around the '=' sign when used to indicate a - keyword argument or a default parameter value, except when using a type - annotation. + keyword argument or a default parameter value, except when + using a type annotation. Okay: def complex(real, imag=0.0): Okay: return magic(r=real, i=imag) @@ -960,17 +983,17 @@ parens -= 1 elif in_def and text == ':' and parens == 1: annotated_func_arg = True - elif parens and text == ',' and parens == 1: + elif parens == 1 and text == ',': annotated_func_arg = False elif parens and text == '=': - if not annotated_func_arg: + if annotated_func_arg and parens == 1: + require_space = True + if start == prev_end: + yield (prev_end, missing_message) + else: no_space = True if start != prev_end: yield (prev_end, message) - else: - require_space = True - if start == prev_end: - yield (prev_end, missing_message) if not parens: annotated_func_arg = False @@ -981,9 +1004,9 @@ def whitespace_before_comment(logical_line, tokens): r"""Separate inline comments by at least two spaces. - An inline comment is a comment on the same line as a statement. Inline - comments should be separated by at least two spaces from the statement. - They should start with a # and a single space. + An inline comment is a comment on the same line as a statement. + Inline comments should be separated by at least two spaces from the + statement. They should start with a # and a single space. Each line of a block comment starts with a # and a single space (unless it is indented text inside the comment). @@ -1044,8 +1067,8 @@ logical_line, indent_level, checker_state, noqa): r"""Place imports at the top of the file. - Always put imports at the top of the file, just after any module comments - and docstrings, and before module globals and constants. + Always put imports at the top of the file, just after any module + comments and docstrings, and before module globals and constants. Okay: import os Okay: # this is a comment\nimport os @@ -1061,7 +1084,7 @@ E402: a=1\nfrom sys import x Okay: if x:\n import os - """ + """ # noqa def is_string_literal(line): if line[0] in 'uUbB': line = line[1:] @@ -1071,7 +1094,7 @@ allowed_try_keywords = ('try', 'except', 'else', 'finally') - if indent_level: # Allow imports in conditional statements or functions + if indent_level: # Allow imports in conditional statement/function return if not logical_line: # Allow empty lines or comments return @@ -1084,11 +1107,12 @@ elif re.match(DUNDER_REGEX, line): return elif any(line.startswith(kw) for kw in allowed_try_keywords): - # Allow try, except, else, finally keywords intermixed with imports in - # order to support conditional importing + # Allow try, except, else, finally keywords intermixed with + # imports in order to support conditional importing return elif is_string_literal(line): - # The first literal is a docstring, allow it. Otherwise, report error. + # The first literal is a docstring, allow it. Otherwise, report + # error. if checker_state.get('seen_docstring', False): checker_state['seen_non_imports'] = True else: @@ -1099,7 +1123,8 @@ @register_check def compound_statements(logical_line): - r"""Compound statements (on the same line) are generally discouraged. + r"""Compound statements (on the same line) are generally + discouraged. While sometimes it's okay to put an if/for/while with a small body on the same line, never do this for multi-clause statements. @@ -1130,7 +1155,7 @@ last_char = len(line) - 1 found = line.find(':') prev_found = 0 - counts = dict((char, 0) for char in '{}[]()') + counts = {char: 0 for char in '{}[]()'} while -1 < found < last_char: update_counts(line[prev_found:found], counts) if ((counts['{'] <= counts['}'] and # {'a': 1} (dict) @@ -1162,10 +1187,11 @@ def explicit_line_join(logical_line, tokens): r"""Avoid explicit line join between brackets. - The preferred way of wrapping long lines is by using Python's implied line - continuation inside parentheses, brackets and braces. Long lines can be - broken over multiple lines by wrapping expressions in parentheses. These - should be used in preference to using a backslash for line continuation. + The preferred way of wrapping long lines is by using Python's + implied line continuation inside parentheses, brackets and braces. + Long lines can be broken over multiple lines by wrapping expressions + in parentheses. These should be used in preference to using a + backslash for line continuation. E502: aaa = [123, \\n 123] E502: aaa = ("bbb " \\n "ccc") @@ -1202,8 +1228,8 @@ is_op_token = token_type == tokenize.OP is_conjunction = text in ['and', 'or'] # NOTE(sigmavirus24): Previously the not_a_symbol check was executed - # conditionally. Since it is now *always* executed, text may be None. - # In that case we get a TypeError for `text not in str`. + # conditionally. Since it is now *always* executed, text may be + # None. In that case we get a TypeError for `text not in str`. not_a_symbol = text and text not in "()[]{},:.;@=%~" # The % character is strictly speaking a binary operator, but the # common usage seems to be to put it next to the format parameters, @@ -1290,6 +1316,7 @@ Okay: var = (1 /\n -2) Okay: var = (1 +\n -1 +\n -2) """ + prev_start = None for context in _break_around_binary_operators(tokens): (token_type, text, previous_token_type, previous_text, line_break, unary_context, start) = context @@ -1297,8 +1324,8 @@ line_break and not unary_context and not _is_binary_operator(token_type, text)): - error_pos = (start[0] - 1, start[1]) - yield error_pos, "W504 line break after binary operator" + yield prev_start, "W504 line break after binary operator" + prev_start = start @register_check @@ -1314,10 +1341,10 @@ E712: if arg == True: E712: if False == arg: - Also, beware of writing if x when you really mean if x is not None -- - e.g. when testing whether a variable or argument that defaults to None was - set to some other value. The other value might have a type (such as a - container) that could be false in a boolean context! + Also, beware of writing if x when you really mean if x is not None + -- e.g. when testing whether a variable or argument that defaults to + None was set to some other value. The other value might have a type + (such as a container) that could be false in a boolean context! """ match = not noqa and COMPARE_SINGLETON_REGEX.search(logical_line) if match: @@ -1367,9 +1394,9 @@ Okay: if isinstance(obj, int): E721: if type(obj) is type(1): - When checking if an object is a string, keep in mind that it might be a - unicode string too! In Python 2.3, str and unicode have a common base - class, basestring, so you can do: + When checking if an object is a string, keep in mind that it might + be a unicode string too! In Python 2.3, str and unicode have a + common base class, basestring, so you can do: Okay: if isinstance(obj, basestring): Okay: if type(a1) is type(b1): @@ -1384,7 +1411,8 @@ @register_check def bare_except(logical_line, noqa): - r"""When catching exceptions, mention specific exceptions when possible. + r"""When catching exceptions, mention specific exceptions when + possible. Okay: except Exception: Okay: except BaseException: @@ -1403,8 +1431,8 @@ def ambiguous_identifier(logical_line, tokens): r"""Never use the characters 'l', 'O', or 'I' as variable names. - In some fonts, these characters are indistinguishable from the numerals - one and zero. When tempted to use 'l', use 'L' instead. + In some fonts, these characters are indistinguishable from the + numerals one and zero. When tempted to use 'l', use 'L' instead. Okay: L = 0 Okay: o = 123 @@ -1413,9 +1441,9 @@ E741: O = 123 E741: I = 42 - Variables can be bound in several other contexts, including class and - function definitions, 'global' and 'nonlocal' statements, exception - handlers, and 'with' statements. + Variables can be bound in several other contexts, including class + and function definitions, 'global' and 'nonlocal' statements, + exception handlers, and 'with' statements. Okay: except AttributeError as o: Okay: with lock as L: @@ -1435,7 +1463,7 @@ if prev_text in idents_to_avoid: ident = prev_text pos = prev_start - # identifiers bound to a value with 'as', 'global', or 'nonlocal' + # identifiers bound to values with 'as', 'global', or 'nonlocal' if prev_text in ('as', 'global', 'nonlocal'): if text in idents_to_avoid: ident = text @@ -1454,7 +1482,8 @@ @register_check def python_3000_has_key(logical_line, noqa): - r"""The {}.has_key() method is removed in Python 3: use the 'in' operator. + r"""The {}.has_key() method is removed in Python 3: use the 'in' + operator. Okay: if "alph" in d:\n print d["alph"] W601: assert d.has_key('alph') @@ -1505,12 +1534,15 @@ @register_check -def python_3000_invalid_escape_sequence(logical_line, tokens): +def python_3000_invalid_escape_sequence(logical_line, tokens, noqa): r"""Invalid escape sequences are deprecated in Python 3.6. Okay: regex = r'\.png$' W605: regex = '\.png$' """ + if noqa: + return + # https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals valid = [ '\n', @@ -1535,6 +1567,7 @@ for token_type, text, start, end, line in tokens: if token_type == tokenize.STRING: + start_line, start_col = start quote = text[-3:] if text[-3:] in ('"""', "'''") else text[-1] # Extract string modifiers (e.g. u or r) quote_pos = text.index(quote) @@ -1547,8 +1580,13 @@ while pos >= 0: pos += 1 if string[pos] not in valid: + line = start_line + string.count('\n', 0, pos) + if line == start_line: + col = start_col + len(prefix) + len(quote) + pos + else: + col = pos - string.rfind('\n', 0, pos) - 1 yield ( - pos, + (line, col - 1), "W605 invalid escape sequence '\\%s'", string[pos], ) @@ -1557,40 +1595,56 @@ @register_check def python_3000_async_await_keywords(logical_line, tokens): - """'async' and 'await' are reserved keywords starting with Python 3.7 + """'async' and 'await' are reserved keywords starting at Python 3.7. W606: async = 42 W606: await = 42 - Okay: async def read_data(db):\n data = await db.fetch('SELECT ...') + Okay: async def read(db):\n data = await db.fetch('SELECT ...') """ - # The Python tokenize library before Python 3.5 recognizes async/await as a - # NAME token. Therefore, use a state machine to look for the possible - # async/await constructs as defined by the Python grammar: + # The Python tokenize library before Python 3.5 recognizes + # async/await as a NAME token. Therefore, use a state machine to + # look for the possible async/await constructs as defined by the + # Python grammar: # https://docs.python.org/3/reference/grammar.html state = None for token_type, text, start, end, line in tokens: error = False + if token_type == tokenize.NL: + continue + if state is None: if token_type == tokenize.NAME: if text == 'async': state = ('async_stmt', start) elif text == 'await': state = ('await', start) + elif (token_type == tokenize.NAME and + text in ('def', 'for')): + state = ('define', start) + elif state[0] == 'async_stmt': if token_type == tokenize.NAME and text in ('def', 'with', 'for'): - # One of funcdef, with_stmt, or for_stmt. Return to looking - # for async/await names. + # One of funcdef, with_stmt, or for_stmt. Return to + # looking for async/await names. state = None else: error = True elif state[0] == 'await': - if token_type in (tokenize.NAME, tokenize.NUMBER, tokenize.STRING): - # An await expression. Return to looking for async/await names. + if token_type == tokenize.NAME: + # An await expression. Return to looking for async/await + # names. + state = None + elif token_type == tokenize.OP and text == '(': state = None else: error = True + elif state[0] == 'define': + if token_type == tokenize.NAME and text in ('async', 'await'): + error = True + else: + state = None if error: yield ( @@ -1609,9 +1663,64 @@ ) -############################################################################## +######################################################################## +@register_check +def maximum_doc_length(logical_line, max_doc_length, noqa, tokens): + r"""Limit all doc lines to a maximum of 72 characters. + + For flowing long blocks of text (docstrings or comments), limiting + the length to 72 characters is recommended. + + Reports warning W505 + """ + if max_doc_length is None or noqa: + return + + prev_token = None + skip_lines = set() + # Skip lines that + for token_type, text, start, end, line in tokens: + if token_type not in SKIP_COMMENTS.union([tokenize.STRING]): + skip_lines.add(line) + + for token_type, text, start, end, line in tokens: + # Skip lines that aren't pure strings + if token_type == tokenize.STRING and skip_lines: + continue + if token_type in (tokenize.STRING, tokenize.COMMENT): + # Only check comment-only lines + if prev_token is None or prev_token in SKIP_TOKENS: + lines = line.splitlines() + for line_num, physical_line in enumerate(lines): + if hasattr(physical_line, 'decode'): # Python 2 + # The line could contain multi-byte characters + try: + physical_line = physical_line.decode('utf-8') + except UnicodeError: + pass + if start[0] + line_num == 1 and line.startswith('#!'): + return + length = len(physical_line) + chunks = physical_line.split() + if token_type == tokenize.COMMENT: + if (len(chunks) == 2 and + length - len(chunks[-1]) < MAX_DOC_LENGTH): + continue + if len(chunks) == 1 and line_num + 1 < len(lines): + if (len(chunks) == 1 and + length - len(chunks[-1]) < MAX_DOC_LENGTH): + continue + if length > max_doc_length: + doc_error = (start[0] + line_num, max_doc_length) + yield (doc_error, "W505 doc line too long " + "(%d > %d characters)", + length, max_doc_length) + prev_token = token_type + + +######################################################################## # Helper functions -############################################################################## +######################################################################## if sys.version_info < (3,): @@ -1708,14 +1817,16 @@ rv[path].update(range(row, row + nrows)) elif line[:3] == '+++': path = line[4:].split('\t', 1)[0] - # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject - # instead of a/b/c/d as prefixes for patches + # Git diff will use (i)ndex, (w)ork tree, (c)ommit and + # (o)bject instead of a/b/c/d as prefixes for patches if path[:2] in ('b/', 'w/', 'i/'): path = path[2:] rv[path] = set() - return dict([(os.path.join(parent, path), rows) - for (path, rows) in rv.items() - if rows and filename_match(path, patterns)]) + return { + os.path.join(parent, filepath): rows + for (filepath, rows) in rv.items() + if rows and filename_match(filepath, patterns) + } def normalize_paths(value, parent=os.curdir): @@ -1758,14 +1869,9 @@ return token[0] in NEWLINE or token[4][token[3][1]:].lstrip() == '\\\n' -if COMMENT_WITH_NL: - def _is_eol_token(token, _eol_token=_is_eol_token): - return _eol_token(token) or (token[0] == tokenize.COMMENT and - token[1] == token[4]) - -############################################################################## +######################################################################## # Framework to run all checks -############################################################################## +######################################################################## class Checker(object): @@ -1782,6 +1888,7 @@ self._logical_checks = options.logical_checks self._ast_checks = options.ast_checks self.max_line_length = options.max_line_length + self.max_doc_length = options.max_doc_length self.multiline = False # in a multiline string? self.hang_closing = options.hang_closing self.verbose = options.verbose @@ -1953,7 +2060,7 @@ self.report_error_args(lineno, *args[1:]) def generate_tokens(self): - """Tokenize the file, run physical line checks and yield tokens.""" + """Tokenize file, run physical line checks and yield tokens.""" if self._io_error: self.report_error_args(1, 0, 'E902', self._io_error, readlines) tokengen = tokenize.generate_tokens(self.readline) @@ -1968,7 +2075,7 @@ self.report_invalid_syntax() def maybe_check_physical(self, token): - """If appropriate (based on token), check current physical line(s).""" + """If appropriate for token, check current physical line(s).""" # Called after every token, but act only on end of line. if _is_eol_token(token): # Obviously, a newline token ends a single physical line. @@ -1976,15 +2083,16 @@ elif token[0] == tokenize.STRING and '\n' in token[1]: # Less obviously, a string that contains newlines is a # multiline string, either triple-quoted or with internal - # newlines backslash-escaped. Check every physical line in the - # string *except* for the last one: its newline is outside of - # the multiline string, so we consider it a regular physical - # line, and will check it like any other physical line. + # newlines backslash-escaped. Check every physical line in + # the string *except* for the last one: its newline is + # outside of the multiline string, so we consider it a + # regular physical line, and will check it like any other + # physical line. # # Subtleties: - # - we don't *completely* ignore the last line; if it contains - # the magical "# noqa" comment, we disable all physical - # checks for the entire multiline string + # - we don't *completely* ignore the last line; if it + # contains the magical "# noqa" comment, we disable all + # physical checks for the entire multiline string # - have to wind self.line_number back because initially it # points to the last line of the string, and we want # check_physical() to give accurate feedback @@ -2039,14 +2147,6 @@ del self.tokens[0] else: self.check_logical() - elif COMMENT_WITH_NL and token_type == tokenize.COMMENT: - if len(self.tokens) == 1: - # The comment also ends a physical line - token = list(token) - token[1] = text.rstrip('\r\n') - token[3] = (token[2][0], token[2][1] + len(token[1])) - self.tokens = [tuple(token)] - self.check_logical() if self.tokens: self.check_physical(self.lines[-1]) self.check_logical() @@ -2133,8 +2233,8 @@ def get_count(self, prefix=''): """Return the total count of errors and warnings.""" - return sum([self.counters[key] - for key in self.messages if key.startswith(prefix)]) + return sum(self.counters[key] + for key in self.messages if key.startswith(prefix)) def get_statistics(self, prefix=''): """Get statistics for message codes that start with the prefix. @@ -2163,7 +2263,7 @@ class FileReport(BaseReport): - """Collect the results of the checks and print only the filenames.""" + """Collect the results of the checks and print the filenames.""" print_filename = True @@ -2204,7 +2304,7 @@ return code def get_file_results(self): - """Print the result and return the overall count for this file.""" + """Print results and return the overall count for this file.""" self._deferred_print.sort() for line_number, offset, code, text, doc in self._deferred_print: print(self._fmt % { @@ -2223,8 +2323,8 @@ print(' ' + doc.strip()) # stdout is block buffered when not stdout.isatty(). - # line can be broken where buffer boundary since other processes - # write to same file. + # line can be broken where buffer boundary since other + # processes write to same file. # flush() after print() to avoid buffer boundary. # Typical buffer size is 8192. line written safely when # len(line) < 8192. @@ -2345,7 +2445,7 @@ def excluded(self, filename, parent=None): """Check if the file should be excluded. - Check if 'options.exclude' contains a pattern that matches filename. + Check if 'options.exclude' contains a pattern matching filename. """ if not self.options.exclude: return False @@ -2373,8 +2473,8 @@ def get_checks(self, argument_name): """Get all the checks for this category. - Find all globally visible functions where the first argument name - starts with argument_name and which contain selected tests. + Find all globally visible functions where the first argument + name starts with argument_name and which contain selected tests. """ checks = [] for check, attrs in _checks[argument_name].items(): @@ -2390,8 +2490,8 @@ usage="%prog [options] input ...") parser.config_options = [ 'exclude', 'filename', 'select', 'ignore', 'max-line-length', - 'hang-closing', 'count', 'format', 'quiet', 'show-pep8', - 'show-source', 'statistics', 'verbose'] + 'max-doc-length', 'hang-closing', 'count', 'format', 'quiet', + 'show-pep8', 'show-source', 'statistics', 'verbose'] parser.add_option('-v', '--verbose', default=0, action='count', help="print status messages, or debug with -vv") parser.add_option('-q', '--quiet', default=0, action='count', @@ -2427,6 +2527,10 @@ default=MAX_LINE_LENGTH, help="set maximum allowed line length " "(default: %default)") + parser.add_option('--max-doc-length', type='int', metavar='n', + default=None, + help="set maximum allowed doc line length and perform " + "these checks (unchecked if not set)") parser.add_option('--hang-closing', action='store_true', help="hang closing bracket instead of matching " "indentation of opening bracket's line") @@ -2449,12 +2553,13 @@ def read_config(options, args, arglist, parser): """Read and parse configurations. - If a config file is specified on the command line with the "--config" - option, then only it is used for configuration. + If a config file is specified on the command line with the + "--config" option, then only it is used for configuration. - Otherwise, the user configuration (~/.config/pycodestyle) and any local - configurations in the current directory or above will be merged together - (in that order) using the read method of ConfigParser. + Otherwise, the user configuration (~/.config/pycodestyle) and any + local configurations in the current directory or above will be + merged together (in that order) using the read method of + ConfigParser. """ config = RawConfigParser() @@ -2489,8 +2594,7 @@ warnings.warn('[pep8] section is deprecated. Use [pycodestyle].') if pycodestyle_section: - option_list = dict([(o.dest, o.type or o.action) - for o in parser.option_list]) + option_list = {o.dest: o.type or o.action for o in parser.option_list} # First, read the default values (new_options, __) = parser.parse_args([]) @@ -2523,10 +2627,10 @@ def process_options(arglist=None, parse_argv=False, config_file=None, parser=None, verbose=None): - """Process options passed either via arglist or via command line args. + """Process options passed either via arglist or command line args. - Passing in the ``config_file`` parameter allows other tools, such as flake8 - to specify their own options to be processed in pycodestyle. + Passing in the ``config_file`` parameter allows other tools, such as + flake8 to specify their own options to be processed in pycodestyle. """ if not parser: parser = get_parser() @@ -2546,7 +2650,7 @@ (options, args) = parser.parse_args(arglist) options.reporter = None - # If explicity specified verbosity, override any `-v` CLI flag + # If explicitly specified verbosity, override any `-v` CLI flag if verbose is not None: options.verbose = verbose
--- a/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Wed Feb 13 20:39:58 2019 +0100 @@ -37,6 +37,9 @@ "E116": QCoreApplication.translate( "pycodestyle", "unexpected indentation (comment)"), + "E117": QCoreApplication.translate( + "pycodestyle", + "over-indented"), "E121": QCoreApplication.translate( "pycodestyle", "continuation line indentation is not a multiple of four"), @@ -207,6 +210,9 @@ "W504": QCoreApplication.translate( "pycodestyle", "line break after binary operator"), + "W505": QCoreApplication.translate( + "pycodestyle", + "doc line too long ({0} > {1} characters)"), "W601": QCoreApplication.translate( "pycodestyle", ".has_key() is deprecated, use 'in'"), @@ -801,6 +807,7 @@ "E307": [3, 1], "E308": [3], "E501": [85, 79], + "W505": [80, 72], "E605": ["A"], "E711": ["None", "'if cond is None:'"], "E712": ["True", "'if cond is True:' or 'if cond:'"],
--- a/Plugins/PluginPipInterface.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/PluginPipInterface.py Wed Feb 13 20:39:58 2019 +0100 @@ -202,7 +202,7 @@ self.PreferencesKey + "/" + key, value) if key == "CurrentEnvironment": - self.currentEnvironmentChanged.emit(value) + self.currentEnvironmentChanged.emit(value) def getMenu(self, name): """
--- a/Plugins/PluginWizardDotDesktop.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/PluginWizardDotDesktop.py Wed Feb 13 20:39:58 2019 +0100 @@ -114,10 +114,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is None: - E5MessageBox.critical( - self.__ui, - self.tr('No current editor'), - self.tr('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.tr('No current editor'), + self.tr('Please open or create a file first.')) else: if editor.text(): ok = E5MessageBox.yesNo(
--- a/Plugins/PluginWizardE5MessageBox.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/PluginWizardE5MessageBox.py Wed Feb 13 20:39:58 2019 +0100 @@ -123,10 +123,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is None: - E5MessageBox.critical( - self.__ui, - self.tr('No current editor'), - self.tr('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.tr('No current editor'), + self.tr('Please open or create a file first.')) else: code, ok = self.__callForm(editor) if ok:
--- a/Plugins/PluginWizardSetup.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/PluginWizardSetup.py Wed Feb 13 20:39:58 2019 +0100 @@ -136,10 +136,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is None: - E5MessageBox.critical( - self.__ui, - self.tr('No current editor'), - self.tr('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.tr('No current editor'), + self.tr('Please open or create a file first.')) else: code, ok = self.__callForm(editor) if ok:
--- a/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -118,19 +118,22 @@ @type str """ enable = False + vcsUrlEnable = False if txt: url = QUrl.fromUserInput(txt) if url.isValid(): if url.scheme() in ConfigGitSchemes: enable = True + vcsUrlEnable = url.scheme() == "file" elif ':' in txt: # assume scp like repository URL enable = True + else: + vcsUrlEnable = True self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) - - self.vcsUrlButton.setEnabled(url.scheme() == "file" or len(txt) == 0) + self.vcsUrlButton.setEnabled(vcsUrlEnable) @pyqtSlot() def on_vcsUrlClearHistoryButton_clicked(self): @@ -152,10 +155,8 @@ """ self.__saveHistory() - url = QUrl.fromUserInput( - self.vcsUrlCombo.currentText().replace("\\", "/")) vcsdatadict = { - "url": url.toString(QUrl.None_), + "url": self.vcsUrlCombo.currentText().replace("\\", "/"), } return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -78,20 +78,22 @@ @type str """ enable = False + vcsUrlEnable = False if txt: url = QUrl.fromUserInput(txt) if url.isValid(): if url.scheme() in ConfigGitSchemes: enable = True + vcsUrlEnable = url.scheme() == "file" elif ':' in txt: # assume scp like repository URL enable = True + else: + vcsUrlEnable = True self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) - - self.submoduleUrlButton.setEnabled(url.scheme() == "file" or - len(txt) == 0) + self.submoduleUrlButton.setEnabled(vcsUrlEnable) @pyqtSlot() def on_submoduleUrlButton_clicked(self): @@ -145,19 +147,12 @@ """ self.__saveHistory() - url = QUrl.fromUserInput( - self.submoduleUrlCombo.currentText().replace("\\", "/")) path = self.submoduleDirEdit.text() if path: path = self.__getRelativePath(path) - try: - formattingOptions = QUrl.FormattingOptions(QUrl.None_) - except AttributeError: - # for PyQt < 5.6.0 - formattingOptions = QUrl.FormattingOptions(0) return ( - url.toString(formattingOptions), + self.submoduleUrlCombo.currentText().replace("\\", "/"), self.branchEdit.text(), self.nameEdit.text(), path,
--- a/Plugins/VcsPlugins/vcsGit/git.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/VcsPlugins/vcsGit/git.py Wed Feb 13 20:39:58 2019 +0100 @@ -1345,7 +1345,10 @@ if url.endswith('/'): url = url[:-1] urll = url.split('//') - return "{0}//{1}".format(urll[0], '/'.join(urll[1:])) + if len(urll) > 1: + url = "{0}//{1}".format(urll[0], '/'.join(urll[1:])) + + return url def gitCreateIgnoreFile(self, name, autoAdd=False): """
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -309,6 +309,6 @@ """ applied.</p><p>Reason: {0}</p>""") .format(error)) else: - self.__dirtyList = False - self.on_patchSelector_activated( - self.patchNameLabel.text()) + self.__dirtyList = False + self.on_patchSelector_activated( + self.patchNameLabel.text())
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -284,7 +284,7 @@ line = line.replace(self.summaryPath + '/', '') line = " ".join(line.split()) if line.startswith("--- ") or line.startswith("+++ "): - self.__processFileLine(line) + self.__processFileLine(line) self.__appendText(line) self.paras += 1
--- a/Preferences/ShortcutsDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Preferences/ShortcutsDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -312,8 +312,8 @@ # 3. check key name if itm.text(0) != keyname: - for col in [1, 2]: # check against primary, - # then alternative binding + for col in [1, 2]: + # check against primary, then alternative binding itmseq = itm.text(col) # step 1: check if shortcut is already allocated if keystr == itmseq:
--- a/Project/Project.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Project/Project.py Wed Feb 13 20:39:58 2019 +0100 @@ -1407,7 +1407,7 @@ qmFile = self.__binaryTranslationsCallbacks[ self.pdata["PROJECTTYPE"]](langFile) except KeyError: - qmFile = langFile.replace('.ts', '.qm') + qmFile = langFile.replace('.ts', '.qm') if qmFile == langFile: qmFile = "" return qmFile
--- a/QScintilla/Editor.py Wed Feb 13 20:39:03 2019 +0100 +++ b/QScintilla/Editor.py Wed Feb 13 20:39:58 2019 +0100 @@ -3289,9 +3289,9 @@ @param modifiers keyboard modifiers (Qt.KeyboardModifiers) """ if margin == self.__bmMargin: - self.toggleBookmark(line + 1) + self.toggleBookmark(line + 1) elif margin == self.__bpMargin: - self.__toggleBreakpoint(line + 1) + self.__toggleBreakpoint(line + 1) elif margin == self.__indicMargin: if self.markersAtLine(line) & (1 << self.syntaxerror): self.__showSyntaxError(line)
--- a/QScintilla/QsciScintillaCompat.py Wed Feb 13 20:39:03 2019 +0100 +++ b/QScintilla/QsciScintillaCompat.py Wed Feb 13 20:39:58 2019 +0100 @@ -1622,6 +1622,21 @@ return string.encode("latin-1") ########################################################################### + ## methods to implement workarounds for broken things + ########################################################################### + + if QSCINTILLA_VERSION() == 0x020B00: + def insert(self, txt): + """ + Public method to insert text at the cursor position. + + @param txt text to be inserted + @type str + """ + line, col = self.getCursorPosition() + self.insertAt(txt, line, col) + + ########################################################################### ## methods below have been added to QScintilla starting with version 2.5 ###########################################################################
--- a/QScintilla/SpellChecker.py Wed Feb 13 20:39:03 2019 +0100 +++ b/QScintilla/SpellChecker.py Wed Feb 13 20:39:58 2019 +0100 @@ -331,7 +331,7 @@ if pos >= 0 and self.__checkRegion(pos): pos0 = pos - pos1 = -1 + pos1 = sys.maxsize if not self.editor.charAt(pos).isalnum(): line, index = self.editor.lineIndexFromPosition(pos) self.editor.clearIndicator(
--- a/UI/UserInterface.py Wed Feb 13 20:39:03 2019 +0100 +++ b/UI/UserInterface.py Wed Feb 13 20:39:58 2019 +0100 @@ -6649,6 +6649,9 @@ self.SAServer.shutdown() self.SAServer = None + # set proxy factory to None to avoid crashes + QNetworkProxyFactory.setApplicationProxyFactory(None) + Preferences.setGeometry("MainMaximized", self.isMaximized()) if not self.isMaximized(): Preferences.setGeometry("MainGeometry", self.saveGeometry())
--- a/Utilities/ModuleParser.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Utilities/ModuleParser.py Wed Feb 13 20:39:58 2019 +0100 @@ -646,7 +646,7 @@ contents = _hashsub(r"\1", contents) else: if self.file.lower().endswith('.ptl'): - contents = "" + contents = "" else: contents = 1 and m.group("DocstringContents1") \ or m.group("DocstringContents2")
--- a/Utilities/__init__.py Wed Feb 13 20:39:03 2019 +0100 +++ b/Utilities/__init__.py Wed Feb 13 20:39:58 2019 +0100 @@ -1576,7 +1576,7 @@ project.isOpen() and project.isProjectFile(filename) and ext in py2Ext + py3Ext): - pyVer = pyAssignment.get(project.getProjectLanguage(), 0) + pyVer = pyAssignment.get(project.getProjectLanguage(), 0) elif ext in py2Ext and ext not in py3Ext: pyVer = 2 elif ext in py3Ext and ext not in py2Ext:
--- a/ViewManager/ViewManager.py Wed Feb 13 20:39:03 2019 +0100 +++ b/ViewManager/ViewManager.py Wed Feb 13 20:39:58 2019 +0100 @@ -5758,7 +5758,7 @@ text = self.quickFindtextCombo.lineEdit().text() if not text and again: - text = self.quickFindtextCombo.lastSearchText + text = self.quickFindtextCombo.lastSearchText if not text: if Preferences.getEditor("QuickSearchMarkersEnabled"): aw.clearSearchIndicators() @@ -6562,6 +6562,7 @@ pass self.closeAllWindows() + self.currentEditor = None # save the list of recently opened projects self.__saveRecent()
--- a/VirtualEnv/VirtualenvAddEditDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/VirtualEnv/VirtualenvAddEditDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -28,7 +28,7 @@ """ def __init__(self, manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, - isConda=False, execPath="", parent=None): + isConda=False, isRemote=False, execPath="", parent=None): """ Constructor @@ -46,6 +46,8 @@ @type bool @param isConda flag indicating an Anaconda virtual environment @type bool + @param isRemote flag indicating a remotely accessed environment + @type bool @param execPath search path string to be prepended to the PATH environment variable @type str @@ -77,11 +79,14 @@ ) self.nameEdit.setText(venvName) - self.targetDirectoryPicker.setText(venvDirectory) - self.pythonExecPicker.setText(venvInterpreter) + self.targetDirectoryPicker.setText(venvDirectory, + toNative=not isRemote) + self.pythonExecPicker.setText(venvInterpreter, + toNative=not isRemote) self.variantComboBox.setCurrentIndex(3 - venvVariant) self.globalCheckBox.setChecked(isGlobal) self.anacondaCheckBox.setChecked(isConda) + self.remoteCheckBox.setChecked(isRemote) self.execPathEdit.setText(execPath) self.__updateOk() @@ -104,15 +109,20 @@ if not self.globalCheckBox.isChecked(): enable = ( - enable and - bool(self.targetDirectoryPicker.text()) and - os.path.exists(self.targetDirectoryPicker.text()) + enable and ( + self.remoteCheckBox.isChecked() or ( + bool(self.targetDirectoryPicker.text()) and + os.path.exists(self.targetDirectoryPicker.text()) + ) + ) ) enable = ( enable and - bool(self.pythonExecPicker.text()) and - os.access(self.pythonExecPicker.text(), os.X_OK) + bool(self.pythonExecPicker.text()) and ( + self.remoteCheckBox.isChecked() or + os.access(self.pythonExecPicker.text(), os.X_OK) + ) ) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) @@ -164,6 +174,16 @@ self.__updateOk() @pyqtSlot(bool) + def on_remoteCheckBox_toggled(self, checked): + """ + Private slot handling a change of the remote check box state. + + @param checked state of the check box + @type bool + """ + self.__updateOk() + + @pyqtSlot(bool) def on_anacondaCheckBox_clicked(self, checked): """ Private slot handling a user click on this check box. @@ -194,16 +214,19 @@ @return tuple containing the logical name, the directory, the interpreter of the virtual environment, the Python variant, a flag indicating a global environment, a flag indicating an - Anaconda environment and a string to be prepended to the PATH - environment variable - @rtype tuple of (str, str, str, int, bool,bool, str) + Anaconda environment, aflag indicating a remotely accessed + environment and a string to be prepended to the PATH environment + variable + @rtype tuple of (str, str, str, int, bool, bool, bool, str) """ + nativePaths = not self.remoteCheckBox.isChecked() return ( self.nameEdit.text(), - self.targetDirectoryPicker.text(), - self.pythonExecPicker.text(), + self.targetDirectoryPicker.text(toNative=nativePaths), + self.pythonExecPicker.text(toNative=nativePaths), 3 - self.variantComboBox.currentIndex(), self.globalCheckBox.isChecked(), self.anacondaCheckBox.isChecked(), + self.remoteCheckBox.isChecked(), self.execPathEdit.text(), )
--- a/VirtualEnv/VirtualenvAddEditDialog.ui Wed Feb 13 20:39:03 2019 +0100 +++ b/VirtualEnv/VirtualenvAddEditDialog.ui Wed Feb 13 20:39:58 2019 +0100 @@ -103,7 +103,7 @@ <item> <widget class="QCheckBox" name="globalCheckBox"> <property name="toolTip"> - <string>Select to denote a global environment (i.e. no virtual environment directory to be given)</string> + <string>Select,if this is a global environment (i.e. no virtual environment directory to be given)</string> </property> <property name="whatsThis"> <string><b>Global Environment</b> @@ -117,7 +117,7 @@ <item> <widget class="QCheckBox" name="anacondaCheckBox"> <property name="toolTip"> - <string>Select, if this is an Conda environment</string> + <string>Select, if this is a Conda environment</string> </property> <property name="text"> <string>Conda Environment</string> @@ -125,6 +125,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="remoteCheckBox"> + <property name="toolTip"> + <string>Select, if this is a remotely accessed environment</string> + </property> + <property name="text"> + <string>Remote Environment</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -180,6 +190,9 @@ <tabstop>pythonExecPicker</tabstop> <tabstop>variantComboBox</tabstop> <tabstop>globalCheckBox</tabstop> + <tabstop>anacondaCheckBox</tabstop> + <tabstop>remoteCheckBox</tabstop> + <tabstop>execPathEdit</tabstop> </tabstops> <resources/> <connections>
--- a/VirtualEnv/VirtualenvManager.py Wed Feb 13 20:39:03 2019 +0100 +++ b/VirtualEnv/VirtualenvManager.py Wed Feb 13 20:39:58 2019 +0100 @@ -61,17 +61,20 @@ # variant: Python variant (2 or 3) # is_global: a flag indicating a global environment # is_conda: a flag indicating an Anaconda environment + # is_remote: a flag indicating a remotely accessed environment # exec_path: a string to be prefixed to the PATH environment # setting # for venvName in environments: - interpreter = environments[venvName]["interpreter"] - if os.access(interpreter, os.X_OK): - environment = environments[venvName] + environment = environments[venvName] + if ("is_remote" in environment and environment["is_remote"]) or \ + os.access(environment["interpreter"], os.X_OK): if "is_global" not in environment: environment["is_global"] = environment["path"] == "" if "is_conda" not in environment: environment["is_conda"] = False + if "is_remote" not in environment: + environment["is_remote"] = False if "exec_path" not in environment: environment["exec_path"] = "" self.__virtualEnvironments[venvName] = environment @@ -92,6 +95,7 @@ "variant": sys.version_info[0], "is_global": True, "is_conda": False, + "is_remote": False, "exec_path": "", } @@ -105,6 +109,7 @@ "PyVenv/VirtualEnvironments", json.dumps(self.__virtualEnvironments) ) + Preferences.syncPreferences() def getDefaultEnvironment(self): """ @@ -169,7 +174,7 @@ def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, - execPath=""): + isRemote=False, execPath=""): """ Public method to add a virtual environment. @@ -185,6 +190,8 @@ @type bool @param isConda flag indicating an Anaconda virtual environment @type bool + @param isRemote flag indicating a remotely accessed environment + @type bool @param execPath search path string to be prepended to the PATH environment variable @type str @@ -221,6 +228,7 @@ "variant": venvVariant, "is_global": isGlobal, "is_conda": isConda, + "is_remote": isRemote, "exec_path": execPath, } @@ -230,7 +238,8 @@ self.__virtualenvManagerDialog.refresh() def setVirtualEnv(self, venvName, venvDirectory, venvInterpreter, - venvVariant, isGlobal, isConda, execPath): + venvVariant, isGlobal, isConda, isRemote, + execPath): """ Public method to change a virtual environment. @@ -246,6 +255,8 @@ @type bool @param isConda flag indicating an Anaconda virtual environment @type bool + @param isRemote flag indicating a remotely accessed environment + @type bool @param execPath search path string to be prepended to the PATH environment variable @type str @@ -266,6 +277,7 @@ "variant": venvVariant, "is_global": isGlobal, "is_conda": isConda, + "is_remote": isRemote, "exec_path": execPath, } @@ -276,7 +288,7 @@ def renameVirtualEnv(self, oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, - execPath): + isRemote, execPath): """ Public method to substitute a virtual environment entry with a new name. @@ -295,6 +307,8 @@ @type bool @param isConda flag indicating an Anaconda virtual environment @type bool + @param isRemote flag indicating a remotely accessed environment + @type bool @param execPath search path string to be prepended to the PATH environment variable @type str @@ -311,7 +325,8 @@ del self.__virtualEnvironments[oldVenvName] self.addVirtualEnv(venvName, venvDirectory, venvInterpreter, - venvVariant, isGlobal, isConda, execPath) + venvVariant, isGlobal, isConda, isRemote, + execPath) def deleteVirtualEnvs(self, venvNames): """ @@ -371,6 +386,7 @@ ok = True ok &= bool(self.__virtualEnvironments[venvName]["path"]) ok &= not self.__virtualEnvironments[venvName]["is_global"] + ok &= not self.__virtualEnvironments[venvName]["is_remote"] ok &= os.access(self.__virtualEnvironments[venvName]["path"], os.W_OK) @@ -541,6 +557,21 @@ else: return False + def isRemoteEnvironment(self, venvName): + """ + Public method to test, if a given environment is a remotely accessed + environment. + + @param venvName logical name of the virtual environment + @type str + @return flag indicating a remotely accessed environment + @rtype bool + """ + if venvName in self.__virtualEnvironments: + return self.__virtualEnvironments[venvName]["is_remote"] + else: + return False + def getVirtualenvExecPath(self, venvName): """ Public method to get the search path prefix of a virtual environment.
--- a/VirtualEnv/VirtualenvManagerDialog.py Wed Feb 13 20:39:03 2019 +0100 +++ b/VirtualEnv/VirtualenvManagerDialog.py Wed Feb 13 20:39:58 2019 +0100 @@ -24,7 +24,8 @@ PythonVariantRole = Qt.UserRole IsGlobalRole = Qt.UserRole + 1 IsCondaRole = Qt.UserRole + 2 - ExecPathRole = Qt.UserRole + 3 + IsRemoteRole = Qt.UserRole + 3 + ExecPathRole = Qt.UserRole + 4 def __init__(self, manager, parent=None): """ @@ -56,29 +57,31 @@ for itm in self.venvList.selectedItems(): if itm.text(0) != "<default>" and \ bool(itm.text(1)) and \ - not itm.data(0, VirtualenvManagerDialog.IsGlobalRole): + not itm.data(0, VirtualenvManagerDialog.IsGlobalRole) and \ + not itm.data(0, VirtualenvManagerDialog.IsRemoteRole): deletableSelectedItemCount += 1 deletableItemCount = 0 for index in range(topLevelItemCount): itm = self.venvList.topLevelItem(index) - if itm.text(0) != "<default>" and bool(itm.text(1)): + if itm.text(0) != "<default>" and bool(itm.text(1)) and \ + not itm.data(0, VirtualenvManagerDialog.IsRemoteRole): deletableItemCount += 1 - canBeDeleted = ( + canBeRemoved = ( selectedItemsCount == 1 and self.venvList.selectedItems()[0].text(0) != "<default>" ) - canAllBeDeleted = ( + canAllBeRemoved = ( topLevelItemCount == 1 and self.venvList.topLevelItem(0).text(0) != "<default>" ) self.editButton.setEnabled(selectedItemsCount == 1) - self.removeButton.setEnabled(selectedItemsCount > 1 or canBeDeleted) + self.removeButton.setEnabled(selectedItemsCount > 1 or canBeRemoved) self.removeAllButton.setEnabled( - topLevelItemCount > 1 or canAllBeDeleted) + topLevelItemCount > 1 or canAllBeRemoved) self.deleteButton.setEnabled(deletableSelectedItemCount) self.deleteAllButton.setEnabled(deletableItemCount) @@ -92,11 +95,11 @@ dlg = VirtualenvAddEditDialog(self.__manager) if dlg.exec_() == QDialog.Accepted: (venvName, venvDirectory, venvInterpreter, venvVariant, - isGlobal, isConda, execPath) = dlg.getData() + isGlobal, isConda, isRemote, execPath) = dlg.getData() - self.__manager.addVirtualEnv(venvName, venvDirectory, - venvInterpreter, venvVariant, - isGlobal, isConda, execPath) + self.__manager.addVirtualEnv( + venvName, venvDirectory, venvInterpreter, venvVariant, + isGlobal, isConda, isRemote, execPath) @pyqtSlot() def on_newButton_clicked(self): @@ -120,19 +123,20 @@ selectedItem.data(0, VirtualenvManagerDialog.PythonVariantRole), selectedItem.data(0, VirtualenvManagerDialog.IsGlobalRole), selectedItem.data(0, VirtualenvManagerDialog.IsCondaRole), + selectedItem.data(0, VirtualenvManagerDialog.IsRemoteRole), selectedItem.data(0, VirtualenvManagerDialog.ExecPathRole), ) if dlg.exec_() == QDialog.Accepted: (venvName, venvDirectory, venvInterpreter, venvVariant, - isGlobal, isConda, execPath) = dlg.getData() + isGlobal, isConda, isRemote, execPath) = dlg.getData() if venvName != oldVenvName: self.__manager.renameVirtualEnv( oldVenvName, venvName, venvDirectory, venvInterpreter, - venvVariant, isGlobal, isConda, execPath) + venvVariant, isGlobal, isConda, isRemote, execPath) else: self.__manager.setVirtualEnv( venvName, venvDirectory, venvInterpreter, venvVariant, - isGlobal, isConda, execPath) + isGlobal, isConda, isRemote, execPath) @pyqtSlot() def on_removeButton_clicked(self): @@ -232,22 +236,33 @@ environments[venvName]["is_global"]) itm.setData(0, VirtualenvManagerDialog.IsCondaRole, environments[venvName]["is_conda"]) + itm.setData(0, VirtualenvManagerDialog.IsRemoteRole, + environments[venvName]["is_remote"]) itm.setData(0, VirtualenvManagerDialog.ExecPathRole, environments[venvName]["exec_path"]) - # show global environments with bold font - if environments[venvName]["is_global"]: + # show remote environments with underlined font + if environments[venvName]["is_remote"]: font = itm.font(0) - font.setBold(True) + font.setUnderline(True) for column in range(itm.columnCount()): itm.setFont(column, font) - - # show Anaconda environments with italic font - if environments[venvName]["is_conda"]: - font = itm.font(0) - font.setItalic(True) - for column in range(itm.columnCount()): - itm.setFont(column, font) + else: + # local environments + + # show global environments with bold font + if environments[venvName]["is_global"]: + font = itm.font(0) + font.setBold(True) + for column in range(itm.columnCount()): + itm.setFont(column, font) + + # show Anaconda environments with italic font + if environments[venvName]["is_conda"]: + font = itm.font(0) + font.setItalic(True) + for column in range(itm.columnCount()): + itm.setFont(column, font) self.__resizeSections()
--- a/WebBrowser/Download/DownloadManager.py Wed Feb 13 20:39:03 2019 +0100 +++ b/WebBrowser/Download/DownloadManager.py Wed Feb 13 20:39:58 2019 +0100 @@ -197,7 +197,7 @@ if not page.url().isEmpty() and \ page.url().host() == url.host(): - return True + return True requestedUrl = page.requestedUrl() if requestedUrl.isEmpty():
--- a/WebBrowser/Network/NetworkManager.py Wed Feb 13 20:39:03 2019 +0100 +++ b/WebBrowser/Network/NetworkManager.py Wed Feb 13 20:39:58 2019 +0100 @@ -29,6 +29,7 @@ from .NetworkUrlInterceptor import NetworkUrlInterceptor from ..Tools.WebBrowserTools import readAllFileContents, pixmapToDataUrl +from Globals import qVersionTuple from Utilities.AutoSaver import AutoSaver import Preferences @@ -78,12 +79,24 @@ self.authenticationRequired.connect( lambda reply, auth: self.authentication(reply.url(), auth)) + if qVersionTuple() >= (5, 12, 0): + from PyQt5.QtWebEngineCore import QWebEngineUrlScheme + scheme = QWebEngineUrlScheme(b"eric") + scheme.setSyntax(QWebEngineUrlScheme.Syntax.Path) + scheme.setFlags(QWebEngineUrlScheme.SecureScheme) + QWebEngineUrlScheme.registerScheme(scheme) from .EricSchemeHandler import EricSchemeHandler self.__ericSchemeHandler = EricSchemeHandler() WebBrowserWindow.webProfile().installUrlSchemeHandler( QByteArray(b"eric"), self.__ericSchemeHandler) if engine: + if qVersionTuple() >= (5, 12, 0): + from PyQt5.QtWebEngineCore import QWebEngineUrlScheme + scheme = QWebEngineUrlScheme(b"qthelp") + scheme.setSyntax(QWebEngineUrlScheme.Syntax.Path) + scheme.setFlags(QWebEngineUrlScheme.SecureScheme) + QWebEngineUrlScheme.registerScheme(scheme) from .QtHelpSchemeHandler import QtHelpSchemeHandler self.__qtHelpSchemeHandler = QtHelpSchemeHandler(engine) WebBrowserWindow.webProfile().installUrlSchemeHandler( @@ -132,6 +145,9 @@ self.__loaded = False self.__temporarilyIgnoredSslErrors = {} self.__permanentlyIgnoredSslErrors = {} + + # set proxy factory to None to avoid crashes + QNetworkProxyFactory.setApplicationProxyFactory(None) def showSslErrorExceptionsDialog(self): """
--- a/changelog Wed Feb 13 20:39:03 2019 +0100 +++ b/changelog Wed Feb 13 20:39:58 2019 +0100 @@ -2,11 +2,16 @@ ---------- Version 19.03: - bug fixes +- VirtualEnv Manager + -- extended the environment definition by a flag indicating a remotely + accessed environment - Web Browser (NG): -- added a site info widget that is show when the site icon in the URL entry is clicked -- added code to register custom protocol handlers (upon request of the user via the site info widget) +- Third Party packages + -- updated pycodestyle to 2.5.0 Version 19.02: - bug fixes
--- a/i18n/eric6_cs.ts Wed Feb 13 20:39:03 2019 +0100 +++ b/i18n/eric6_cs.ts Wed Feb 13 20:39:58 2019 +0100 @@ -465,13 +465,6 @@ <p>Toto dialogové okno slouží k přidání adresáře do aktuálního projektu</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="108"/> - <source><b>Target Directory</b> -<p>Select the target directory via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Cílový adresář</b> -<p>Výběr cílového adresáře přes dialogové okno výběru adresáře.</p></translation> - </message> - <message> <location filename="../Project/AddDirectoryDialog.ui" line="74"/> <source>&Target Directory:</source> <translation>&Cílový adresář:</translation> @@ -482,16 +475,6 @@ <translation>Vložte jméno adresáře, který se má přidat</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="48"/> - <source><b>Source Directory</b> -<p>Enter the name of the directory to add to the current project. - You may select it with a dialog by pressing the button to - the right.</p></source> - <translation type="obsolete"><b>Zdrojový adresář</b> -<p>Vložte jméno adresáře, krerý se má přidat do aktuálního projektu -Stisknutím pravého tlačítka jej můžete vybrat pomocí dialogového okna.</p></translation> - </message> - <message> <location filename="../Project/AddDirectoryDialog.ui" line="105"/> <source>Select, whether a recursive add should be performed</source> <translation>Vybrat, jestliže přidávání bude rekurzivní</translation> @@ -516,13 +499,6 @@ jej můžete vybrat v dialogovém okně.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="100"/> - <source><b>Source Directory</b> -<p>Select the source directory via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Zdrojový adresář</b> -<p>Výběr zdrojového adresáře přes dialogové okno.</p></translation> - </message> - <message> <location filename="../Project/AddDirectoryDialog.ui" line="43"/> <source>&Source Directory:</source> <translation>Zdrojový adre&sář:</translation> @@ -533,11 +509,6 @@ <translation>&Typ souboru:</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.py" line="116"/> - <source>Select directory</source> - <translation type="obsolete">Výběr adresáře</translation> - </message> - <message> <location filename="../Project/AddDirectoryDialog.py" line="69"/> <source>Source Files</source> <translation>Zdrojové soubory</translation> @@ -590,13 +561,6 @@ <p>Tento dialog slouží k přidání souborů do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="74"/> - <source><b>Source Files</b> -<p>Select the source files via a files selection dialog.</p></source> - <translation type="obsolete"><b>Zdrojové soubory</b> -<p>Výběr zdrojových souborů přes dialogové okno výběru souborů.</p></translation> - </message> - <message> <location filename="../Project/AddFileDialog.ui" line="61"/> <source>&Target Directory:</source> <translation>&Cílový adresář:</translation> @@ -614,32 +578,11 @@ <translation><b>Cílový adresář</b><p>Zadejte cílový adresář. Stisknutím pravého tlačítka jej můžete vybrat v dialogovém okně.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="82"/> - <source><b>Target Directory</b> -<p>Select the target directory via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Cílový adresář</b> -<p>Výběr cílového adresáře přes dialog výběru adresáře.</p></translation> - </message> - <message> <location filename="../Project/AddFileDialog.ui" line="29"/> <source>&Source Files:</source> <translation>&Zdrojové soubory:</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="61"/> - <source>Enter the name of files to add separated by the path separator</source> - <translation type="obsolete">Zadejte jména souborů oddělená oddělovačem cesty</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.ui" line="64"/> - <source><b>Source Files</b> -<p>Enter the name of files to add to the current project separated -by the path separator. You may select them with a dialog by pressing -the button to the right.</p></source> - <translation type="obsolete"><b>Zdrojové soubory</b> -<p>Vložte jména souborů oddělená oddělovačem cesty, krerá se přidají do aktuálního projektu. Stisknutím pravého tlačítka je můžete vybrat pomocí dialogového okna.</p></translation> - </message> - <message> <location filename="../Project/AddFileDialog.ui" line="94"/> <source>Select, if the files should be added as sourcecode (overriding automatic detection)</source> <translation>Označte, jestliže soubory mají být přidány jako zdrojový kód (přepíše automatickou detekci)</translation> @@ -655,11 +598,6 @@ <translation></translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="73"/> - <source>Select target directory</source> - <translation type="obsolete">Výběr cílového adresáře</translation> - </message> - <message> <location filename="../Project/AddFileDialog.py" line="97"/> <source>Select Files</source> <translation>Výběr souborů</translation> @@ -1151,11 +1089,6 @@ <translation>Zadejte název souboru projektu</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> - <source>Select the project file via a file selection dialog</source> - <translation type="obsolete">Výběr projektu přes dialogové okno výběru souboru</translation> - </message> - <message> <location filename="../MultiProject/AddProjectDialog.ui" line="79"/> <source>Enter a short description for the project</source> <translation>Zadejte krátký popis projektu</translation> @@ -1709,11 +1642,6 @@ <translation></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="169"/> - <source>Select the file via a file selection dialog</source> - <translation type="obsolete">Vybrat soubor přes dialog výběru souborů</translation> - </message> - <message> <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="115"/> <source>Move down</source> <translation>Posunout dolů</translation> @@ -1785,13 +1713,6 @@ <translation>Vložte jméno souboru</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="172"/> - <source><b>File</b> -<p>Select the file to be bookmarked via a file selection dialog.</p></source> - <translation type="obsolete"><b>Soubor</b> -<p>Výběr souboru, který bude uložen do záložek, pomocí dialogu výběru souborů.</p></translation> - </message> - <message> <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="170"/> <source><b>File</b> <p>Enter the filename of the bookmarked file.</p></source> @@ -2035,26 +1956,6 @@ <translation>Otevřít vše v tabech</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>&Open</source> - <translation type="obsolete">&Otevřít</translation> - </message> - <message> - <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation type="obsolete">Otevřít nový &Tab<byte value="x9"/></translation> - </message> - <message> - <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="151"/> - <source>&Remove</source> - <translation type="obsolete">Odeb&rat</translation> - </message> - <message> - <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="156"/> - <source>&Properties...</source> - <translation type="obsolete">&Natavení...</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/> <source>Open</source> <translation type="unfinished">Otevřít</translation> @@ -2124,16 +2025,6 @@ <translation>Záložky</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>&Open</source> - <translation type="obsolete">&Otevřít</translation> - </message> - <message> - <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="99"/> - <source>&Remove</source> - <translation type="obsolete">Odeb&rat</translation> - </message> - <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="110"/> <source>Add &Bookmark...</source> <translation>Přidat &záložku...</translation> @@ -2144,16 +2035,6 @@ <translation>Přidat s&ložku...</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation type="obsolete">Otevřít nový &Tab<byte value="x9"/><byte value="x9"/></translation> - </message> - <message> - <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="104"/> - <source>&Properties...</source> - <translation type="obsolete">&Natavení...</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="87"/> <source>Open</source> <translation type="unfinished">Otevřít</translation> @@ -4417,11 +4298,6 @@ <translation>Zadejte jméno prvního souboru</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="82"/> - <source>Press to select the file via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr souboru přes dialogové okno</translation> - </message> - <message> <location filename="../UI/CompareDialog.ui" line="55"/> <source>File &2:</source> <translation>Soubor &2:</translation> @@ -4472,11 +4348,6 @@ <translation>Porovnat soubory</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="448"/> - <source>Select file to compare</source> - <translation type="obsolete">Výběr souboru pro porovnání</translation> - </message> - <message> <location filename="../UI/CompareDialog.ui" line="219"/> <source>Select, if the horizontal scrollbars should be synchronized</source> <translation>Vybrat, mají-li se vodorovné posuvníky pohybovat společně</translation> @@ -4613,11 +4484,6 @@ <translation>Debugger</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="206"/> - <source>Ruby</source> - <translation type="obsolete">Ruby</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="232"/> <source>Editor</source> <translation>Editor</translation> @@ -5474,11 +5340,6 @@ <source><b>Note:</b> Leave this entry empty to use the default value (omniidl or omniidl.exe).</source> <translation><b>Poznámka:</b> Ponechte tento vstup prázdný chcete-li použít defaultní hodnotu omniidl or omniidl.exe).</translation> </message> - <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> - <source>Select IDL compiler</source> - <translation type="obsolete">Vyberte IDL kompliátor</translation> - </message> </context> <context> <name>CreateDialogCodeDialog</name> @@ -5950,41 +5811,6 @@ <translation><b>Stop</b><p>Stop běhu aktuální debug relace.</p></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="2209"/> - <source>Evaluate</source> - <translation type="obsolete">Evaluate</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="434"/> - <source>E&valuate...</source> - <translation type="obsolete">V&yhodnotit...</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="438"/> - <source>Evaluate in current context</source> - <translation type="obsolete">Vyhodnotit aktuální kontext</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="2238"/> - <source>Execute</source> - <translation type="obsolete">Vykonat</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="448"/> - <source>E&xecute...</source> - <translation type="obsolete">Vykon&at...</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="452"/> - <source>Execute a one line statement in the current context</source> - <translation type="obsolete">Vykonat jednu řádku kódu v aktuálním kontextu</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="454"/> - <source><b>Execute</b><p>Execute a one line statement in the current context of the debugged program.</p></source> - <translation type="obsolete"><b>Execute</b><p>Vykonat jednu řádku kódu v aktuálním kontextu debugovaného programu.</p></translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="452"/> <source>Variables Type Filter</source> <translation>Filtr typů proměnných</translation> @@ -6173,26 +5999,11 @@ <translation>V aktuálním projektu není definován hlavní skript. Debugování není možné.</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="2209"/> - <source>Enter the statement to evaluate</source> - <translation type="obsolete">Zadejte příkaz pro vyhodnocení</translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="2238"/> - <source>Enter the statement to execute</source> - <translation type="obsolete">Zadejte příkaz pro vykonání</translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="323"/> <source>Stop the running script.</source> <translation>Zastavit běžící skript.</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="439"/> - <source><b>Evaluate</b><p>Evaluate an expression in the current context of the debugged program. The result is displayed in the shell window.</p></source> - <translation type="obsolete"><b>Vyhodnotit</b><p>Vyhodnotit výraz aktuálního kontextu debugovaného programu. Výsledek je zobrazen v shell okně.</p></translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="1368"/> <source>Watch Expression Error</source> <translation>Chyba sledovacího bodu</translation> @@ -6235,16 +6046,6 @@ <translation></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1036"/> - <source><p>The program has terminated with an exit status of {0}.</p></source> - <translation type="obsolete"><p>Program byl ukončen s exit statusem {0}.</p></translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="1041"/> - <source><p><b>{0}</b> has terminated with an exit status of {1}.</p></source> - <translation type="obsolete"><p><b>{0}</b> byl ukončen s exit statusem {1}.</p></translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="1117"/> <source><p>The file <b>{0}</b> contains the syntax error <b>{1}</b> at line <b>{2}</b>, character <b>{3}</b>.</p></source> <translation><p>Soubor <b>{0}</b> na řádce <b>{1}</b>, písmeno <b>{2}</b>, obsahuje syntaktickou chybu <b>{3}</b>.</p></translation> @@ -6562,31 +6363,6 @@ <translation>Vzdálený host:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="321"/> - <source>Enable remote debugging</source> - <translation type="obsolete">Zapnout vzdálené debuggování</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="324"/> - <source>This enables the remote debugger. Please enter the hostname of the remote machine and the command for the remote execution (e.g. ssh) below.</source> - <translation type="obsolete">Zapne se vzdálený debugger. Prosím, zadejte jméno hosta vzáleného stroje a příkaz pro vzdálené provedení (např. ssh).</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="327"/> - <source>Remote Debugging Enabled</source> - <translation type="obsolete">Vzdálené debuggování zapnuto</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="337"/> - <source>Path Translation</source> - <translation type="obsolete">Cesta překladu</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="343"/> - <source>Select to perform path translation</source> - <translation type="obsolete">Výběr pro vykonání překladu cesty</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="318"/> <source>Perform Path Translation</source> <translation>Vykonat překlad cesty</translation> @@ -6633,21 +6409,6 @@ <translation>Příkaz konzole:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="420"/> - <source>Select to start the debugger in a console window (e.g. xterm)</source> - <translation type="obsolete">Vyberte pro spuštění debuggeru v okně konzole (např. xterm)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="423"/> - <source>Start debugger in console window</source> - <translation type="obsolete">Spustit debugger v okně konzole</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="433"/> - <source>Environment for Debug Client</source> - <translation type="obsolete">Prostředí debug klienta</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="400"/> <source>Select, if the environment should be replaced.</source> <translation>Vyberte, jestliže prostředí bude nahrazeno.</translation> @@ -6660,28 +6421,11 @@ <p>Je-li tento přepínač zatržen, prostředí debuggeru bude nahrazeno zadanými hodnotami v poli prostředí. Je-li nezatržen, prostředí bude ponecháno vlastní nastavení.</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="446"/> - <source>Replace Environment</source> - <translation type="obsolete">Nahradit prostředí</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="453"/> - <source>Environment:</source> - <translation type="obsolete">Prostředí:</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="421"/> <source>Enter the environment variables to be set.</source> <translation>Zadání proměnných prostředí.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="463"/> - <source><b>Environment</b> -<p>Enter the environment variables to be set for the debugger. The individual settings must be separate by whitespace and be given in the form 'var=value'.</p> -<p>Example: var1=1 var2="hello world"</p></source> - <translation type="obsolete"><b>Prostředí</b><p>Zadání proměnných prostředí, které debuger použije. Jednotlivá nastavení musí být oddělena prázdnými znaky a být ve formátu 'var=value'.</p><p>Příklad: var1=1 var2="hello world"</p></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="461"/> <source>Select, whether a reset of the debug client should be performed after a client exit</source> <translation>Zatrhnout, jestli po ukončení klienta bude vykonán reset debugovaného klienta</translation> @@ -6892,47 +6636,42 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source>Start Debugger</source> <translation type="unfinished">Spustit debuger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="960"/> <source>Parent Process</source> <translation type="unfinished">Rodičovský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="961"/> <source>Child process</source> <translation type="unfinished">Dětský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Client forking</source> <translation type="unfinished">Větvení klienta</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Select the fork branch to follow.</source> <translation type="unfinished">Pokračovat ve fork větvi.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="147"/> - <source><p>No Python2 interpreter configured.</p></source> - <translation type="obsolete"><p>Python2 interpreter není nakonfigurován.</p></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"><p>Debugovací backend nelze spustit.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source>Debug Protocol Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished"></translation> </message> @@ -6943,95 +6682,6 @@ </message> </context> <context> - <name>DebuggerInterfacePython2</name> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> - <source>Start Debugger</source> - <translation type="obsolete">Spustit debuger</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="143"/> - <source><p>No Python2 interpreter configured.</p></source> - <translation type="obsolete"><p>Python2 interpreter není nakonfigurován.</p></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> - <source><p>The debugger backend could not be started.</p></source> - <translation type="obsolete"><p>Debugovací backend nelze spustit.</p></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="822"/> - <source>Parent Process</source> - <translation type="obsolete">Rodičovský proces</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="823"/> - <source>Child process</source> - <translation type="obsolete">Dětský proces</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="824"/> - <source>Client forking</source> - <translation type="obsolete">Větvení klienta</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="824"/> - <source>Select the fork branch to follow.</source> - <translation type="obsolete">Pokračovat ve fork větvi.</translation> - </message> -</context> -<context> - <name>DebuggerInterfacePython3</name> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> - <source>Start Debugger</source> - <translation type="obsolete">Spustit debuger</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> - <source><p>The debugger backend could not be started.</p></source> - <translation type="obsolete"><p>Debugovací backend nelze spustit.</p></translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="822"/> - <source>Parent Process</source> - <translation type="obsolete">Rodičovský proces</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="823"/> - <source>Child process</source> - <translation type="obsolete">Dětský proces</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="824"/> - <source>Client forking</source> - <translation type="obsolete">Větvení klienta</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="824"/> - <source>Select the fork branch to follow.</source> - <translation type="obsolete">Pokračovat ve fork větvi.</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="143"/> - <source><p>No Python3 interpreter configured.</p></source> - <translation type="obsolete"><p>Python2 interpreter není nakonfigurován.</p> {3 ?}</translation> - </message> -</context> -<context> - <name>DebuggerInterfaceRuby</name> - <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> - <source>Start Debugger</source> - <translation type="obsolete">Spustit debuger</translation> - </message> - <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> - <source><p>The debugger backend could not be started.</p></source> - <translation type="obsolete"><p>Debugovací backend nelze spustit.</p></translation> - </message> -</context> -<context> <name>DebuggerPropertiesDialog</name> <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="14"/> @@ -7049,58 +6699,16 @@ <translation>Zadání cesty ke klinetu debugeru. Ponechte prázdné chcete-li použít default.</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="36"/> - <source>Press to select the Debug Client via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr klienta debugeru přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="49"/> - <source>Interpreter for Debug Client</source> - <translation type="obsolete">Interpret pro klienta debugeru</translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="58"/> - <source>Enter the path of the interpreter to be used by the debug client.</source> - <translation type="obsolete">Zadání cesty k interpretru použitého v klient debugeru.</translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="59"/> - <source>Press to select the interpreter via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr interpretru přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="71"/> - <source>Environment for Debug Client</source> - <translation type="obsolete">Prostředí klienta debugeru</translation> - </message> - <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="204"/> <source>Select, if the environment of the debug client should be replaced</source> <translation>Zatrhněte, jestliže prostředí klienta debugeru má být nahrazeno</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="80"/> - <source>Replace Environment</source> - <translation type="obsolete">Nahradit prostředí</translation> - </message> - <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="214"/> <source>Enter the environment variables to be set.</source> <translation>Zadání proměnných prostředí, které mají být nastaveny.</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="90"/> - <source><b>Environment</b> -<p>Enter the environment variables to be set for the debugger. The individual settings must be separate by whitespace and be given in the form 'var=value'.</p> -<p>Example: var1=1 var2="hello world"</p></source> - <translation type="obsolete"><b>Prostředí</b><p>Zadání proměnných prostředím které debuger použije. Jednotlivá nastavení musí být oddělena bílými znaky a být ve formátu 'var=value'.</p><p>Příklad: var1=1 var2="hello world"</p></translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="99"/> - <source>Environment:</source> - <translation type="obsolete">Prostředí:</translation> - </message> - <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="71"/> <source>Select, if the debugger should be run remotely</source> <translation>Vyberte, má-li debuger běžet vzdáleně</translation> @@ -7214,21 +6822,11 @@ <translation>Nenastavovat kódování debug klienta</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="119"/> - <source>Select interpreter for Debug Client</source> - <translation type="obsolete">Výběr interpretru pro Debug klienta</translation> - </message> - <message> <location filename="../Project/DebuggerPropertiesDialog.py" line="136"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="136"/> - <source>Select Debug Client</source> - <translation type="obsolete">Výběr Debug klienta</translation> - </message> - <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="236"/> <source>Select to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> <translation type="unfinished">Vyberte pro přesměrování stdin, stdout, a stderr programu, který je debugován v eric5 IDE {6 ?}</translation> @@ -7316,12 +6914,12 @@ <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="92"/> <source>Select the custom selected debug client</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Zapnout vybraného obvyklého debug klienta</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="95"/> <source>Custom</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Obvyklý</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="105"/> @@ -7387,11 +6985,6 @@ <translation type="unfinished">Python3 interpret pro Debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="33"/> - <source>Press to select the Python3 interpreter via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr Python3 interpretru přes dialog výběru souborů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="63"/> <source>Debug Client Type</source> <translation>Typ Debug klienta</translation> @@ -7427,21 +7020,11 @@ <translation>Obvyklý</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="75"/> - <source>Multi Threaded</source> - <translation type="obsolete">Multi Threadový</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="105"/> <source>Source association</source> <translation>Asociace zdroje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="101"/> - <source>Enter the file extensions to be associated with the Python3 debugger separated by a space. They must not overlap with the ones for Python2.</source> - <translation type="obsolete">Zadejte extenze (oddělené mezerou) pro asociaci s Python3 debugerem. Pozor! Musí být jiné, než ty pro Python2. </translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="174"/> <source>Redirect stdin/stdout/stderr</source> <translation>Přesměrování stdin/stdout/stderr</translation> @@ -7457,16 +7040,6 @@ <translation>Nenastavovat kódování debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="94"/> - <source>Select Python interpreter for Debug Client</source> - <translation type="obsolete">Výběr interpretru pro Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="109"/> - <source>Select Debug Client</source> - <translation type="obsolete">Výběr Debug klienta</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="47"/> <source>Python Files (*.py *.py3)</source> <translation>Python soubory (*.py *.py3)</translation> @@ -7503,147 +7076,6 @@ </message> </context> <context> - <name>DebuggerPythonPage</name> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="17"/> - <source><b>Configure Python2 Debugger</b></source> - <translation type="obsolete"><b>Konfigurace Python debugeru</b></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="37"/> - <source>Python2 Virtual Environment</source> - <translation type="obsolete">Python interpret pro Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="33"/> - <source>Press to select the Python interpreter via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr Python interpretru přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="53"/> - <source>Debug Client Type</source> - <translation type="obsolete">Typ Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="65"/> - <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> - <translation type="obsolete">Zadání cesty k Debug klinetovi, který se má použít. Ponechte prázdné chcete-li použít default.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="42"/> - <source>Press to select the Debug Client via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr klienta debugeru přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="72"/> - <source>Select the standard debug client</source> - <translation type="obsolete">Výběr multi threadového debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> - <source>Standard</source> - <translation type="obsolete">Standard</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="82"/> - <source>Select the custom selected debug client</source> - <translation type="obsolete">Zapnout vybraného běžného debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="85"/> - <source>Custom</source> - <translation type="obsolete">Běžný</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> - <source>Multi Threaded</source> - <translation type="obsolete">Multi Threadový</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="120"/> - <source>Redirect stdin/stdout/stderr</source> - <translation type="obsolete">Přesměrování stdin/stdout/stderr</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="127"/> - <source>Select to not set the debug client encoding</source> - <translation type="obsolete">Nenastavovat kódování debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/> - <source>Don't set the encoding of the debug client</source> - <translation type="obsolete">Nenastavovat kódování debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="94"/> - <source>Select Python interpreter for Debug Client</source> - <translation type="obsolete">Výběr interpretru pro Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="109"/> - <source>Select Debug Client</source> - <translation type="obsolete">Výběr Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="95"/> - <source>Source association</source> - <translation type="obsolete">Asociace zdroje</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="101"/> - <source>Enter the file extensions to be associated with the Python2 debugger separated by a space. They must not overlap with the ones for Python3.</source> - <translation type="obsolete">Zadejte extenze (oddělené mezerou) pro asociaci s Python2 debugerem. Pozor! Musí být jiné, než ty pro Python3. </translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="44"/> - <source>Python Files (*.py *.py2)</source> - <translation type="obsolete">Python soubory (*.py *.py3) {2)?}</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="117"/> - <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> - <translation type="obsolete">Vyberte pro přesměrování stdin, stdout, a stderr programu, který je debugován v eric5 IDE {6 ?}</translation> - </message> -</context> -<context> - <name>DebuggerRubyPage</name> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="17"/> - <source><b>Configure Ruby Debugger</b></source> - <translation type="obsolete"><b>Konfigurace Ruby debuger</b></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="37"/> - <source>Ruby Interpreter for Debug Client</source> - <translation type="obsolete">Ruby interpret pro Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="43"/> - <source>Enter the path of the Ruby interpreter to be used by the debug client.</source> - <translation type="obsolete">Zadání cesty na Ruby interpret, který bude použit debug klientem.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="50"/> - <source>Press to select the Ruby interpreter via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr Ruby interpretru přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="63"/> - <source>Redirect stdin/stdout/stderr</source> - <translation type="obsolete">Přesměrování stdin/stdout/stderr</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.py" line="64"/> - <source>Select Ruby interpreter for Debug Client</source> - <translation type="obsolete">Výběr Ruby interpretru pro Debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="60"/> - <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> - <translation type="obsolete">Vyberte pro přesměrování stdin, stdout, a stderr programu, který je debugován v eric5 IDE {6 ?}</translation> - </message> -</context> -<context> <name>DeepLEngine</name> <message> <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py" line="78"/> @@ -7805,11 +7237,6 @@ <translation>Zadání jména prvního souboru</translation> </message> <message> - <location filename="../UI/DiffDialog.ui" line="67"/> - <source>Press to select the file via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr souboru přes dialog výběru souborů</translation> - </message> - <message> <location filename="../UI/DiffDialog.ui" line="52"/> <source>File &2:</source> <translation>Soubor &2:</translation> @@ -7890,11 +7317,6 @@ <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="467"/> - <source>Select file to compare</source> - <translation type="obsolete">Výběr souboru pro porovnání</translation> - </message> - <message> <location filename="../UI/DiffDialog.py" line="324"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> @@ -9015,24 +8437,6 @@ </message> </context> <context> - <name>E5ErrorMessage</name> - <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="153"/> - <source>Warning</source> - <translation type="obsolete">Varování</translation> - </message> - <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="156"/> - <source>Critical</source> - <translation type="obsolete">Kritický</translation> - </message> - <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="159"/> - <source>Fatal Error</source> - <translation type="obsolete">Závažná chyba</translation> - </message> -</context> -<context> <name>E5ErrorMessageFilterDialog</name> <message> <location filename="../E5Gui/E5ErrorMessageFilterDialog.ui" line="14"/> @@ -9040,16 +8444,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessageFilterDialog.ui" line="80"/> - <source>&Add...</source> - <translation type="obsolete">Přid&at...</translation> - </message> - <message> - <location filename="../E5Gui/E5ErrorMessageFilterDialog.ui" line="100"/> - <source>&Remove</source> - <translation type="obsolete">Odeb&rat</translation> - </message> - <message> <location filename="../E5Gui/E5ErrorMessageFilterDialog.py" line="39"/> <source><b>Error Message Filters</b><p>This list shows the configured message filters used to suppress error messages from within Qt.</p></source> <translation type="unfinished"></translation> @@ -10179,11 +9573,6 @@ <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation> </message> <message> - <location filename="../E5Gui/E5TextEditSearchWidget.py" line="140"/> - <source>Find</source> - <translation type="obsolete">Hledat</translation> - </message> - <message> <location filename="../E5Gui/E5TextEditSearchWidget.py" line="362"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> @@ -10419,11 +9808,6 @@ <translation>Zadání čísla řádky breakpointu</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="165"/> - <source>Press to open a file selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru souborů</translation> - </message> - <message> <location filename="../Debugger/EditBreakpointDialog.ui" line="46"/> <source>Linenumber:</source> <translation>Číslo řádky:</translation> @@ -10448,11 +9832,6 @@ <source>Add Breakpoint</source> <translation>Přidat breakpoint</translation> </message> - <message> - <location filename="../Debugger/EditBreakpointDialog.py" line="129"/> - <source>Select filename of the breakpoint</source> - <translation type="obsolete">Zadání jména souboru, ve kterém breakpoint bude</translation> - </message> </context> <context> <name>EditWatchpointDialog</name> @@ -10625,11 +10004,6 @@ <translation>Zapnout autosave</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="726"/> - <source>Autocompletion enabled</source> - <translation type="obsolete">Zapnout autodoplňování</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="867"/> <source>Close</source> <translation>Zavřít</translation> @@ -10650,11 +10024,6 @@ <translation>Tisk</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="797"/> - <source>Autocomplete</source> - <translation type="obsolete">Autodoplňování</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="921"/> <source>Complete from Document</source> <translation type="unfinished">z dokumentu</translation> @@ -10830,16 +10199,6 @@ <translation>Předchozí úloha</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1364"/> - <source>LMB toggles bookmarks</source> - <translation type="obsolete">LMB přepínač záložek</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1368"/> - <source>LMB toggles breakpoints</source> - <translation type="obsolete">LMB přepínač breakpointů</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1816"/> <source>Modification of Read Only file</source> <translation>Modifikace souboru otevřeného jen pro čtení</translation> @@ -11100,11 +10459,6 @@ <translation>Zahrnout importy z externích modulů?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> - <source>dynamic</source> - <translation type="obsolete">dynamický</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="843"/> <source>Calltip</source> <translation>Rychlé tipy</translation> @@ -11543,11 +10897,6 @@ <translation>Seznam API souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="116"/> - <source>Enter a file to be added</source> - <translation type="obsolete">Zadejte soubor, který bude přidán</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="39"/> <source>Press to select an API file via a selection dialog</source> <translation>Stiskněte pro výběr API souboru pomocí dialogového okna</translation> @@ -11558,11 +10907,6 @@ <translation>Smazat</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="142"/> - <source>Select API file</source> - <translation type="obsolete">Výběr API souboru</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="41"/> <source>API File (*.api);;All Files (*)</source> <translation>API soubor (*.api);;Všechny soubory (*)</translation> @@ -11799,11 +11143,6 @@ <context> <name>EditorAutocompletionQScintillaPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui" line="16"/> - <source><b>Configure QScintilla Autocompletion</b></source> - <translation type="obsolete"><b>Konfigurace QScintilla autodolpňování</b></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui" line="37"/> <source>Select this, if single entries shall be inserted automatically</source> <translation>Vybrat toto, jestliže jednotlivé vstupy budou vkládány automaticky</translation> @@ -13936,31 +13275,11 @@ <translation>Soubor s vlastním seznamerm slov:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="237"/> - <source>Enter the filename of the personal word list</source> - <translation type="obsolete">Zadejte jméno souboru s vlasním seznamem slov</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="272"/> - <source>Select the personal word list file via a file selection dialog</source> - <translation type="obsolete">Výběr souboru s vlasním seznamem slov přes dialog výběru</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="250"/> <source>Personal exclude list file:</source> <translation>Soubor s vlastním seznamem vyřazených:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="251"/> - <source>Enter the filename of the personal exclude list</source> - <translation type="obsolete">Zadejte název souboru s vlastním seznamem vyřazených</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="279"/> - <source>Select the personal exclude list file via a file selection dialog</source> - <translation type="obsolete">Výběr souboru s vlastním seznamem vyřazených před dialog</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="270"/> <source><b>Note:</b> leave these entries empty to use the default</source> <translation><b>Poznámka:</b> pro použití výchozí hodnoty ponechte prázdné</translation> @@ -13991,16 +13310,6 @@ <translation>Zadejte počet řádek, které se budou kontrolovat najednou. Vyšší hodnota zvyšuje rychlost kontroly ale snižuje GUI plynulost</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="115"/> - <source>Select personal word list</source> - <translation type="obsolete">Výběr vlasního seznamu slov</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="129"/> - <source>Select personal exclude list</source> - <translation type="obsolete">Výběr vlasního seznamu vyřazených</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="38"/> <source>Dictionary File (*.dic);;All Files (*)</source> <translation>Soubor slovníku (*.dic);;Všechny soubory (*)</translation> @@ -14464,16 +13773,6 @@ <translation>Vybrat barvu pozadí pro okraj se značkami skládání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="223"/> - <source>Select to show unified margins (like eric4 < 4.3.0)</source> - <translation type="obsolete">Vybrat zobrazení jednotných okrajů (jako eric4 < 4.3.0)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="226"/> - <source>Show unified margins</source> - <translation type="obsolete">Zobrazit jednotné okraje</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Debugging Line Markers</source> <translation type="unfinished">Značky debugované řádky</translation> @@ -15472,11 +14771,6 @@ <translation>Vybrat pro použití TLS</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> - <source>Use TLS</source> - <translation type="obsolete">Použít TLS</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> <source>Enter the port of the mail server</source> <translation>Zadejte port mail serveru</translation> @@ -15487,11 +14781,6 @@ <translation>Odchozí mail server (SMTP):</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation type="obsolete">Odchozí mail server port:</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="294"/> <source>Press to test the login data</source> <translation type="unfinished"></translation> @@ -15811,11 +15100,6 @@ <translation>Zadejte jméno výstupního souboru</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="45"/> - <source>Press to open a file selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru souborů</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="25"/> <source>Output File:</source> <translation>Výstupní soubor:</translation> @@ -15876,31 +15160,16 @@ <translation>Odebrat</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="222"/> - <source>Press to open a directory selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru adresáře</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="184"/> <source>List of directory basenames to be ignored</source> <translation>Seznam jmen bázových adresářů, které budou ignorovány</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="197"/> - <source>Select output file</source> - <translation type="obsolete">Vybrat výstupní soubor</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="45"/> <source>API files (*.api);;All files (*)</source> <translation>API soubory (*.api);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="228"/> - <source>Select directory to exclude</source> - <translation type="obsolete">Vybrat adresář, který bude vyloučen</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="156"/> <source>Exclude Files:</source> <translation>Nevkládat soubory:</translation> @@ -16041,11 +15310,6 @@ <translation>Zadejte výstupní adresář</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="400"/> - <source>Press to open a directory selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru adresáře</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="390"/> <source>Output Directory:</source> <translation>Výstupní adresář:</translation> @@ -16136,11 +15400,6 @@ <translation>Zadejte jméno souboru s CSS styly. Ponechte prázdné pro použití barev definovaných níže.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="243"/> - <source>Press to open a file selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/> <source>Colours</source> <translation>Barvy</translation> @@ -16241,21 +15500,6 @@ <translation>Zde se zobrazuje příklad vybraných barev.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="305"/> - <source>Select output directory</source> - <translation type="obsolete">Výběr výstupního adresáře</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="330"/> - <source>Select directory to exclude</source> - <translation type="obsolete">Vybrat adresář, který bude vyloučen</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="370"/> - <source>Select CSS style sheet</source> - <translation type="obsolete">Vybrat CSS soubor</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="53"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Style sheet (*.css);;Všechny soubory (*)</translation> @@ -16336,11 +15580,6 @@ <translation>Zadejte krátký titulek pro vstup nahoře</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="519"/> - <source>Select output directory for QtHelp files</source> - <translation type="obsolete">Vybrat výstupní adresář pro soubory QtNápovědy</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="483"/> <source>Select to generate the QtHelp collection files</source> <translation>Vybrat pro generování kolekce souborů QtNápovědy</translation> @@ -16628,19 +15867,6 @@ </message> </context> <context> - <name>ExporterBase</name> - <message> - <location filename="../QScintilla/Exporters/ExporterBase.py" line="58"/> - <source>Export source</source> - <translation type="obsolete">Zdroj exportu</translation> - </message> - <message> - <location filename="../QScintilla/Exporters/ExporterBase.py" line="58"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="obsolete"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> - </message> -</context> -<context> <name>ExporterHTML</name> <message> <location filename="../QScintilla/Exporters/ExporterHTML.py" line="505"/> @@ -17621,11 +16847,6 @@ <translation>Zadejte adresář pro hledání</translation> </message> <message> - <location filename="../UI/FindFileDialog.ui" line="288"/> - <source>Select the directory via a directory selection dialog</source> - <translation type="obsolete">Výběr adresáře přes dialog výběru adresáře</translation> - </message> - <message> <location filename="../UI/FindFileDialog.ui" line="90"/> <source>Select to match case sensitive</source> <translation>Vybrat pro rozlišování velkých/malých znaků</translation> @@ -17676,11 +16897,6 @@ <translation>Hledat</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="553"/> - <source>Select directory</source> - <translation type="obsolete">Výběr adresáře</translation> - </message> - <message> <location filename="../UI/FindFileDialog.py" line="72"/> <source>Stop</source> <translation></translation> @@ -17878,11 +17094,6 @@ <translation>Zadejte adresář, kde se bude vyhledávat</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="86"/> - <source>Press to select the directory, the file should be searched in</source> - <translation type="obsolete">Stisknout pro výběr adresáře, ve kterém se budou soubory prohledávat</translation> - </message> - <message> <location filename="../UI/FindFileNameDialog.ui" line="99"/> <source>Select to search in the project path</source> <translation>Vybrat pro hledání v cestě projektu</translation> @@ -17937,11 +17148,6 @@ <source>Opens the selected file</source> <translation>Otevřít vybraný soubor</translation> </message> - <message> - <location filename="../UI/FindFileNameDialog.py" line="205"/> - <source>Select search directory</source> - <translation type="obsolete">Vybrat hledaný adresář</translation> - </message> </context> <context> <name>FirefoxImporter</name> @@ -18400,7 +17606,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1561"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -18580,432 +17786,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source>Create {0} file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <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="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <source>Git Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1430"/> <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="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <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="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <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="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source>Git Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <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="1678"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1681"/> <source>Fetching from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1719"/> <source>Pulling from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1760"/> <source>Pushing to a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1788"/> <source>Committing failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1815"/> <source>Aborting uncommitted/failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1848"/> <source>Applying patch</source> <translation type="unfinished"></translation> </message> <message> - <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="1880"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1883"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1965"/> <source>Tagging in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2196"/> <source>Branching in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2236"/> <source>Delete Remote Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <source>Current Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <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="2318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2321"/> <source>Create Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2286"/> <source>Git Bundle Files (*.bundle)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2303"/> <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="2348"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2351"/> <source>Verify Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2381"/> <source>List Bundle Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Apply Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2504"/> <source>Applying a bundle file (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2531"/> <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="2731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2734"/> <source>Git Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <source>Create Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2640"/> <source>Git Bisect Replay Files (*.replay)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2657"/> <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="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <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="2692"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2695"/> <source>Edit Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Bisect Replay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3074"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3098"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3156"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3186"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3211"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3237"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3317"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3428"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3442"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3476"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3466"/> <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="3488"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3491"/> <source>Creating branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <source>Delete Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <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="3533"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/> <source>Deleting stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Delete All Stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3564"/> <source>Deleting all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3636"/> <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="3659"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3662"/> <source>Verifying the integrity of the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3687"/> <source>Performing Repository Housekeeping</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3731"/> <source><tr><td><b>Statistics</b></td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> <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="3733"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> <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="3737"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> <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="3741"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> <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="3745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> <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="3749"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> <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="3753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <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="3757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3760"/> <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="3763"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3766"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3832"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3875"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <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="3960"/> - <source>Submodule Path</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <source>All</source> + <translation type="unfinished">Vše</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> + <source>Submodule Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4016"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4053"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4133"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4167"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4225"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -24490,12 +23696,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="103"/> <source>Select Submodule Repository Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="129"/> <source>Select Submodule Directory</source> <translation type="unfinished"></translation> </message> @@ -25563,16 +24769,6 @@ <translation>Zadejte jméno souboru uživatelských stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> - <source>Select the user style sheet via a file selection dialog</source> - <translation type="obsolete">Vybrat uživatelské styly přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.py" line="137"/> - <source>Select Style Sheet</source> - <translation type="obsolete">Vybrat sadu stylů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Barvy</translation> @@ -26130,11 +25326,6 @@ <translation>Qt4 dokumentace</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="126"/> - <source>Press to select the Qt4 documentation directory via a dialog</source> - <translation type="obsolete">Stisknout pro výběr Qt4 dokumentace přes dialog výběru</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="157"/> <source>Enter the Qt4 documentation directory</source> <translation>Zadejte adresář Qt4 dokumentace</translation> @@ -26165,11 +25356,6 @@ <translation>PySide dokumentace</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="258"/> - <source>Press to select the PySide documentation directory via a dialog</source> - <translation type="obsolete">Stisknout pro výběr adresáře PySide dokumentace přes dialog</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="297"/> <source>Enter the PySide documentation directory</source> <translation>Zadejte adresář pro PySide dokumentaci</translation> @@ -26185,16 +25371,6 @@ <translation>HTML soubory (*.html *.htm);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="145"/> - <source>Select Qt4 documentation entry</source> - <translation type="obsolete">Vyberte pro vstup do Qt4 dokumentace</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="201"/> - <source>Select PySide documentation entry</source> - <translation type="obsolete">Vyberte pro vstup do PySide dokumentace</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="42"/> <source>HTML Files (*.html *.htm);;Compressed Help Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> @@ -26235,11 +25411,6 @@ <translation type="unfinished">Qt4 dokumentace {5 ?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="159"/> - <source>Press to select the Qt5 documentation directory via a dialog</source> - <translation type="obsolete">Stisknout pro výběr Qt4 dokumentace přes dialog výběru {5 ?}</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="192"/> <source>Enter the Qt5 documentation directory</source> <translation type="unfinished">Zadejte adresář Qt4 dokumentace {5 ?}</translation> @@ -26250,21 +25421,11 @@ <translation type="unfinished"><b>Poznámka</b>: Ponechte prázdné má-li se použít proměnná prostředí QT4DOCDIR, je-li nastavena. {5D?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="159"/> - <source>Select Qt5 documentation entry</source> - <translation type="obsolete">Vyberte pro vstup do Qt4 dokumentace {5 ?}</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="247"/> <source>PyQt5 Documentation</source> <translation type="unfinished">PyQt4 dokumentace {5 ?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="225"/> - <source>Press to select the PyQt5 documentation directory via a dialog</source> - <translation type="obsolete">Stisknout pro výběr PyQt4 dokumentace přes dialog výběru {5 ?}</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="262"/> <source>Enter the PyQt5 documentation directory</source> <translation type="unfinished">Zadejte adresář PyQt4 dokumentace {5 ?}</translation> @@ -26275,11 +25436,6 @@ <translation type="unfinished"><b>Poznámka</b>: Ponechte prázdné má-li se použít proměnná prostředí PYQT4DOCDIR, je-li nastavena. {5D?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="187"/> - <source>Select PyQt5 documentation entry</source> - <translation type="obsolete">Vyberte pro vstup do PyQt4 dokumentace {5 ?}</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="37"/> <source>eric API Documentation</source> <translation type="unfinished"></translation> @@ -26434,21 +25590,11 @@ <translation type="unfinished">Zadejte jméno souboru se styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.ui" line="67"/> - <source>Select the style sheet file via a file selection dialog</source> - <translation type="obsolete">Vybrat list se styly přes dialog výběru souborů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="62"/> <source>System</source> <translation type="unfinished">Systém</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="78"/> - <source>Select style sheet file</source> - <translation type="obsolete">Vybrat soubor s CSS styly</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="36"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;Všechny soubory (*)</translation> @@ -26743,11 +25889,6 @@ <translation>Zadání obvyklého prohlížeče pro používání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="58"/> - <source>Press to select the custom viewer via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr obvyklého prohlížeče přes dialog výběru souborů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="76"/> <source>Select to use a custom viewer</source> <translation>Vybrat používání obvyklého prohlížeče</translation> @@ -26768,26 +25909,6 @@ <translation>Qt asistent</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="84"/> - <source>Select Custom Viewer</source> - <translation type="obsolete">Vybrat obvyklý prohlížeč</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="98"/> - <source>Select Web-Browser</source> - <translation type="obsolete">Vybrat web prohlížeč</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="112"/> - <source>Select PDF-Viewer</source> - <translation type="obsolete">Vybrat PDF prohlížeč</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="126"/> - <source>Select CHM-Viewer</source> - <translation type="obsolete">Vybrat CHM prohlížeč</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="43"/> <source>Select to use the Eric Web Browser</source> <translation>Vybrat pro používání Eric web prohlížeče</translation> @@ -26959,11 +26080,6 @@ <translation>Vybrat pro povolení zásuvných modulů na web stranách</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="260"/> - <source>Enable Plugins</source> - <translation type="obsolete">Povolit zásuvné moduly</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="456"/> <source>Browser Cache</source> <translation>Procházet cache</translation> @@ -28332,11 +27448,6 @@ <translation>Smazat soukromá data</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1350"/> - <source>&Clear private data</source> - <translation type="obsolete">Smazat &soukromá data</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1316"/> <source><b>Clear private data</b><p>Clears the private data like browsing history, search history or the favicons database.</p></source> <translation><b>Smazat soukromá data</b><p>Smaže soukromá data jako je historie prohlížení, vyhledávání a databáze favicon.</p></translation> @@ -29917,17 +29028,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../HexEdit/HexEditMainWindow.py" line="493"/> - <source>Replace some text</source> - <translation type="obsolete">Hledat nějaký text</translation> - </message> - <message> - <location filename="../HexEdit/HexEditMainWindow.py" line="494"/> - <source><b>Replace</b><p>Search for some text in the current editor and replace it. A dialog is shown to enter the searchtext, the replacement text and options for the search and replace.</p></source> - <translation type="obsolete"><b>Nahradit</b> -<p>Vyhledá va ktuálním editoru text a nahradí jej. Je zobrazeno dialogové okno, kde se zadá text, který se má nahradit, nový text a nastavení pro vyhledávání a nahrazení.<p></translation> - </message> - <message> <location filename="../HexEdit/HexEditMainWindow.py" line="552"/> <source>About</source> <translation type="unfinished">O aplikaci</translation> @@ -30650,21 +29750,11 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> - <source>The hg process finished with the exit code {0}</source> - <translation type="obsolete">hg proces skončil s exit kódem {0}</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> - <source>Could not start the hg executable.</source> - <translation type="obsolete">Nelze spustit hg program.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> @@ -32396,17 +31486,6 @@ <translation>Mercurial kopie</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="64"/> - <source>Press to open a selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="67"/> - <source><b>Target directory</b> -<p>Select the target name for the operation via a selection dialog.</p></source> - <translation type="obsolete"><b>Cílový adresář</b><p>Výběr cílového adresáře přes dialogové okno výběru adresáře.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="23"/> <source>Source:</source> <translation>Zdroj:</translation> @@ -32449,11 +31528,6 @@ <translation>Mercurial přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="89"/> - <source>Select target</source> - <translation type="obsolete">Vybrat cíl</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> @@ -32551,36 +31625,6 @@ <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="89"/> - <source>Input</source> - <translation type="obsolete">Vstup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="111"/> - <source>Press to send the input to the hg process</source> - <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="114"/> - <source>&Send</source> - <translation type="obsolete">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> - <source>Enter data to be sent to the hg process</source> - <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="131"/> - <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="134"/> - <source>&Password Mode</source> - <translation type="obsolete">Ty&p heslo</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> @@ -33495,11 +32539,6 @@ <translation>Zpráva</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="207"/> - <source>Enter the regular expression to filter on</source> - <translation type="obsolete">Zadejte regulární výraz pro filtrování</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="213"/> <source>Branch</source> <translation>Větev</translation> @@ -33555,16 +32594,6 @@ <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> - <source>Press to compare two revisions</source> - <translation type="obsolete">Stisknout pro porovnání dvou revizí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> - <source>&Compare Revisions</source> - <translation type="obsolete">&Porovnat revize</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="520"/> <source>Errors</source> <translation>Chyby</translation> @@ -33660,26 +32689,6 @@ <translation>Graf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> - <source>Press to generate a diff to the first parent revision</source> - <translation type="obsolete">Stisknout pro generování diffu s první rodičovskou revizí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> - <source>Diff to Parent &1</source> - <translation type="obsolete">Diff s rodičem &1</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> - <source>Press to generate a diff to the second parent revision</source> - <translation type="obsolete">Stisknout pro generování diffu s druhou rodičovskou revizí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> - <source>Diff to Parent &2</source> - <translation type="obsolete">Diff s rodičem &2</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="112"/> <source>Branch:</source> <translation type="unfinished">Větev:</translation> @@ -34128,158 +33137,6 @@ </message> </context> <context> - <name>HgLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation type="obsolete">Mercurial log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> - <source>Log</source> - <translation type="obsolete">Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation type="obsolete"><b>Mercurial Log</b><p>Zobrazuje výstup z hg log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> - <source>Errors</source> - <translation type="obsolete">Chyby</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="obsolete"><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> - <source>Input</source> - <translation type="obsolete">Vstup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>&Send</source> - <translation type="obsolete">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> - <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> - <source>&Password Mode</source> - <translation type="obsolete">Mód vstu&pu hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> - <source><b>Processing your request, please wait...</b></source> - <translation type="obsolete"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> - <source>Revision</source> - <translation type="obsolete">Revize</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>Process Generation Error</source> - <translation type="obsolete">Chyba v procesu generování</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation type="obsolete">Log není pro '{0}' dostupný</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation type="obsolete">diff na {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation type="obsolete">Tagy: {0}<br/></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation type="obsolete">Rodiče: {0}<br/></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="obsolete"><i>Autor: {0}</i><br /></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="obsolete"><i>Datum: {0}, {1}</i><br /></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation type="obsolete">Přidáno: {0}<br/></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation type="obsolete">Změněno: {0}<br/></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation type="obsolete">Smazáno: {0}<br/></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation type="obsolete">Hg proces neskončil do 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation type="obsolete">Nelze spustit hg program.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation type="obsolete">Mercurial chyba</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="obsolete">Přidáno {0} (zkopírováno z {1})<br /> -</translation> - </message> -</context> -<context> <name>HgMergeDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="14"/> @@ -34485,26 +33342,11 @@ <translation><b>Dialog Nový projekt z repozitáře</b><p>Zadání různých údajů o repozitáři. Tyto údaje jsou použity ve chvíli, kdy se z repozitáře projekt načítá. Pokud checkbox zapnut, tak na URL musí zakončovat jméno projektu. Je převzat layout repozitáře s adresáři projekt/tags, projekt/branches a projekt/trunk. V tomto případě můžete zadat tag nebo větev (branch), které musí vypadat jako tags/jméno_tagu nebo branches/jménovětve. Pokud je checkbox vypnut, tak URL musí obsahovat kompletní cestu do repozitáře.</p><p>Pro vzdálený repozitář musí URL obsahovat jméno hosta.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="28"/> - <source>&Protocol:</source> - <translation type="obsolete">&Prototokol:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="38"/> - <source>Select the protocol to access the repository</source> - <translation type="obsolete">Výběr protokolu pro přístup do repozitáře</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="122"/> <source>&URL:</source> <translation>&URL:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="62"/> - <source>Select the repository url via a directory selection dialog</source> - <translation type="obsolete">Výběr repozitáře přes dialog výběru adresáře</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="54"/> <source>&Revision:</source> <translation>&Revize:</translation> @@ -34532,16 +33374,6 @@ <translation><b>Adresář projektu</b><p>Zadání adresáře nového projektu. Ten bude stažen z repozitáře a umístěn do tohoto adresáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="98"/> - <source>Select Repository-Directory</source> - <translation type="obsolete">Vyberte adresář repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="113"/> - <source>Select Project Directory</source> - <translation type="obsolete">Vyberte adresář projektu</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="95"/> <source>Download all versions of all large files</source> <translation type="unfinished"></translation> @@ -34570,13 +33402,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.ui" line="17"/> - <source><b>Repository Infos Dialog</b> -<p>Enter the various infos into the entry fields. These values are used to generate a new project in the repository. If the checkbox is selected, the URL must end in the project name. A directory tree with project/tags, project/branches and project/trunk will be generated in the repository. If the checkbox is not selected, the URL must contain the complete path in the repository.</p> -<p>For remote repositories the URL must contain the hostname.</p></source> - <translation type="obsolete"><b>Dialog informací o repozitáři</b><p>Zadání různých informací do vstupních polí. Tyto hodnoty jsou pak použity při generování nového projektu v repozitáři. Pokud je zatržen checkbox, tak URL musí končit jménem projektu. Pak budou v repozitáři generovány složky project/tags, project/branches a project/trunk. Pokud checkbox není zatržen, tak URL musí obsahovat kompletní cestu do repozitáře.</p><p>U více repozitářů musí URL obsahovat i název hosta.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.ui" line="29"/> <source>Commit &Message:</source> <translation>Zpráva pro zapsání z&měn:</translation> @@ -34680,11 +33505,6 @@ <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> - <source>Show log</source> - <translation type="obsolete">Zobrazit log</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> @@ -34943,11 +33763,6 @@ <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="275"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> @@ -37686,16 +36501,6 @@ <translation>Stisknout pro obnovení zobrazní statusu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> - <source>Commit changes to repository...</source> - <translation type="obsolete">Zapsat změny do repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> - <source>Add to repository</source> - <translation type="obsolete">Přidat do repozitáře</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> @@ -37796,11 +36601,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="136"/> - <source>&Add</source> - <translation type="obsolete">Přid&at</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="190"/> <source>Restore missing</source> <translation type="unfinished"></translation> @@ -38631,14 +37431,6 @@ </message> </context> <context> - <name>HgUserConfigDataDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="175"/> - <source> MB</source> - <translation type="obsolete"> MB</translation> - </message> -</context> -<context> <name>HgUserConfigDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="552"/> @@ -40840,16 +39632,6 @@ <translation>Přidat</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="72"/> - <source>Enter a directory to be added</source> - <translation type="obsolete">Zadejte adresář, který bude přidán</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="79"/> - <source>Press to select an icon directory via a selection dialog</source> - <translation type="obsolete">Stisknout pro výběr ikony adresáře přes dialog výběru</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/> <source>Show</source> <translation>Zobrazit</translation> @@ -40870,11 +39652,6 @@ <translation>Seznam adresářů s ikonami</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.py" line="132"/> - <source>Select icon directory</source> - <translation type="obsolete">Vybrat adresář s ikonami</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="115"/> <source>Press to delete the selected directory from the list</source> <translation>Stisknout pro odebrání vybraného adresáře ze seznamu</translation> @@ -41518,16 +40295,6 @@ <translation>List stylů:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="184"/> - <source>Enter the name of the style sheet file</source> - <translation type="obsolete">Zadejte jméno souboru se styly</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="191"/> - <source>Select the style sheet file via a file selection dialog</source> - <translation type="obsolete">Vybrat list se styly přes dialog výběru souborů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="202"/> <source>Dockarea Corner Usage</source> <translation>Použití dockování</translation> @@ -41643,26 +40410,11 @@ <translation>Vybrat typ layoutu.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="469"/> - <source>Select to get a separate shell window</source> - <translation type="obsolete">Vybrat pro získání oddělených shell oken</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="501"/> - <source>separate window</source> - <translation type="obsolete">oddělit okna</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="486"/> <source>File-Browser</source> <translation type="unfinished">Prohlížeč souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="498"/> - <source>Select to get a separate file browser window</source> - <translation type="obsolete">Vybrat pro získání odděleného okna prohlížeče souborů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="596"/> <source>Reset layout to factory defaults</source> <translation>Resetovat layout továrny defaultů</translation> @@ -41673,31 +40425,11 @@ <translation>Systém</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="254"/> - <source>Select style sheet file</source> - <translation type="obsolete">Vybrat soubor s CSS styly</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="42"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="104"/> - <source>Log-Viewer</source> - <translation type="obsolete">Prohlížeč logu</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="120"/> - <source>Stderr Colour:</source> - <translation type="obsolete">Stderr barva:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="133"/> - <source>Select the colour for text sent to stderr</source> - <translation type="obsolete">Vybrat barvu pro text poslaný na stderr</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="451"/> <source>Toolboxes</source> <translation>Nástrojové lišty</translation> @@ -41713,31 +40445,6 @@ <translation>Postranní menu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="479"/> - <source>Select to embed the shell in the Debug-Viewer</source> - <translation type="obsolete">Vybrat pro přiřazení shellu do debug prohlížeče</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="511"/> - <source>embed in Debug-Viewer</source> - <translation type="obsolete">přiřadit do debug prohlížeče</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="508"/> - <source>Select to embed the file browser in the Debug-Viewer</source> - <translation type="obsolete">Vybrat pro přiřazení prohlížeče souborů do debug prohlížeče</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="518"/> - <source>Select to embed the file browser in the Project-Viewer</source> - <translation type="obsolete">Vybrat pro přiřazení prohlížeče souborů do prohlížeče projektu</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="521"/> - <source>embed in Project-Viewer</source> - <translation type="obsolete">přiřadit do prohlížeče projektu</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="63"/> <source>Select to sort file contents by occurrence</source> <translation>Vybrat pro třídění obsahu souborů podle výskytu</translation> @@ -41748,16 +40455,6 @@ <translation>Třídit obsahy podle výskytu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="110"/> - <source>Select to show the log-viewer upon new output</source> - <translation type="obsolete">Vybrat pro zobrazení log-prohlížeče na nový výstup</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="113"/> - <source>Show upon new output</source> - <translation type="obsolete">Zobrazit na nový výstup</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="567"/> <source>Tabs</source> <translation>Taby</translation> @@ -43945,11 +42642,6 @@ <translation type="unfinished">Vybrat pro povolení přístupu JavaScriptu do schránky</translation> </message> <message> - <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="36"/> - <source>JavaScript can access clipboard</source> - <translation type="obsolete">JavaScript může přistupovat do schránky</translation> - </message> - <message> <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="38"/> <source>Allow to open windows</source> <translation type="unfinished"></translation> @@ -44628,11 +43320,6 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="578"/> - <source>Pyrex Files (*.pyx)</source> - <translation type="obsolete">Pyrex soubory (*.pyx)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="591"/> <source>Quixote Template Files (*.ptl)</source> <translation>Quixote Template soubory (*.ptl)</translation> @@ -45688,21 +44375,11 @@ <translation>Zadejte počet zpráv zapsaných změn k zapamatování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> - <source>Incoming / Outgoing</source> - <translation type="obsolete">Příchozí / Odchozí</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> <source>Select to update the working directory to new tip</source> <translation>Zvolte, zda chcete aktualizovat pracovní adresář na nový tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation type="obsolete">Použít Log prohlížeč pro příchozí / odchozí logy</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation>Stáhnout</translation> @@ -47382,11 +46059,6 @@ <translation>Otevřít</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="333"/> - <source>Remove</source> - <translation type="obsolete">Odebrat</translation> - </message> - <message> <location filename="../MultiProject/MultiProjectBrowser.py" line="411"/> <source>Properties</source> <translation>Nastavení</translation> @@ -47599,11 +46271,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/> - <source>Stop loading</source> - <translation type="obsolete">Zastavit načítání</translation> - </message> - <message> <location filename="../WebBrowser/Navigation/NavigationBar.py" line="83"/> <source>Move to the initial screen</source> <translation type="unfinished"></translation> @@ -47640,47 +46307,47 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="181"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="197"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="182"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="198"/> <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="192"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="208"/> <source>&Permanent accept</source> <translation type="unfinished">Akce&ptovat natrvalo</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="210"/> <source>&Temporary accept</source> <translation type="unfinished">Akcep&tovat dočasně</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="196"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Reject</source> <translation type="unfinished">&Odmítnout</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="229"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="245"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"><b>Zadejte uživatelské jméno a heslo pro {0}', realm '{1}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="232"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="248"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"><b>Zadejte uživatelské jméno a heslo pro '{0}'</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="275"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="291"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="276"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="292"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> @@ -47703,11 +46370,6 @@ <translation>Zadejte download adresář (ponechte prázdné pro výchozí lokaci)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="59"/> - <source>Select the download directory via a directory selection dialog</source> - <translation type="obsolete">Vybrat adresář pro download přes dialog výběru adresáře</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="170"/> <source>Select to use a web proxy</source> <translation>Výběr použití web proxy</translation> @@ -47718,11 +46380,6 @@ <translation type="unfinished">Použít síťovou proxy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="193"/> - <source>Select download directory</source> - <translation type="obsolete">Vybrat adresář pro download</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="89"/> <source>Select to ask the user for a download filename</source> <translation>Vybrat pro požádání uživatele aby si stáhnul soubor s názvem</translation> @@ -48044,11 +46701,6 @@ <translation>&Jméno třídy:</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="76"/> - <source>Select the source file path via a directory selection dialog</source> - <translation type="obsolete">Výběr souboru se zdrojovým kódem přes dialog výběru adresáře</translation> - </message> - <message> <location filename="../Project/NewDialogClassDialog.ui" line="42"/> <source>&Filename:</source> <translation>Jméno &souboru:</translation> @@ -48068,11 +46720,6 @@ <source>Enter the name of the file for the forms code</source> <translation>Zadejte jméno souboru pro kód formulářů</translation> </message> - <message> - <location filename="../Project/NewDialogClassDialog.py" line="61"/> - <source>Select source directory</source> - <translation type="obsolete">Vybrat zdrojový adresář</translation> - </message> </context> <context> <name>NewPythonPackageDialog</name> @@ -49533,11 +48180,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/PipInterface/Pip.py" line="564"/> - <source><default></source> - <translation type="obsolete"><default></translation> - </message> - <message> <location filename="../Plugins/UiExtensionPlugins/PipInterface/Pip.py" line="600"/> <source>Interpreter for Virtual Environment</source> <translation type="unfinished"></translation> @@ -50328,30 +48970,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.ui" line="82"/> - <source>&Add...</source> - <translation type="obsolete">Přid&at...</translation> - </message> - <message> - <location filename="../Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.ui" line="102"/> - <source>&Remove</source> - <translation type="obsolete">Odeb&rat</translation> - </message> - <message> <location filename="../Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.py" line="36"/> <source><b>Note:</b> Leave empty to use the default index URL (<a href="{0}">{0}</a>).</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>PipRequirementsSelectionDialog</name> - <message> - <location filename="../Plugins/UiExtensionPlugins/PipInterface/PipRequirementsSelectionDialog.py" line="60"/> - <source>Text Files (*.txt);;All Files (*)</source> - <translation type="obsolete">Textové soubory (*.txt);;Všechny soubory (*)</translation> - </message> -</context> -<context> <name>PipSearchDialog</name> <message> <location filename="../Plugins/UiExtensionPlugins/PipInterface/PipSearchDialog.py" line="450"/> @@ -50978,16 +49602,6 @@ <translation>Zadejte adresář pro download pluginů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="53"/> - <source>Select the plugins download directory via a directory selection dialog</source> - <translation type="obsolete">Výběr adresáře pro download plugůnů přes dialog výběru adresáře</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.py" line="109"/> - <source>Select plugins download directory</source> - <translation type="obsolete">Vybrat adresář pro download pluginů</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="137"/> <source>Select to enable external plugins to be loaded</source> <translation type="unfinished"></translation> @@ -52224,11 +50838,6 @@ <context> <name>Project</name> <message> - <location filename="../Project/Project.py" line="166"/> - <source>Ruby Files (*.rb);;</source> - <translation type="obsolete">Ruby soubory (*.rb);;</translation> - </message> - <message> <location filename="../Project/Project.py" line="278"/> <source>Console</source> <translation>Konzole</translation> @@ -52593,11 +51202,6 @@ <translation>Hledat nové soubory v adresáři projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3667"/> - <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> - <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="3917"/> <source>Project properties</source> <translation>Nastavení projektu</translation> @@ -52653,11 +51257,6 @@ <translation>Zobrazit asociace typů souborů</translation> </message> <message> - <location filename="../Project/Project.py" line="3724"/> - <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface 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="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="3981"/> <source>Debugger Properties</source> <translation>Nastavení debugeru</translation> @@ -53003,11 +51602,6 @@ <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4815"/> - <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> - <translation type="obsolete"><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="5244"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> @@ -53148,11 +51742,6 @@ <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1434"/> - <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> - <translation type="obsolete"><p>Vybraný soubor s překladem <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="1732"/> <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> @@ -53168,16 +51757,6 @@ <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2131"/> - <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> - <translation type="obsolete"><p>Vybraný soubor <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2160"/> - <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> - <translation type="obsolete"><p>Vybraný adresář <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="2332"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> @@ -53193,11 +51772,6 @@ <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4836"/> - <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> - <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="5386"/> <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> @@ -53313,11 +51887,6 @@ <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> <message> - <location filename="../Project/Project.py" line="4915"/> - <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> - <translation type="obsolete"><p>Soubor s eric5 plugin archivem <b>{0}</b> byl úspěšně vytvořen.</p> {6 ?} {0}?}</translation> - </message> - <message> <location filename="../Project/Project.py" line="273"/> <source>PyQt4 GUI</source> <translation type="unfinished"></translation> @@ -53414,11 +51983,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4834"/> - <source>Coverage</source> - <translation type="obsolete">Pokrytí</translation> - </message> - <message> <location filename="../Project/Project.py" line="5293"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> @@ -55416,18 +53980,6 @@ <p>Zadání emailu autora.</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="309"/> - <source>Show file selection dialog</source> - <translation type="obsolete">Zobrazit dialog výběru souboru</translation> - </message> - <message> - <location filename="../Project/PropertiesDialog.ui" line="312"/> - <source><b>Main Script</b> -<p>Select the projects main script via a file selection dialog.</p></source> - <translation type="obsolete"><b>Hlavní skript</b> -<p>Výběr hlavního skriptu projektu přes dialog výběru souboru.</p></translation> - </message> - <message> <location filename="../Project/PropertiesDialog.ui" line="46"/> <source>Enter the project name</source> <translation>Zadejte jméno projektu</translation> @@ -55478,18 +54030,6 @@ <translation>Číslo &verze:</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="298"/> - <source>Show directory selection dialog</source> - <translation type="obsolete">Zobrazit dialog výběru adresáře</translation> - </message> - <message> - <location filename="../Project/PropertiesDialog.ui" line="301"/> - <source><b>Project Directory</b> -<p>Select a project directory via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Adrsář projektu</b> -<p>Výběr adresáře projektu přes dialog výběru adresáře.</p></translation> - </message> - <message> <location filename="../Project/PropertiesDialog.ui" line="86"/> <source>Select, if the project uses other programming languages as well</source> <translation>Označit, jestliže projekt používá také jiné programovací jazyky</translation> @@ -55525,16 +54065,6 @@ <translation>Projekt není pod správou verzovacího systému.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="184"/> - <source>Select project directory</source> - <translation type="obsolete">Vybrat adresář projektu</translation> - </message> - <message> - <location filename="../Project/PropertiesDialog.py" line="237"/> - <source>Select main script file</source> - <translation type="obsolete">Vybrat soubor hlavního skriptu</translation> - </message> - <message> <location filename="../Project/PropertiesDialog.ui" line="137"/> <source>Project &Type:</source> <translation>&Typ projektu:</translation> @@ -56944,11 +55474,6 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> @@ -57040,7 +55565,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Zobrazit info o repozitáři</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> @@ -60733,11 +59258,6 @@ <translation><b>Konfigurovat Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="66"/> - <source>Select Qt4 Translations Directory</source> - <translation type="obsolete">Výběr adresáře s Qt4 překlady</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Qt nástroje</translation> @@ -61925,11 +60445,6 @@ <translation>Najít a nahradit</translation> </message> <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="39"/> - <source>Find:</source> - <translation type="obsolete">Hledat:</translation> - </message> - <message> <location filename="../QScintilla/ReplaceWidget.ui" line="91"/> <source>Press to find the previous occurrence</source> <translation>Stisknout pro vyhledání předchozího výskytu</translation> @@ -61940,21 +60455,6 @@ <translation>Stisknout pro vyhledání následujícího výskytu</translation> </message> <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="85"/> - <source>Match case</source> - <translation type="obsolete">Rozlišit velké a malé znaky</translation> - </message> - <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="92"/> - <source>Whole word</source> - <translation type="obsolete">Celé slovo</translation> - </message> - <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="106"/> - <source>Replace:</source> - <translation type="obsolete">Nahradit:</translation> - </message> - <message> <location filename="../QScintilla/ReplaceWidget.ui" line="168"/> <source>Press to replace the selection</source> <translation>Stisknout pro nahrazení výběru</translation> @@ -61970,21 +60470,6 @@ <translation>Stisknutím zavřít okno</translation> </message> <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="99"/> - <source>Regexp</source> - <translation type="obsolete">Regexp</translation> - </message> - <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="159"/> - <source>Wrap around</source> - <translation type="obsolete">Zabalit</translation> - </message> - <message> - <location filename="../QScintilla/ReplaceWidget.ui" line="166"/> - <source>Selection only</source> - <translation type="obsolete">Jen výběr</translation> - </message> - <message> <location filename="../QScintilla/ReplaceWidget.ui" line="175"/> <source>Press to replace the selection and search for the next occurence</source> <translation type="unfinished"></translation> @@ -62580,11 +61065,6 @@ <translation>Zabalit</translation> </message> <message> - <location filename="../QScintilla/SearchWidget.ui" line="113"/> - <source>Selection only</source> - <translation type="obsolete">Jen výběr</translation> - </message> - <message> <location filename="../WebBrowser/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>Výraz nebyl nalezen.</translation> @@ -63489,16 +61969,6 @@ <translation>Vyčistit</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="304"/> - <source>Reset</source> - <translation type="obsolete">Reset</translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="305"/> - <source>Reset and Clear</source> - <translation type="obsolete">Reset a vyčistit</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="836"/> <source>No.</source> <translation>Č.</translation> @@ -63509,11 +61979,6 @@ <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="121"/> - <source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys. Pressing the up or down key after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible commandline completions. The relevant entry may be selected from this list. If only one entry is available, this will inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source> - <translation type="obsolete"><b>Okno Shellu</b><p>Toto je jednoduchý interpretr běžící v okně. Interpretr běží nezávisle na programu, který je debugován. To znamená, že můžete spustit jakýkoliv příkaz i během debugování.</p><p>Během vkládání příkazu můžete použít kurzorové klávesy. Je zde také historie příkazů, která se aktivuje klávesami up a down. Stisknutím up nebo down klávesy po textu, který byl zadán se spustí inkrementální vyhledávání.</p><p>Shell má několik speciálních příkazů. 'reset' zabije shell a spustí nový. 'clear' vyčistí obsah shell okna.'start' se používá pro přepnutí shell jazyka a musí za ním následovat jméno podporovaného jazyka. Podporované jazyky jsou zobrazeny v seznamu, který vrací příkaz 'languages'. Tyto příkazy (kromě 'languages') jsou také dostupné přes kontextové menu.</p><p>Stisknutím tab klávesy po nějakém vloženém textu se zobrazí seznam s nabídkou možných zakončení výrazu. Odpovídající zadání pak může být vybráno z tohoto listu. Pokud je existuje jen jedna možnost, je vložena automaticky.</p><p>Dokud se program neukončí, je shell v pasivním módu dostupný jen pokud se debugovaný program připojil k IDE. To je oznámeno odlišným promptem a dále v názvu titulku okna.</p></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="832"/> <source>Passive Debug Mode</source> <translation>Pasivní debug mód</translation> @@ -63575,12 +62040,6 @@ <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1743"/> - <source>Shell language "{0}" not supported. -</source> - <translation type="obsolete">Shell jazyk "{0}" není podporován.</translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="2140"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> @@ -65410,11 +63869,6 @@ <translation>Zadejte jméno souboru se seznamem slov projektu</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="97"/> - <source>Select the project word list file via a file selection dialog</source> - <translation type="obsolete">Vybrat soubor se seznamem slov projektu přes dialog výběru</translation> - </message> - <message> <location filename="../Project/SpellingPropertiesDialog.ui" line="66"/> <source>Project E&xclude List:</source> <translation>Seznam &vyřazených v projektu:</translation> @@ -65425,31 +63879,16 @@ <translation>Zadejte jméno souboru se seznamem vyřazených v projektu</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="104"/> - <source>Select the project exclude list file via a file selection dialog</source> - <translation type="obsolete">Výběr souboru se seznamem vyřazených z projektu přes dialog výběru</translation> - </message> - <message> <location filename="../Project/SpellingPropertiesDialog.py" line="50"/> <source><default></source> <translation><default></translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.py" line="89"/> - <source>Select project word list</source> - <translation type="obsolete">Vybrat seznam slov projektu</translation> - </message> - <message> <location filename="../Project/SpellingPropertiesDialog.py" line="43"/> <source>Dictionary File (*.dic);;All Files (*)</source> <translation>Soubor slovníku (*.dic);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.py" line="110"/> - <source>Select project exclude list</source> - <translation type="obsolete">Vybrat seznam vyřazených v projektu</translation> - </message> - <message> <location filename="../Project/SpellingPropertiesDialog.ui" line="14"/> <source>Spelling Properties</source> <translation>Nastavení kontroly</translation> @@ -65705,11 +64144,6 @@ <translation>Zadejte název databáze</translation> </message> <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="155"/> - <source>Press to select a database file</source> - <translation type="obsolete">Stisknout pro výběr souboru databáze</translation> - </message> - <message> <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="63"/> <source>&Username:</source> <translation>&Uživatelské jméno:</translation> @@ -65749,16 +64183,6 @@ <source>Default</source> <translation>Výchozí</translation> </message> - <message> - <location filename="../SqlBrowser/SqlConnectionDialog.py" line="106"/> - <source>Select Database File</source> - <translation type="obsolete">Vybrat soubor databáze</translation> - </message> - <message> - <location filename="../SqlBrowser/SqlConnectionDialog.py" line="106"/> - <source>All Files (*)</source> - <translation type="obsolete">Všechny soubory (*)</translation> - </message> </context> <context> <name>SqlConnectionWidget</name> @@ -66094,17 +64518,6 @@ <translation><b>Pracovní adresář</b><p>Zadání pracovního adresáře, ve kterém proběhne ladění. Ponechte jej prázdný pokud chcete pro spuštění použít adresář aplikace.</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="270"/> - <source>Select directory using a directory selection dialog</source> - <translation type="obsolete">Vybrat adresář za použití dialogu výběru adresáře</translation> - </message> - <message> - <location filename="../Debugger/StartDebugDialog.ui" line="273"/> - <source><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Vybrat adresář</b><p>Výběr pracovního adresáře před dialog výběru adresáře.</p></translation> - </message> - <message> <location filename="../Debugger/StartDebugDialog.ui" line="90"/> <source>&Working directory:</source> <translation>&Pracovní adresář:</translation> @@ -66265,11 +64678,6 @@ <context> <name>StartDialog</name> <message> - <location filename="../Debugger/StartDialog.py" line="130"/> - <source>Working directory</source> - <translation type="obsolete">Pracovní adresář</translation> - </message> - <message> <location filename="../Debugger/StartDialog.py" line="106"/> <source>Clear Histories</source> <translation>Vyčistit historii</translation> @@ -66551,17 +64959,6 @@ <translation>&Pracovní adresář:</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="241"/> - <source>Select directory using a directory selection dialog</source> - <translation type="obsolete">Vybrat adresář za použití dialogu výběru adresáře</translation> - </message> - <message> - <location filename="../Debugger/StartRunDialog.ui" line="244"/> - <source><b>Select directory</b> -<p>Select the working directory via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Vybrat adresář</b><p>Výběr pracovního adresáře před dialog výběru adresáře.</p></translation> - </message> - <message> <location filename="../Debugger/StartRunDialog.ui" line="109"/> <source>Enter the working directory</source> <translation>Zadejte pracovní adresář</translation> @@ -66913,11 +65310,6 @@ <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2082"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> @@ -67527,17 +65919,6 @@ <translation>Subversion příkaz:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui" line="125"/> - <source>Select the working directory via a directory selection dialog</source> - <translation type="obsolete">Výběr pracovního adresáře přes dialog výběru adresáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui" line="128"/> - <source><b>Working directory</b> -<p>Select the working directory for the Subversion command via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Pracovní adresář</b><p>Výběr pracovního adresáře pro CVS příkaz přes dialog výběru adresáře.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui" line="75"/> <source>Enter the working directory for the Subversion command</source> <translation>Zadejte pracovní adresář pro Subversion příkaz</translation> @@ -67573,11 +65954,6 @@ <translation>projekt adresář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py" line="78"/> - <source>Working directory</source> - <translation type="obsolete">Pracovní adresář</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui" line="36"/> <source>Enter the Subversion command to be executed with all necessary parameters</source> <translation>Zadejte subversion příkaz, který bude vykonán se všemy potřebnými parametry</translation> @@ -67655,17 +66031,6 @@ <translation>Subversion kopírování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="64"/> - <source>Press to open a selection dialog</source> - <translation type="obsolete">Stisknout pro otevření dialogu výběru</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="67"/> - <source><b>Target directory</b> -<p>Select the target name for the operation via a selection dialog.</p></source> - <translation type="obsolete"><b>Cílový adresář</b><p>Výběr cílového adresáře přes dialogové okno výběru adresáře.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="23"/> <source>Source:</source> <translation>Zdroj:</translation> @@ -67698,11 +66063,6 @@ <translation>Subversion přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py" line="91"/> - <source>Select target</source> - <translation type="obsolete">Vybrat cíl</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="71"/> <source>Select to force the operation</source> <translation>Vybrat pro vynucení operace</translation> @@ -67713,13 +66073,6 @@ <translation>Vynutit operaci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="67"/> - <source><b>Target name</b> -<p>Select the target name for the operation via a selection dialog.</p></source> - <translation type="obsolete"><b>Jméno cíle</b> -<p>Výběr jména cíle přes dialogové okno výběru.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> @@ -68342,113 +66695,6 @@ </message> </context> <context> - <name>SvnLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation type="obsolete"><b>Subversion Log</b><p>Zobrazuje výstup z subversion log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> - <source>Errors</source> - <translation type="obsolete">Chyby</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation type="obsolete"><b>Subversion log chyba</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> - <source>Input</source> - <translation type="obsolete">Vstup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> - <source>Press to send the input to the subversion process</source> - <translation type="obsolete">Stisknout pro odeslání vstupu do procesu subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> - <source>&Send</source> - <translation type="obsolete">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="obsolete">Zadejte data, která mají být do procesu subversion odeslána</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> - <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Výběr přepnutí vstupního pole na mód zadání hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> - <source>&Password Mode</source> - <translation type="obsolete">Mód ve&psání hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> - <source><b>Processing your request, please wait...</b></source> - <translation type="obsolete"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> - <source>Added</source> - <translation type="obsolete">Přidáno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> - <source>Deleted</source> - <translation type="obsolete">Smazáno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> - <source>Modified</source> - <translation type="obsolete">Změněno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> - <source>revision</source> - <translation type="obsolete">revize</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> - <source>Process Generation Error</source> - <translation type="obsolete">Chyba v procesu generování</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation type="obsolete">diff na {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation type="obsolete"><i>Autor: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation type="obsolete"><i>datum: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation type="obsolete"> (zkopírováno z {0}, revize {1})</translation> - </message> -</context> -<context> <name>SvnLoginDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.ui" line="13"/> @@ -68630,21 +66876,6 @@ <translation>&Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="95"/> - <source>Select Repository-Directory</source> - <translation type="obsolete">Vyberte adresář repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="123"/> - <source>Select Project Directory</source> - <translation type="obsolete">Vyberte adresář projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="133"/> - <source>Select the project directory via a directory selection dialog</source> - <translation type="obsolete">Výběr adresáře projektu přes dialog výběru adresáře</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="67"/> <source><b>URL</b><p>Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.</p></source> <translation><b>URL<b><p>Zadejte URL modulu. Repozitář ve standardním uspořádání musí obsahovat trunk, tags nebo branches.</p></translation> @@ -68726,16 +66957,6 @@ <translation>Prot&otokol:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="71"/> - <source>Select Repository-Directory</source> - <translation type="obsolete">Vyberte adresář repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="107"/> - <source>Select the repository url via a directory selection dialog or the repository browser</source> - <translation type="obsolete">Vybrat url repozitáře přes dialog výběru adresáře nebo přes prohlížeč repozitáře</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="67"/> <source><b>URL</b><p>Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.</p></source> <translation><b>URL<b><p>Zadejte URL modulu. Repozitář ve standardním uspořádání musí obsahovat trunk, tags nebo branches.</p></translation> @@ -68784,11 +67005,6 @@ <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> - <source>Show log</source> - <translation type="obsolete">Zobrazit log</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Zobrazit status</translation> @@ -69002,11 +67218,6 @@ <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> @@ -69322,21 +67533,6 @@ <translation><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="209"/> - <source>Show repository info</source> - <translation type="obsolete">Zobrazit info repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="214"/> - <source>Show some repository related information for the local project</source> - <translation type="obsolete">Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="217"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation type="obsolete"><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate</source> <translation>Přemístit</translation> @@ -69637,11 +67833,6 @@ <translation>Zadání testu vlastnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="93"/> - <source>Press to select the file via a file selection dialog</source> - <translation type="obsolete">Stisknout pro výběr souboru přes dialogové okno</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="92"/> <source>Enter the name of a file for the property</source> <translation>Zadejte jméno souboru nebo vlastnosti</translation> @@ -69666,11 +67857,6 @@ <source>Property &Value:</source> <translation>Hodnota &vlastnosti:</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py" line="46"/> - <source>Select file for property</source> - <translation type="obsolete">Vybrat soubor pro vlastnost</translation> - </message> </context> <context> <name>SvnRelocateDialog</name> @@ -73664,19 +71850,6 @@ </message> </context> <context> - <name>TemplateHelpDialog</name> - <message> - <location filename="../Templates/TemplateHelpDialog.ui" line="14"/> - <source>Template Help</source> - <translation type="obsolete">Nápověda šablony</translation> - </message> - <message> - <location filename="../Templates/TemplateHelpDialog.py" line="33"/> - <source><p>To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.</p><p>Example template: This is a $VAR$</p><p>When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you've entered.</p><p>If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.</p><p>If you want a variables contents to be treated specially, the variablename must be followed by a ':' and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:<table><tr><td>ml</td><td>Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.</td></tr><tr><td>rl</td><td>Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.</td></tr></table></p><p>The following predefined variables may be used in a template:<table><tr><td>date</td><td>today's date in ISO format (YYYY-MM-DD)</td></tr><tr><td>year</td><td>the current year</td></tr><tr><td>project_name</td><td>the name of the project (if any)</td></tr><tr><td>project_path</td><td>the path of the project (if any)</td></tr><tr><td>path_name</td><td>full path of the current file</td></tr><tr><td>dir_name</td><td>full path of the parent directory</td></tr><tr><td>file_name</td><td>the current file name (without directory)</td></tr><tr><td>base_name</td><td>like <i>file_name</i>, but without extension</td></tr><tr><td>ext</td><td>the extension of the current file</td></tr><tr><td>cur_select</td><td>the currently selected text</td></tr><tr><td>insertion</td><td>Sets insertion point for cursor after template is inserted.</td></tr><tr><td>select_start</td><td>Sets span of selected text in template after template is inserted (used together with 'select_end').</td></tr><tr><td>select_end</td><td>Sets span of selected text in template after template is inserted (used together with 'select_start').</td></tr><tr><td>clipboard</td><td>the text of the clipboard</td></tr></table></p><p>If you want to change the default delimiter to anything different, please use the configuration dialog to do so.</p></source> - <translation type="obsolete"><p>Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.</p><p>Příklad šablony: Toto je $VAR$</p><p>Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.</p><p>Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.</p><p>Pokud chcete proměnnou nějak formátovat, zadejte ':' a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:<table><tr> <td>ml</td> <td>Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.</td></tr><tr> <td>rl</td> <td>Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.</td></tr></table></p><p>V šablonách lze použít následující předdefinované proměnné:<table><tr><td>date</td><td>aktuální datum v ISO formátu (YYYY-MM-DD)</td></tr><tr><td>year</td><td>aktuální rok</td></tr><tr><td>project_name</td><td>jméno projektu (je-li nějaké)</td></tr><tr><td>project_path</td><td>cesta k projektu (je-li nějaká)</td></tr><tr><td>path_name</td><td>celá cesta k aktuálnímu souboru</td></tr><tr><td>dir_name</td><td>celá cesta k nadřazené složce</td></tr><tr><td>file_name</td><td>jméno aktuálního souboru (bez cesty)</td></tr><tr><td>base_name</td><td>stejně jako <i>file_name</i>, ale bez extenze</td></tr><tr><td>ext</td><td>extenze aktuálního souboru</td></tr><tr><td>cur_select</td><td>kurzorem vybraný text</td></tr><tr><td>insertion</td><td>Nastaví pozici kurzoru po té, co je šablona vložena.</td></tr><tr><td>select_start</td><td>Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s 'select_end').</td></tr><tr><td>select_end</td><td>Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s 'select_start').</td></tr><tr><td>clipboard</td><td>obsah schránky</td></tr></table></p><p>Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.</p></translation> - </message> -</context> -<context> <name>TemplateMultipleVariablesDialog</name> <message> <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/> @@ -73791,11 +71964,6 @@ <translation><b>Název šablony</p><p>Zadejte název šablony. Šablony mohou být autoamticky sestaveny na toto jméno. Z důvodu podpory automatického sestavení musí název šablony obsahovat pouze písmena (a-z a A-Z), čísla (0-9) a podtržítka (_).</p></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/> - <source><p>To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.</p><p>Example template: This is a $VAR$</p><p>When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you've entered.</p><p>If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.</p><p>If you want a variables contents to be treated specially, the variablename must be followed by a ':' and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:<table><tr><td>ml</td><td>Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.</td></tr><tr><td>rl</td><td>Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.</td></tr></table></p><p>The following predefined variables may be used in a template:<table><tr><td>date</td><td>today's date in ISO format (YYYY-MM-DD)</td></tr><tr><td>year</td><td>the current year</td></tr><tr><td>project_name</td><td>the name of the project (if any)</td></tr><tr><td>project_path</td><td>the path of the project (if any)</td></tr><tr><td>path_name</td><td>full path of the current file</td></tr><tr><td>dir_name</td><td>full path of the parent directory</td></tr><tr><td>file_name</td><td>the current file name (without directory)</td></tr><tr><td>base_name</td><td>like <i>file_name</i>, but without extension</td></tr><tr><td>ext</td><td>the extension of the current file</td></tr><tr><td>cur_select</td><td>the currently selected text</td></tr><tr><td>insertion</td><td>Sets insertion point for cursor after template is inserted.</td></tr><tr><td>select_start</td><td>Sets span of selected text in template after template is inserted (used together with 'select_end').</td></tr><tr><td>select_end</td><td>Sets span of selected text in template after template is inserted (used together with 'select_start').</td></tr><tr><td>clipboard</td><td>the text of the clipboard</td></tr></table></p><p>If you want to change the default delimiter to anything different, please use the configuration dialog to do so.</p></source> - <translation type="obsolete"><p>Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.</p><p>Příklad šablony: Toto je $VAR$</p><p>Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.</p><p>Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.</p><p>Pokud chcete proměnnou nějak formátovat, zadejte ':' a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:<table><tr> <td>ml</td> <td>Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.</td></tr><tr> <td>rl</td> <td>Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.</td></tr></table></p><p>V šablonách lze použít následující předdefinované proměnné:<table><tr><td>date</td><td>aktuální datum v ISO formátu (YYYY-MM-DD)</td></tr><tr><td>year</td><td>aktuální rok</td></tr><tr><td>project_name</td><td>jméno projektu (je-li nějaké)</td></tr><tr><td>project_path</td><td>cesta k projektu (je-li nějaká)</td></tr><tr><td>path_name</td><td>celá cesta k aktuálnímu souboru</td></tr><tr><td>dir_name</td><td>celá cesta k nadřazené složce</td></tr><tr><td>file_name</td><td>jméno aktuálního souboru (bez cesty)</td></tr><tr><td>base_name</td><td>stejně jako <i>file_name</i>, ale bez extenze</td></tr><tr><td>ext</td><td>extenze aktuálního souboru</td></tr><tr><td>cur_select</td><td>kurzorem vybraný text</td></tr><tr><td>insertion</td><td>Nastaví pozici kurzoru po té, co je šablona vložena.</td></tr><tr><td>select_start</td><td>Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s 'select_end').</td></tr><tr><td>select_end</td><td>Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s 'select_start').</td></tr><tr><td>clipboard</td><td>obsah schránky</td></tr></table></p><p>Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.</p></translation> - </message> - <message> <location filename="../Templates/TemplatePropertiesDialog.py" line="117"/> <source><b>Template Help</b></source> <translation type="unfinished"></translation> @@ -74186,18 +72354,6 @@ <translation></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="282"/> - <source>Select the icon via a file selection dialog</source> - <translation type="obsolete">Vybrat ikonu přes dialog výběru souborů</translation> - </message> - <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="285"/> - <source><b>Icon</b> -<p>Select the icon via a file selection dialog.</p></source> - <translation type="obsolete"><b>Ikona</b> -<p>Vybere se ikona přes dialog výběru souobru.</p></translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.ui" line="254"/> <source>Enter the filename of the executable</source> <translation>Zadejte jméno souboru, který má být spustilený</translation> @@ -74280,18 +72436,6 @@ <translation>Text &menu:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="293"/> - <source>Select the executable via a file selection dialog</source> - <translation type="obsolete">Výběr spustitelného přes dialog výběru souboru</translation> - </message> - <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="296"/> - <source><b>Executable</b> -<p>Select the executable via a file selection dialog.</p></source> - <translation type="obsolete"><b>Spustitelný soubor</b> -<p>Výběr spusttitelného přes dialog výběru souboru.</p></translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.ui" line="224"/> <source>Enter the filename of the icon</source> <translation>Zadejte jméno souboru ikony</translation> @@ -74384,11 +72528,6 @@ <translation>Vybraný soubor není spustitelný. Prosím, vyberte spustitelný soubor.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="297"/> - <source>Select icon file</source> - <translation type="obsolete">Vybrat soubor ikony</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="40"/> <source>Icon files (*.png)</source> <translation>Soubory ikon (*.png)</translation> @@ -74595,18 +72734,6 @@ <translation>Nastavení překladu</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="82"/> - <source>Show directory selection dialog</source> - <translation type="obsolete">Zobrazit dialog výběru adresáře</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="85"/> - <source><b>Binary Translations Path</b> -<p>Select the directory for the binary translations via a directory selection dialog.</p></source> - <translation type="obsolete"><b>Cesta k binárnímu překladu</b> -<p>Výběr adresáře binárního překladu přes dialog výběru adresáře.</p></translation> - </message> - <message> <location filename="../Project/TranslationPropertiesDialog.ui" line="57"/> <source>&Binary Translations Path:</source> <translation>Cesta k &binárnímu překladu:</translation> @@ -74699,23 +72826,6 @@ <translation>Zadejte vzorek cesty pro soubory s překlady</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="103"/> - <source>Select translation file</source> - <translation type="obsolete">Vybrat soubor s překladem</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="132"/> - <source>Select directory for binary translations</source> - <translation type="obsolete">Výběr adresáře pro binární překlady</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="74"/> - <source><b>Translation Pattern</b> -<p>Select a translation file via a file selection dialog.</p></source> - <translation type="obsolete"><b>Vzorek cesty k překladům</b> -<p>Vyberte soubor s překladem přes dialog výběru souboru.</p></translation> - </message> - <message> <location filename="../Project/TranslationPropertiesDialog.py" line="66"/> <source>Source Files ({0});;</source> <translation>Zdrojové soubory ({0});;</translation> @@ -75351,14 +73461,6 @@ </message> </context> <context> - <name>TransplantProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="135"/> - <source>The project should be reread. Do this now?</source> - <translation type="obsolete">Projekt bude znovu načten. Má se provést?</translation> - </message> -</context> -<context> <name>TrayStarter</name> <message> <location filename="../Tools/TrayStarter.py" line="70"/> @@ -76166,11 +74268,6 @@ <translation>Zadejte jméno &testu:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="88"/> - <source>Open a file selection dialog</source> - <translation type="obsolete">Otevřít dialog výběru souboru</translation> - </message> - <message> <location filename="../PyUnit/UnittestDialog.ui" line="26"/> <source>Enter test &filename:</source> <translation>Zadejte jméno &souboru s testem:</translation> @@ -77208,11 +75305,6 @@ <translation>E&xtra funkce</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3317"/> - <source>&Tools</source> - <translation type="obsolete">&Nástroje</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2758"/> <source>Select Tool Group</source> <translation>Vybrat skupinu nástrojů</translation> @@ -77263,7 +75355,7 @@ <translation><h3>Čísla verzí</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6953"/> + <location filename="../UI/UserInterface.py" line="6956"/> <source></table></source> <translation></table></translation> </message> @@ -77343,12 +75435,12 @@ <translation>Zahodit chybu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Error during updates check</source> <translation>Chyba během zjišťování aktualizací</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>Update available</source> <translation>Byla nalezena aktualizace</translation> </message> @@ -77363,17 +75455,17 @@ <translation>Zobrazit externí nás&troje</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Could not perform updates check.</source> <translation>Kontrolu updatů nelze provést.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>&Cancel</source> <translation>&Zrušit</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>First time usage</source> <translation>Spuštěno poprvé</translation> </message> @@ -77468,7 +75560,7 @@ <translation>Zobrazit dostupné verze ke stažení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6939"/> + <location filename="../UI/UserInterface.py" line="6942"/> <source><h3>Available versions</h3><table></source> <translation><h3>Dostupné verze</h3><table></translation> </message> @@ -77937,7 +76029,7 @@ <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6737"/> + <location filename="../UI/UserInterface.py" line="6740"/> <source>Trying host {0}</source> <translation>Zkouším host {0}</translation> </message> @@ -78012,12 +76104,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6794"/> + <location filename="../UI/UserInterface.py" line="6797"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -78032,7 +76124,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -78123,7 +76215,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7009"/> + <location filename="../UI/UserInterface.py" line="7012"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -78508,7 +76600,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -78528,7 +76620,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6732"/> + <location filename="../UI/UserInterface.py" line="6735"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -78603,22 +76695,22 @@ <translation type="unfinished">Qt v.3 není podporováno v eric5. {3 ?} {6.?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished">Aktualizace <b>{0}</b> eric5 je připravena na <b>{1}</b>. Chcete ji stáhnout a nainstalovat? {0}?} {6 ?} {1}?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric5 je aktuální {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>You are using the latest version of eric6</source> <translation type="unfinished">Používáte poslední verzi eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric5 nebyl ještě nakonfigurován. Bude spuštěn konfigurační dialog. {6 ?}</translation> </message> @@ -78638,7 +76730,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6748"/> + <location filename="../UI/UserInterface.py" line="6751"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -78723,17 +76815,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6873"/> + <location filename="../UI/UserInterface.py" line="6876"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -83373,18 +81465,18 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="65"/> <source>Virtualenv Target Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="70"/> <source>Python Interpreter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/> - <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source> + <source>Select,if this is a global environment (i.e. no virtual environment directory to be given)</source> <translation type="unfinished"></translation> </message> <message> @@ -83398,12 +81490,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="155"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="75"/> <source>Enter the executable search path to be prepended to the PATH environment variable. Use '{0}' as the separator.</source> <translation type="unfinished"></translation> </message> @@ -83420,7 +81512,7 @@ </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> - <source>Select, if this is an Conda environment</source> + <source>Select, if this is a Conda environment</source> <translation type="unfinished"></translation> </message> <message> @@ -83428,6 +81520,16 @@ <source>Conda Environment</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="130"/> + <source>Select, if this is a remotely accessed environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="133"/> + <source>Remote Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name> @@ -83848,52 +81950,52 @@ <context> <name>VirtualenvManager</name> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="187"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="194"/> <source>Add Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="187"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="194"/> <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="244"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="255"/> <source>Change Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="293"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="307"/> <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="293"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="307"/> <source>Rename Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="371"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="387"/> <source>{0} - {1}</source> <translation type="unfinished">{0} - {1}</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="322"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>Delete Virtual Environments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="322"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>Do you really want to delete these virtual environments?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="376"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="392"/> <source>Remove Virtual Environments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="376"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="392"/> <source>Do you really want to remove these virtual environments?</source> <translation type="unfinished"></translation> </message> @@ -84919,11 +83021,6 @@ <translation type="unfinished">Soukromí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="242"/> - <source>Select to enable JavaScript</source> - <translation type="obsolete">Vybrat pro zapnutí JavaScriptu</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="465"/> <source>Enable JavaScript</source> <translation type="unfinished">Zapnout JavaScript</translation> @@ -85712,11 +83809,6 @@ </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1027"/> - <source>&Close</source> - <translation type="obsolete">&Zavřít</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1032"/> <source>&Quit</source> <translation type="unfinished">&Konec</translation> @@ -87691,11 +85783,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="1878"/> - <source>&Go</source> - <translation type="obsolete">&Jít</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="2057"/> <source>H&istory</source> <translation type="unfinished">H&istorie</translation> @@ -87721,11 +85808,6 @@ <translation type="unfinished">&Nástroje</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="1967"/> - <source>&Window</source> - <translation type="obsolete">O&kno</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="2165"/> <source>&Help</source> <translation type="unfinished">&Nápověda</translation> @@ -87776,11 +85858,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2054"/> - <source>Go</source> - <translation type="obsolete">Jít</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="2415"/> <source>VirusTotal</source> <translation type="unfinished"></translation> @@ -87811,11 +85888,6 @@ <translation type="unfinished">OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2209"/> - <source>Help Files (*.html *.htm);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> - <translation type="obsolete">Help soubory (*.html *.htm);;PDF soubory (*.pdf);;CHM soubory (*.chm);;Všechny soubory (*)</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="2619"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> @@ -88616,12 +86688,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="393"/> + <location filename="../eric6.py" line="394"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="398"/> + <location filename="../eric6.py" line="399"/> <source>Generating Main Window...</source> <translation type="unfinished">Generování hlavního okna...</translation> </message>
--- a/i18n/eric6_de.ts Wed Feb 13 20:39:03 2019 +0100 +++ b/i18n/eric6_de.ts Wed Feb 13 20:39:58 2019 +0100 @@ -6665,42 +6665,42 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source>Start Debugger</source> <translation>Debugger starten</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="960"/> <source>Parent Process</source> <translation>Vaterprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="961"/> <source>Child process</source> <translation>Kindprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Forkpfad.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source>Debug Protocol Error</source> <translation>Fehler im Debugprotokoll</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>Die vom Debugger empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.</p><p>Fehler: {0}</p><p>Daten:<br/>{1}</p></translation> </message> @@ -17660,7 +17660,7 @@ <translation>Der git-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1561"/> <source>The git process did not finish within 30s.</source> <translation>Der git-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -17835,362 +17835,362 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source>Create {0} file</source> <translation>Erzeuge {0}-Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <source>Git Copy</source> <translation>Git Kopiere</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1430"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>Das Kopieren des Verzeichnisses <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>Das Kopieren der Datei <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source>Git Side-by-Side Difference</source> <translation>Git Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1681"/> <source>Fetching from a remote Git repository</source> <translation>Änderungen von einem entfernten Git Repository abholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1719"/> <source>Pulling from a remote Git repository</source> <translation>Pull von einem entfernten Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1760"/> <source>Pushing to a remote Git repository</source> <translation>Push in ein entferntes Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1788"/> <source>Committing failed merge</source> <translation>Fehlgeschlagene Zusammenführung abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1815"/> <source>Aborting uncommitted/failed merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1965"/> <source>Tagging in the Git repository</source> <translation>Marke im Git-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2196"/> <source>Branching in the Git repository</source> <translation>Zweig im Git-Repository erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2236"/> <source>Delete Remote Branch</source> <translation>Entfernten Zweig löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <source>Current Branch</source> <translation>Aktueller Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation><p>Der aktuelle Zweig ist <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2321"/> <source>Create Bundle</source> <translation>Paket erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2286"/> <source>Git Bundle Files (*.bundle)</source> <translation>Git Paketdateien (*.bundle)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2303"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Git Paketdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2351"/> <source>Verify Bundle</source> <translation>Paket verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation>Git Paketdateien (*.bundle);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2381"/> <source>List Bundle Heads</source> <translation>Köpfe des Pakets anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Apply Bundle</source> <translation>Paket anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2504"/> <source>Applying a bundle file (fetch)</source> <translation>Paketdatei anwenden (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2531"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2734"/> <source>Git Bisect ({0})</source> <translation>Git-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <source>Create Bisect Replay File</source> <translation>Erzeuge Bisect Wiederholungsdatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2640"/> <source>Git Bisect Replay Files (*.replay)</source> <translation>Git Bisect Wiederholungsdateien (*.replay)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2657"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Git Wiederholungsdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden.<br/>Grund: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2695"/> <source>Edit Bisect Replay File</source> <translation>Bisect Wiederholungsdatei bearbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation>Git Bisect Wiederholungsdateien (*.replay);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Bisect Replay</source> <translation>Bisect wiederholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3074"/> <source>Show Remote Info</source> <translation>Zeige entfernte Informationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Rename Remote Repository</source> <translation>Entferntes Repository umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Enter new name for remote repository:</source> <translation>Gib einen Namen für das entfernte Repository ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3098"/> <source>Show Shortlog</source> <translation>Kurzbeschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3156"/> <source>Cherry-pick</source> <translation>Aussuchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3186"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3211"/> <source>Copy Changesets (Quit)</source> <translation>Änderungssätze kopieren (Beenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3237"/> <source>Copy Changesets (Cancel)</source> <translation>Änderungssätze kopieren (Abbrechen)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3317"/> <source>Saving stash</source> <translation>Ablage sichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Show Stash</source> <translation>Ablage anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Select a stash (empty for latest stash):</source> <translation>Wähle eine Ablage (leer für aktuellste):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3428"/> <source>Restore Stash</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3442"/> <source>Restoring stash</source> <translation>Stelle Ablage wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3476"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3466"/> <source>Enter a branch name to restore a stash to:</source> <translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3491"/> <source>Creating branch</source> <translation>Erzeuge Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <source>Delete Stash</source> <translation>Ablage löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/> <source>Deleting stash</source> <translation>Lösche Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Delete All Stashes</source> <translation>Alle Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Do you really want to delete all stashes?</source> <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3564"/> <source>Deleting all stashes</source> <translation>Lösche alle Ablagen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3636"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3662"/> <source>Verifying the integrity of the Git repository</source> <translation>Verifiziere die Integrität des Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3687"/> <source>Performing Repository Housekeeping</source> <translation>Führe Repository Reorganisation durch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3731"/> <source><tr><td><b>Statistics</b></td></tr></source> <translation><tr><td><b>Statistik</b></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3760"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch wertlose Dateien: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3766"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>Keine Statistik verfügbar.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3832"/> <source>Creating Archive</source> <translation>Erzeuge Archiv</translation> </message> @@ -18205,72 +18205,72 @@ <translation><p>Soll wirklich auf <b>{0}</b> umgeschaltet werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1848"/> <source>Applying patch</source> <translation>Patch anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> - <source>Check patch files</source> - <translation>Patchdateien prüfen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> + <source>Check patch files</source> + <translation>Patchdateien prüfen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1883"/> <source>Apply patch files</source> <translation>Patchdateien anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3875"/> <source>Add Submodule</source> <translation>Submodul hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>List Submodules</source> <translation>Submodule auflisten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>No submodules defined for the project.</source> <translation>Für das Projekt sind keine Submodule definiert.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> - <source>All</source> - <translation>Alle</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <source>All</source> + <translation>Alle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Submodule Path</source> <translation>Submodulpfad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Select a submodule path:</source> <translation>Wähle einen Submodulpfad:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4016"/> <source>Initialize Submodules</source> <translation>Submodule initialisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4053"/> <source>Unregister Submodules</source> <translation>Submodule deregistrieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4133"/> <source>Update Submodules</source> <translation>Submodule aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4167"/> <source>Synchronize Submodules</source> <translation>Submodule synchronisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4225"/> <source>Submodules Summary</source> <translation>Submodulüberblick</translation> </message> @@ -23771,12 +23771,12 @@ <translation>Aktion &erzwingen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="103"/> <source>Select Submodule Repository Directory</source> <translation>Submodulrepositoryverzeichnis auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="129"/> <source>Select Submodule Directory</source> <translation>Submodulverzeichnis auswählen</translation> </message> @@ -46417,47 +46417,47 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="181"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="197"/> <source>SSL Certificate Error</source> <translation>SSL Zertifikatsfehler</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="182"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="198"/> <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> <translation><b>{0}</b><p>Die Seite, auf die zugegriffen werden soll, besitzt Fehler in ihrem SSL Zertifikat.</p><ul><li>{1}</li></ul><p>Soll eine Ausnahme erstellt werden?</p></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="192"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="208"/> <source>&Permanent accept</source> <translation>&Immer akzeptieren</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="210"/> <source>&Temporary accept</source> <translation>&Vorläufig akzeptieren</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="196"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Reject</source> <translation>&Ablehnen</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="229"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="245"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Gib Nutzernamen und Kennwort für „{0}“ und Realm „{1}“ ein</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="232"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="248"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Gib Nutzernamen und Kennwort für „{0}“ ein</b></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="275"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="291"/> <source>Authentication required</source> <translation>Authentisierung erforderlich</translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="276"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="292"/> <source>Authentication is required to access:</source> <translation>Eine Authentisierung ist zum Zugriff auf diese URL erforderlich:</translation> </message> @@ -75805,12 +75805,12 @@ <translation><p>Der PyQt4-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Error during updates check</source> <translation>Fehler während der Aktualisierungsprüfung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>Update available</source> <translation>Aktualisierung verfügbar</translation> </message> @@ -75820,7 +75820,7 @@ <translation><h3>Versionsnummern</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6953"/> + <location filename="../UI/UserInterface.py" line="6956"/> <source></table></source> <translation></table></translation> </message> @@ -75845,22 +75845,22 @@ <translation>Zeige externe &Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Could not perform updates check.</source> <translation>Konnte keine Aktualisierungsprüfung durchführen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>&Cancel</source> <translation>&Abbrechen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6737"/> + <location filename="../UI/UserInterface.py" line="6740"/> <source>Trying host {0}</source> <translation>Prüfe Host {0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>First time usage</source> <translation>Erstmalige Nutzung</translation> </message> @@ -75955,7 +75955,7 @@ <translation>Zeige die verfügbaren eric-Versionen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6939"/> + <location filename="../UI/UserInterface.py" line="6942"/> <source><h3>Available versions</h3><table></source> <translation><h3>Verfügbare Versionen</h3><table></translation> </message> @@ -76405,12 +76405,12 @@ <translation><b>Python 2-Dokumentation</b><p>Zeigt die Python 2-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 2-Dokumentation gesucht wird, unter Windows das Verzeichnis <i>doc</i> unter dem Verzeichnis, in dem der konfigurierte Python 2-Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html/python-docs-html</i>. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON2DOCDIR setzen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>Error getting versions information</source> <translation>Fehler beim Herunterladen der Versionsinformationen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6794"/> + <location filename="../UI/UserInterface.py" line="6797"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>Die Versionsinformationen konnten nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -76425,7 +76425,7 @@ <translation>Der Systemwebbrowser konnte nicht gestartet werden</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>Die Versionsinformationen konnten seit 7 Tagen nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -76516,7 +76516,7 @@ <translation><p>Die Bildschirmfotoanwendung konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7009"/> + <location filename="../UI/UserInterface.py" line="7012"/> <source>Select Workspace Directory</source> <translation>Wähle Arbeitsverzeichnis</translation> </message> @@ -76901,7 +76901,7 @@ <translation><b>Python 3-Dokumentation</b><p>Zeigt die Python 3-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 3-Dokumentation gesucht wird, unter Windows das Verzeichnis <i>doc</i> unter dem Verzeichnis, in dem der Python 3-Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html</i>. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON3DOCDIR setzen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -76921,7 +76921,7 @@ <translation><b>Zeige Fehlerbericht...</b><p>Dies öffnet einen Dialog zur Anzeige des aktuellsten Fehlerberichtes.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6732"/> + <location filename="../UI/UserInterface.py" line="6735"/> <source>Version Check</source> <translation>Versionsprüfung</translation> </message> @@ -76997,22 +76997,22 @@ <translation>Qt v.3 wird von eric6 nicht unterstützt.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Eine Aktualisierung auf <b>{0}</b> von Eric6 ist unter <b>{1}</b> verfügbar. Wollen Sie sie laden?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>Eric6 is up to date</source> <translation>Eric6 ist aktuell</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>You are using the latest version of eric6</source> <translation>Sie verwenden die aktuellste Version von eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>eric6 wurde noch nicht konfiguriert. Der Konfigurationsdialog wird nun gestartet.</translation> </message> @@ -77032,7 +77032,7 @@ <translation>Keine Benutzerwerkzeuge konfiguriert</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6748"/> + <location filename="../UI/UserInterface.py" line="6751"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>Die Versionsinformationen konnten nicht heruntergeladen werden, da sie <b>nicht verbunden</b> sind. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -77117,17 +77117,17 @@ <translation>Initialisiere Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>Update Check</source> <translation>Aktualisierungsprüfung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Eric wurde direkt von vom Quelltext installiert. Eine Aktualitätsprüfung ist daher nicht möglich.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6873"/> + <location filename="../UI/UserInterface.py" line="6876"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Sie verwenden ein Snapshot-Release von eri6. Eine neueres, stabiles Release könnte verfügbar sein.</translation> </message> @@ -81746,19 +81746,19 @@ <translation>Gib den Python Interpreter der virtuellen Umgebung ein</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="65"/> <source>Virtualenv Target Directory</source> <translation>Zielverzeichnis der virtullen Umgebung</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="70"/> <source>Python Interpreter</source> <translation>Python Interpreter</translation> </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/> - <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source> - <translation>Auswählen, um eine globale Umgebung anzudeuten (d.h. es wird keine Verzeichnis für die virtuelle Umgebung angegeben)</translation> + <source>Select,if this is a global environment (i.e. no virtual environment directory to be given)</source> + <translation>Auswählen, wenn dies eine globale Umgebung ist (d.h. es wird kein Verzeichnis für die virtuelle Umgebung angegeben)</translation> </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> @@ -81771,12 +81771,12 @@ <translation>Wähle die Pythonvariante</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="155"/> <source>PATH Prefix:</source> <translation>PATH Präfix:</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="75"/> <source>Enter the executable search path to be prepended to the PATH environment variable. Use '{0}' as the separator.</source> <translation>Gib den Suchpfad ein, der der PATH Umgebungsvariablen vorangestellt werden soll. Verwende '{0}' als Trenner.</translation> </message> @@ -81794,7 +81794,7 @@ </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> - <source>Select, if this is an Conda environment</source> + <source>Select, if this is a Conda environment</source> <translation>Auswählen, wenn dies eine Conda Umgebung ist</translation> </message> <message> @@ -81802,6 +81802,16 @@ <source>Conda Environment</source> <translation>Conda Umgebung</translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="130"/> + <source>Select, if this is a remotely accessed environment</source> + <translation>Auswählen, wenn dies eine Umgebung über Fernzugriff ist</translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="133"/> + <source>Remote Environment</source> + <translation>Umgebung über Fernzugriff</translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name> @@ -82244,52 +82254,52 @@ <context> <name>VirtualenvManager</name> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="187"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="194"/> <source>Add Virtual Environment</source> <translation>Virtuelle Umgebung hinzufügen</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="187"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="194"/> <source>A virtual environment named <b>{0}</b> exists already. Shall it be replaced?</source> <translation>Eine virtuelle Umgebung mit Namen <b>{0}</b> existiert bereits. Soll sie ersetzt werden?</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="244"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="255"/> <source>Change Virtual Environment</source> <translation>Virtuelle Umgebung ändern</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="293"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="307"/> <source>A virtual environment named <b>{0}</b> does not exist. Aborting!</source> <translation>Eine virtuelle Umgebung mit Namen <b>{0}</b> existiert nicht. Abbruch!</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="293"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="307"/> <source>Rename Virtual Environment</source> <translation>Virtuelle Umgebung umbenennen</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="371"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="387"/> <source>{0} - {1}</source> <translation>{0} – {1}</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="322"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>Delete Virtual Environments</source> <translation>Virtuelle Umgebung löschen</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="322"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/> <source>Do you really want to delete these virtual environments?</source> <translation>Sollen diese virtuellen Umgebungen wirklich gelöscht werden?</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="376"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="392"/> <source>Remove Virtual Environments</source> <translation>Virtuelle Umgebung entfernen</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvManager.py" line="376"/> + <location filename="../VirtualEnv/VirtualenvManager.py" line="392"/> <source>Do you really want to remove these virtual environments?</source> <translation>Sollen diese virtuellen Umgebungen wirklich entfernt werden?</translation> </message> @@ -87008,12 +87018,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="393"/> + <location filename="../eric6.py" line="394"/> <source>Starting...</source> <translation>Starte...</translation> </message> <message> - <location filename="../eric6.py" line="398"/> + <location filename="../eric6.py" line="399"/> <source>Generating Main Window...</source> <translation>Erzeuge das Hauptfenster...</translation> </message>
--- a/i18n/eric6_empty.ts Wed Feb 13 20:39:03 2019 +0100 +++ b/i18n/eric6_empty.ts Wed Feb 13 20:39:58 2019 +0100 @@ -6597,42 +6597,42 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source>Start Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="465"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="960"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="961"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="962"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source>Debug Protocol Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1008"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished"></translation> </message> @@ -17533,7 +17533,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1561"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -17713,432 +17713,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source>Create {0} file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1386"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <source>Git Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1430"/> <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="1442"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1445"/> <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="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source>Git Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1681"/> <source>Fetching from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1719"/> <source>Pulling from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1760"/> <source>Pushing to a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1788"/> <source>Committing failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1815"/> <source>Aborting uncommitted/failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1848"/> <source>Applying patch</source> <translation type="unfinished"></translation> </message> <message> - <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="1880"/> + <source>Check patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1883"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1965"/> <source>Tagging in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2196"/> <source>Branching in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2236"/> <source>Delete Remote Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <source>Current Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2257"/> <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="2318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2321"/> <source>Create Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2286"/> <source>Git Bundle Files (*.bundle)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2303"/> <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="2348"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2351"/> <source>Verify Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2381"/> <source>List Bundle Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2481"/> <source>Apply Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2504"/> <source>Applying a bundle file (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2531"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2734"/> <source>Git Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2630"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <source>Create Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2640"/> <source>Git Bisect Replay Files (*.replay)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2657"/> <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="2671"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2674"/> <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="2692"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2695"/> <source>Edit Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722"/> <source>Bisect Replay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3074"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2953"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3098"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3156"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3186"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3211"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3237"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3317"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3428"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3442"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3476"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3466"/> <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="3488"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3491"/> <source>Creating branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <source>Delete Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3525"/> <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="3533"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/> <source>Deleting stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Delete All Stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3556"/> <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3564"/> <source>Deleting all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3636"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3662"/> <source>Verifying the integrity of the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3687"/> <source>Performing Repository Housekeeping</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3731"/> <source><tr><td><b>Statistics</b></td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> <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="3733"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> <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="3737"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> <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="3741"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> <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="3745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> <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="3749"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> <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="3753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <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="3757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3760"/> <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="3763"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3766"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3832"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3875"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3945"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> - <source>All</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3963"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4016"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4053"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4133"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4167"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4225"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -23616,12 +23616,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="103"/> <source>Select Submodule Repository Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py" line="129"/> <source>Select Submodule Directory</source> <translation type="unfinished"></translation> </message> @@ -46179,47 +46179,47 @@ <context> <name>NetworkManager</name> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="181"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="197"/> <source>SSL Certificate Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="182"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="198"/> <source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="192"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="208"/> <source>&Permanent accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="210"/> <source>&Temporary accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="196"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/> <source>&Reject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="229"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="245"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="232"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="248"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="275"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="291"/> <source>Authentication required</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/NetworkManager.py" line="276"/> + <location filename="../WebBrowser/Network/NetworkManager.py" line="292"/> <source>Authentication is required to access:</source> <translation type="unfinished"></translation> </message> @@ -76090,7 +76090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6953"/> + <location filename="../UI/UserInterface.py" line="6956"/> <source></table></source> <translation type="unfinished"></translation> </message> @@ -76352,92 +76352,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6728"/> + <location filename="../UI/UserInterface.py" line="6731"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6732"/> + <location filename="../UI/UserInterface.py" line="6735"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6737"/> + <location filename="../UI/UserInterface.py" line="6740"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6748"/> + <location filename="../UI/UserInterface.py" line="6751"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6794"/> + <location filename="../UI/UserInterface.py" line="6797"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6801"/> + <location filename="../UI/UserInterface.py" line="6804"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6898"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6908"/> + <location filename="../UI/UserInterface.py" line="6911"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6915"/> + <location filename="../UI/UserInterface.py" line="6918"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6939"/> + <location filename="../UI/UserInterface.py" line="6942"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6990"/> + <location filename="../UI/UserInterface.py" line="6993"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7009"/> + <location filename="../UI/UserInterface.py" line="7012"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -76492,17 +76492,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6883"/> + <location filename="../UI/UserInterface.py" line="6886"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6873"/> + <location filename="../UI/UserInterface.py" line="6876"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -81104,18 +81104,18 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="65"/> <source>Virtualenv Target Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="70"/> <source>Python Interpreter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/> - <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source> + <source>Select,if this is a global environment (i.e. no virtual environment directory to be given)</source> <translation type="unfinished"></translation> </message> <message> @@ -81129,12 +81129,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="155"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="75"/> <source>Enter the executable search path to be prepended to the PATH environment variable. Use '{0}' as the separator.</source> <translation type="unfinished"></translation> </message> @@ -81151,7 +81151,7 @@ </message> <message> <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> - <source>Select, if this is an Conda environment</source>