Mercurial Repositories > eric / changeset
changeset
Finished implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Mon, 10 Apr 2017 19:14:40 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 10 Apr 2017 19:14:40 +0200
- changeset 5697
- ee81081a0ff7
- parent 5696
- 68af0e9c57ad
- child 5698
- c8ac900389bf
- child 5699
- 0e40b560dcd1
Finished implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
--- a/APIs/Python3/eric6.api Sun Apr 09 19:41:35 2017 +0200 +++ b/APIs/Python3/eric6.api Mon Apr 10 19:14:40 2017 +0200 @@ -1657,6 +1657,7 @@ eric6.Globals.findPythonInterpreters?4(pyVersion) eric6.Globals.getConfigDir?4() eric6.Globals.getPyQt5ModulesDirectory?4() +eric6.Globals.getPyQtToolsPath?4(version=5) eric6.Globals.getPythonModulesDirectory?4() eric6.Globals.getQtBinariesPath?4() eric6.Globals.isLinuxPlatform?4() @@ -9182,6 +9183,7 @@ eric6.Utilities.fromNativeSeparators?4(path) eric6.Utilities.generateDistroInfo?4(linesep='\n') eric6.Utilities.generatePluginsVersionInfo?4(linesep='\n') +eric6.Utilities.generatePyQtToolPath?4(toolname) eric6.Utilities.generatePySideToolPath?4(toolname) eric6.Utilities.generateQtToolName?4(toolname) eric6.Utilities.generateVersionInfo?4(linesep='\n')
--- a/Documentation/Help/source.qhp Sun Apr 09 19:41:35 2017 +0200 +++ b/Documentation/Help/source.qhp Mon Apr 10 19:14:40 2017 +0200 @@ -16572,6 +16572,7 @@ <keyword name="fromNativeSeparators" id="fromNativeSeparators" ref="eric6.Utilities.__init__.html#fromNativeSeparators" /> <keyword name="generateDistroInfo" id="generateDistroInfo" ref="eric6.Utilities.__init__.html#generateDistroInfo" /> <keyword name="generatePluginsVersionInfo" id="generatePluginsVersionInfo" ref="eric6.Utilities.__init__.html#generatePluginsVersionInfo" /> + <keyword name="generatePyQtToolPath" id="generatePyQtToolPath" ref="eric6.Utilities.__init__.html#generatePyQtToolPath" /> <keyword name="generatePySideToolPath" id="generatePySideToolPath" ref="eric6.Utilities.__init__.html#generatePySideToolPath" /> <keyword name="generateQtToolName" id="generateQtToolName" ref="eric6.Utilities.__init__.html#generateQtToolName" /> <keyword name="generateVersionInfo" id="generateVersionInfo" ref="eric6.Utilities.__init__.html#generateVersionInfo" /> @@ -16664,6 +16665,7 @@ <keyword name="getProjectBrowserColour" id="getProjectBrowserColour" ref="eric6.Preferences.__init__.html#getProjectBrowserColour" /> <keyword name="getProjectBrowserFlags" id="getProjectBrowserFlags" ref="eric6.Preferences.__init__.html#getProjectBrowserFlags" /> <keyword name="getPyQt5ModulesDirectory" id="getPyQt5ModulesDirectory" ref="eric6.Globals.__init__.html#getPyQt5ModulesDirectory" /> + <keyword name="getPyQtToolsPath" id="getPyQtToolsPath" ref="eric6.Globals.__init__.html#getPyQtToolsPath" /> <keyword name="getPython" id="getPython" ref="eric6.Preferences.__init__.html#getPython" /> <keyword name="getPythonLibPath" id="getPythonLibPath" ref="eric6.Utilities.__init__.html#getPythonLibPath" /> <keyword name="getPythonModulesDirectory" id="getPythonModulesDirectory" ref="eric6.Globals.__init__.html#getPythonModulesDirectory" />
--- a/Documentation/Source/eric6.Globals.__init__.html Sun Apr 09 19:41:35 2017 +0200 +++ b/Documentation/Source/eric6.Globals.__init__.html Mon Apr 10 19:14:40 2017 +0200 @@ -46,6 +46,9 @@ <td><a href="#getPyQt5ModulesDirectory">getPyQt5ModulesDirectory</a></td> <td>Function to determine the path to PyQt5's (or PyQt4's) modules directory.</td> </tr><tr> +<td><a href="#getPyQtToolsPath">getPyQtToolsPath</a></td> +<td>Module function to get the path of the PyQt tools.</td> +</tr><tr> <td><a href="#getPythonModulesDirectory">getPythonModulesDirectory</a></td> <td>Function to determine the path to Python's modules directory.</td> </tr><tr> @@ -141,6 +144,29 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="getPyQtToolsPath" ID="getPyQtToolsPath"></a> +<h2>getPyQtToolsPath</h2> +<b>getPyQtToolsPath</b>(<i>version=5</i>) +<p> + Module function to get the path of the PyQt tools. +</p><dl> +<dt><i>version</i> (int)</dt> +<dd> +PyQt major version +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +path to the PyQt tools +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="getPythonModulesDirectory" ID="getPythonModulesDirectory"></a> <h2>getPythonModulesDirectory</h2> <b>getPythonModulesDirectory</b>(<i></i>)
--- a/Documentation/Source/eric6.Project.ProjectFormsBrowser.html Sun Apr 09 19:41:35 2017 +0200 +++ b/Documentation/Source/eric6.Project.ProjectFormsBrowser.html Mon Apr 10 19:14:40 2017 +0200 @@ -135,10 +135,10 @@ <td>Private slot to handle the Open in Editor menu action.</td> </tr><tr> <td><a href="#ProjectFormsBrowser.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal of the pyuic/rbuic process.</td> +<td>Private slot to handle the readyReadStandardError signal of the pyuic4/pyuic5/pyside-uic/rbuic4 process.</td> </tr><tr> <td><a href="#ProjectFormsBrowser.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal of the pyuic/rbuic process.</td> +<td>Private slot to handle the readyReadStandardOutput signal of the pyuic4/pyuic5/pyside-uic/rbuic4 process.</td> </tr><tr> <td><a href="#ProjectFormsBrowser.__showContextMenu">__showContextMenu</a></td> <td>Private slot called by the menu aboutToShow signal.</td> @@ -301,13 +301,13 @@ <b>__readStderr</b>(<i></i>) <p> Private slot to handle the readyReadStandardError signal of the - pyuic/rbuic process. + pyuic4/pyuic5/pyside-uic/rbuic4 process. </p><a NAME="ProjectFormsBrowser.__readStdout" ID="ProjectFormsBrowser.__readStdout"></a> <h4>ProjectFormsBrowser.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> Private slot to handle the readyReadStandardOutput signal of the - pyuic/rbuic process. + pyuic4/pyuic5/pyside-uic/rbuic4 process. </p><a NAME="ProjectFormsBrowser.__showContextMenu" ID="ProjectFormsBrowser.__showContextMenu"></a> <h4>ProjectFormsBrowser.__showContextMenu</h4> <b>__showContextMenu</b>(<i></i>)
--- a/Documentation/Source/eric6.Project.ProjectResourcesBrowser.html Sun Apr 09 19:41:35 2017 +0200 +++ b/Documentation/Source/eric6.Project.ProjectResourcesBrowser.html Mon Apr 10 19:14:40 2017 +0200 @@ -112,10 +112,10 @@ <td>Private slot to handle the Open menu action.</td> </tr><tr> <td><a href="#ProjectResourcesBrowser.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal of the pyrcc4/rbrcc process.</td> +<td>Private slot to handle the readyReadStandardError signal of the pyrcc4/pyrcc5/pyside-rcc/rbrcc process.</td> </tr><tr> <td><a href="#ProjectResourcesBrowser.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal of the pyrcc4/rbrcc process.</td> +<td>Private slot to handle the readyReadStandardOutput signal of the pyrcc4/pyrcc5/pyside-rcc/rbrcc process.</td> </tr><tr> <td><a href="#ProjectResourcesBrowser.__showContextMenu">__showContextMenu</a></td> <td>Private slot called by the menu aboutToShow signal.</td> @@ -266,13 +266,13 @@ <b>__readStderr</b>(<i></i>) <p> Private slot to handle the readyReadStandardError signal of the - pyrcc4/rbrcc process. + pyrcc4/pyrcc5/pyside-rcc/rbrcc process. </p><a NAME="ProjectResourcesBrowser.__readStdout" ID="ProjectResourcesBrowser.__readStdout"></a> <h4>ProjectResourcesBrowser.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> Private slot to handle the readyReadStandardOutput signal of the - pyrcc4/rbrcc process. + pyrcc4/pyrcc5/pyside-rcc/rbrcc process. </p><a NAME="ProjectResourcesBrowser.__showContextMenu" ID="ProjectResourcesBrowser.__showContextMenu"></a> <h4>ProjectResourcesBrowser.__showContextMenu</h4> <b>__showContextMenu</b>(<i></i>)
--- a/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html Sun Apr 09 19:41:35 2017 +0200 +++ b/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html Mon Apr 10 19:14:40 2017 +0200 @@ -119,7 +119,7 @@ <td>Private method to generate selected translation files (.ts) for Qt Linguist.</td> </tr><tr> <td><a href="#ProjectTranslationsBrowser.__generateTSFile">__generateTSFile</a></td> -<td>Private method used to run pylupdate/pylupdate4 to generate the .ts files.</td> +<td>Private method used to run pylupdate4/pylupdate5/pyside-lupdate to generate the .ts files.</td> </tr><tr> <td><a href="#ProjectTranslationsBrowser.__generateTSFileDone">__generateTSFileDone</a></td> <td>Private slot to handle the finished signal of the pylupdate process.</td> @@ -134,7 +134,7 @@ <td>Private slot to handle the readyReadStandardError signal of the lrelease process.</td> </tr><tr> <td><a href="#ProjectTranslationsBrowser.__readStderrLupdate">__readStderrLupdate</a></td> -<td>Private slot to handle the readyReadStandardError signal of the pylupdate process.</td> +<td>Private slot to handle the readyReadStandardError signal of the pylupdate4/pylupdate5/pyside-lupdate process.</td> </tr><tr> <td><a href="#ProjectTranslationsBrowser.__readStdout">__readStdout</a></td> <td>Private method to read from a process' stdout channel.</td> @@ -270,8 +270,8 @@ <h4>ProjectTranslationsBrowser.__generateTSFile</h4> <b>__generateTSFile</b>(<i>noobsolete=False, generateAll=True</i>) <p> - Private method used to run pylupdate/pylupdate4 to generate the .ts - files. + Private method used to run pylupdate4/pylupdate5/pyside-lupdate to + generate the .ts files. </p><dl> <dt><i>noobsolete</i></dt> <dd> @@ -324,7 +324,7 @@ <b>__readStderrLupdate</b>(<i></i>) <p> Private slot to handle the readyReadStandardError signal of the - pylupdate process. + pylupdate4/pylupdate5/pyside-lupdate process. </p><a NAME="ProjectTranslationsBrowser.__readStdout" ID="ProjectTranslationsBrowser.__readStdout"></a> <h4>ProjectTranslationsBrowser.__readStdout</h4> <b>__readStdout</b>(<i>proc, ps</i>)
--- a/Documentation/Source/eric6.Utilities.__init__.html Sun Apr 09 19:41:35 2017 +0200 +++ b/Documentation/Source/eric6.Utilities.__init__.html Mon Apr 10 19:14:40 2017 +0200 @@ -103,6 +103,9 @@ <td><a href="#generatePluginsVersionInfo">generatePluginsVersionInfo</a></td> <td>Module function to generate a string with plugins version infos.</td> </tr><tr> +<td><a href="#generatePyQtToolPath">generatePyQtToolPath</a></td> +<td>Module function to generate the executable path for a PyQt tool.</td> +</tr><tr> <td><a href="#generatePySideToolPath">generatePySideToolPath</a></td> <td>Module function to generate the executable path for a PySide tool.</td> </tr><tr> @@ -816,6 +819,29 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="generatePyQtToolPath" ID="generatePyQtToolPath"></a> +<h2>generatePyQtToolPath</h2> +<b>generatePyQtToolPath</b>(<i>toolname</i>) +<p> + Module function to generate the executable path for a PyQt tool. +</p><dl> +<dt><i>toolname</i> (str)</dt> +<dd> +base name of the tool +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +executable path name of the tool +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="generatePySideToolPath" ID="generatePySideToolPath"></a> <h2>generatePySideToolPath</h2> <b>generatePySideToolPath</b>(<i>toolname</i>) @@ -824,7 +850,7 @@ </p><dl> <dt><i>toolname</i></dt> <dd> -base name of the tool (string or QString) +base name of the tool (string) </dd> </dl><dl> <dt>Returns:</dt>
--- a/Preferences/ConfigurationPages/QtPage.py Sun Apr 09 19:41:35 2017 +0200 +++ b/Preferences/ConfigurationPages/QtPage.py Mon Apr 10 19:14:40 2017 +0200 @@ -33,6 +33,8 @@ self.qt4TransPicker.setMode(E5PathPickerModes.DirectoryMode) self.qtToolsDirPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode) + self.pyqtToolsDirPicker.setMode( + E5PathPickerModes.DirectoryShowFilesMode) # set initial values if qVersion() < "5.0.0": @@ -45,6 +47,7 @@ self.qt4PrefixEdit.setText(Preferences.getQt("QtToolsPrefix4")) self.qt4PostfixEdit.setText(Preferences.getQt("QtToolsPostfix4")) self.__updateQt4Sample() + self.pyqtToolsDirPicker.setText(Preferences.getQt("PyQtToolsDir")) self.pyuicIndentSpinBox.setValue(Preferences.getQt("PyuicIndent")) self.pyuicImportsCheckBox.setChecked( Preferences.getQt("PyuicFromImports")) @@ -57,7 +60,7 @@ Preferences.setQt("Qt4TranslationsDir", self.qt4TransPicker.text()) else: Preferences.setQt("Qt5TranslationsDir", self.qt4TransPicker.text()) - Preferences.setQt("QtToolsDir", self.qtToolsDirPicker.text()) + Preferences.setQt("PyQtToolsDir", self.pyqtToolsDirPicker.text()) Preferences.setQt("QtToolsPrefix4", self.qt4PrefixEdit.text()) Preferences.setQt("QtToolsPostfix4", self.qt4PostfixEdit.text()) Preferences.setQt("PyuicIndent", self.pyuicIndentSpinBox.value())
--- a/Preferences/ConfigurationPages/QtPage.ui Sun Apr 09 19:41:35 2017 +0200 +++ b/Preferences/ConfigurationPages/QtPage.ui Mon Apr 10 19:14:40 2017 +0200 @@ -173,6 +173,38 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>PyQt Tools</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Tools Directory:</string> + </property> + </widget> + </item> + <item> + <widget class="E5PathPicker" name="pyqtToolsDirPicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the PyQt tools directory, if they are not found.</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> <string>pyuic / pyside-uic Options</string> @@ -255,6 +287,7 @@ <tabstop>qtToolsDirPicker</tabstop> <tabstop>qt4PrefixEdit</tabstop> <tabstop>qt4PostfixEdit</tabstop> + <tabstop>pyqtToolsDirPicker</tabstop> <tabstop>pyuicIndentSpinBox</tabstop> <tabstop>pyuicImportsCheckBox</tabstop> </tabstops>
--- a/Project/ProjectFormsBrowser.py Sun Apr 09 19:41:35 2017 +0200 +++ b/Project/ProjectFormsBrowser.py Mon Apr 10 19:14:40 2017 +0200 @@ -642,7 +642,7 @@ def __readStdout(self): """ Private slot to handle the readyReadStandardOutput signal of the - pyuic/rbuic process. + pyuic4/pyuic5/pyside-uic/rbuic4 process. """ if self.compileProc is None: return @@ -655,7 +655,7 @@ def __readStderr(self): """ Private slot to handle the readyReadStandardError signal of the - pyuic/rbuic process. + pyuic4/pyuic5/pyside-uic/rbuic4 process. """ if self.compileProc is None: return @@ -750,38 +750,25 @@ if self.project.getProjectLanguage() in \ ["Python", "Python2", "Python3"]: if self.project.getProjectType() in ["Qt4", ]: - self.uicompiler = 'pyuic4' - if Utilities.isWindowsPlatform(): - uic = Utilities.getWindowsExecutablePath(self.uicompiler) - else: - uic = self.uicompiler + self.uicompiler = Utilities.generatePyQtToolPath('pyuic4') elif self.project.getProjectType() in ["PyQt5"]: - self.uicompiler = 'pyuic5' - if Utilities.isWindowsPlatform(): - uic = Utilities.getWindowsExecutablePath(self.uicompiler) - else: - uic = self.uicompiler + self.uicompiler = Utilities.generatePyQtToolPath('pyuic5') elif self.project.getProjectType() in ["E6Plugin"]: if PYQT_VERSION < 0x050000: - self.uicompiler = 'pyuic4' + self.uicompiler = Utilities.generatePyQtToolPath('pyuic4') else: - self.uicompiler = 'pyuic5' - if Utilities.isWindowsPlatform(): - uic = Utilities.getWindowsExecutablePath(self.uicompiler) - else: - uic = self.uicompiler + self.uicompiler = Utilities.generatePyQtToolPath('pyuic5') elif self.project.getProjectType() == "PySide": - self.uicompiler = 'pyside-uic' - uic = Utilities.generatePySideToolPath(self.uicompiler) + self.uicompiler = \ + Utilities.generatePySideToolPath('pyside-uic') else: return None elif self.project.getProjectLanguage() == "Ruby": if self.project.getProjectType() == "Qt4": self.uicompiler = 'rbuic4' if Utilities.isWindowsPlatform(): - uic = Utilities.getWindowsExecutablePath(self.uicompiler) - else: - uic = self.uicompiler + self.uicompiler = \ + Utilities.getWindowsExecutablePath(self.uicompiler) else: return None else: @@ -810,7 +797,7 @@ self.compileProc.readyReadStandardError.connect(self.__readStderr) self.noDialog = noDialog - self.compileProc.start(uic, args) + self.compileProc.start(self.uicompiler, args) procStarted = self.compileProc.waitForStarted(5000) if procStarted: self.compileRunning = True
--- a/Project/ProjectResourcesBrowser.py Sun Apr 09 19:41:35 2017 +0200 +++ b/Project/ProjectResourcesBrowser.py Mon Apr 10 19:14:40 2017 +0200 @@ -530,7 +530,7 @@ def __readStdout(self): """ Private slot to handle the readyReadStandardOutput signal of the - pyrcc4/rbrcc process. + pyrcc4/pyrcc5/pyside-rcc/rbrcc process. """ if self.compileProc is None: return @@ -544,7 +544,7 @@ def __readStderr(self): """ Private slot to handle the readyReadStandardError signal of the - pyrcc4/rbrcc process. + pyrcc4/pyrcc5/pyside-rcc/rbrcc process. """ if self.compileProc is None: return @@ -633,10 +633,7 @@ if self.project.getProjectLanguage() in \ ["Python", "Python2", "Python3"]: if self.project.getProjectType() in ["Qt4", "Qt4C"]: - self.rccCompiler = 'pyrcc4' - if Utilities.isWindowsPlatform(): - self.rccCompiler = \ - Utilities.getWindowsExecutablePath(self.rccCompiler) + self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4') if PYQT_VERSION >= 0x040500: if self.project.getProjectLanguage() in \ ["Python", "Python2"]: @@ -644,23 +641,17 @@ else: args.append("-py3") elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: - self.rccCompiler = 'pyrcc5' - if Utilities.isWindowsPlatform(): - self.rccCompiler = \ - Utilities.getWindowsExecutablePath(self.rccCompiler) + self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') elif self.project.getProjectType() in ["E6Plugin"]: if PYQT_VERSION < 0x050000: - self.rccCompiler = 'pyrcc4' + self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4') if self.project.getProjectLanguage() in \ ["Python", "Python2"]: args.append("-py2") else: args.append("-py3") else: - self.rccCompiler = 'pyrcc5' - if Utilities.isWindowsPlatform(): - self.rccCompiler = \ - Utilities.getWindowsExecutablePath(self.rccCompiler) + self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') elif self.project.getProjectType() in ["PySide", "PySideC"]: self.rccCompiler = Utilities.generatePySideToolPath( 'pyside-rcc')
--- a/Project/ProjectTranslationsBrowser.py Sun Apr 09 19:41:35 2017 +0200 +++ b/Project/ProjectTranslationsBrowser.py Mon Apr 10 19:14:40 2017 +0200 @@ -888,7 +888,7 @@ def __readStderrLupdate(self): """ Private slot to handle the readyReadStandardError signal of the - pylupdate process. + pylupdate4/pylupdate5/pyside-lupdate process. """ proc = self.sender() if proc is not None: @@ -986,8 +986,8 @@ def __generateTSFile(self, noobsolete=False, generateAll=True): """ - Private method used to run pylupdate/pylupdate4 to generate the .ts - files. + Private method used to run pylupdate4/pylupdate5/pyside-lupdate to + generate the .ts files. @param noobsolete flag indicating whether obsolete entries should be kept (boolean) @@ -1036,23 +1036,14 @@ return if self.project.getProjectType() in ["Qt4", "Qt4C"]: - self.pylupdate = 'pylupdate4' - if Utilities.isWindowsPlatform(): - self.pylupdate = \ - Utilities.getWindowsExecutablePath(self.pylupdate) + self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4') elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]: - self.pylupdate = 'pylupdate5' - if Utilities.isWindowsPlatform(): - self.pylupdate = \ - Utilities.getWindowsExecutablePath(self.pylupdate) + self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5') elif self.project.getProjectType() in ["E6Plugin"]: if PYQT_VERSION < 0x050000: - self.pylupdate = 'pylupdate4' + self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4') else: - self.pylupdate = 'pylupdate5' - if Utilities.isWindowsPlatform(): - self.pylupdate = \ - Utilities.getWindowsExecutablePath(self.pylupdate) + self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5') elif self.project.getProjectType() in ["PySide", "PySideC"]: self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate') else:
--- a/changelog Sun Apr 09 19:41:35 2017 +0200 +++ b/changelog Mon Apr 10 19:14:40 2017 +0200 @@ -1,5 +1,10 @@ Change Log ---------- +Version 17.04: +- bug fixes +- PyQt Tools + -- added a configuration option for the path of the PyQt tools + Version 17.04.1: - bug fixes
--- a/i18n/eric6_cs.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_cs.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1493,12 +1493,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> @@ -1508,7 +1508,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -22373,7 +22373,7 @@ <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> @@ -22383,27 +22383,27 @@ <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> @@ -22423,42 +22423,42 @@ <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22468,72 +22468,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22563,7 +22563,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22603,62 +22603,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -22693,12 +22693,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -40742,27 +40742,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41072,62 +41072,62 @@ <translation>Stisknout pro hledání programů</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Kompilátor formulářů (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Kompilátor resource (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>CORBA IDL kompilátor</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(nezkonfigurováno)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(nevykonavatelný)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(nenalezeno)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(neznámý)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Vypisovač překladů (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Kopilátor formulářů (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Kompilátor resourců (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation type="unfinished"></translation> </message> @@ -41152,7 +41152,7 @@ <translation type="unfinished">Qt asistent</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -41162,7 +41162,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -41172,12 +41172,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> @@ -42640,7 +42640,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Formuláře</translation> </message> @@ -42805,27 +42805,27 @@ <translation>Kompilace souboru s formulářem selhala.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Kompilovat formuláře...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Přerušit</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>Určení změněných formulářů...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Kompilování změněných formulářů...</translation> </message> @@ -42865,7 +42865,7 @@ <translation><p>Kompilace formuláře se nepodařila.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Nelze spustit {0}.<br>Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -42920,7 +42920,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -43362,7 +43362,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Resources</translation> </message> @@ -43472,27 +43472,27 @@ <translation>Kompliace Resource souboru selhala.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Kompilovat resources...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Přerušit</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>Určení změněných resources...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Kompilování změněných resources...</translation> </message> @@ -43517,12 +43517,12 @@ <translation><p>Kompilace Resource se nepodařila.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Nelze spustit {0}.<br>Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation type="unfinished"></translation> </message> @@ -43868,22 +43868,22 @@ <translation>Generování souboru s překladem (*.ts) bylo úspěšné.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Zveřejnění souboru s překladem</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>Zveřejnění souboru s překladem (*.qm) bylo úspěšné.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>Zveřejnění souboru s překladem (*.qm) selhalo.</translation> </message> @@ -43908,12 +43908,12 @@ <translation><p>Do dočasného souboru projektu <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Nelze spustit {0}.<br>Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit zveřejnění.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> @@ -49307,27 +49307,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -49336,6 +49336,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_de.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_de.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1431,12 +1431,12 @@ <translation>Hintergrund Client neu starten?</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation>Hintergrund Client wurde getrennt.</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation>Die Verbindung zu Erics Hintergund Client wurde aus unbekanntem Grund getrennt.</translation> </message> @@ -1451,7 +1451,7 @@ <translation><p>Der Hintergund Client für <b>{0}</b> wurde durch eine Exception gestoppt. Er wird für verschiedene Plugins, wie z.B. die Checker, verwendet.</p><p>Wähle:<ul><li><b>'Ja'</b>, um den Client aber nicht den letzten Job neu zu starten</li><li><b>'Wiederholen'</b>, um den Client und letzten Job neu zu starten</li><li><b>'Nein'</b>, um den Client nicht neu zu starten.</li></ul></p><p>Hinweis: Der Client kann immer wieder gestartet werden, indem der Einstellungsdialog mit Ok geschlossen wird oder durch das Neuladen/ Wechseln des Projektes.</p></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation>Die Verbindung zum Hintergund Client für <b>{0}</b> wurde aus unbekanntem Grund getrennt.<br>Soll er neu gestartet werden?</translation> </message> @@ -21825,7 +21825,7 @@ <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> @@ -21835,27 +21835,27 @@ <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> @@ -21875,42 +21875,42 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -21920,72 +21920,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -22015,7 +22015,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -22055,62 +22055,62 @@ <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -22145,12 +22145,12 @@ <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> @@ -39829,27 +39829,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation>Wähle den Python{0}-Interpreter</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation> </message> @@ -40154,32 +40154,32 @@ <translation>Drücke, um nach Programmen zu suchen</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Formularcompiler (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Ressourcencompiler (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>CORBA IDL Compiler</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(nicht konfiguriert)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(nicht ausführbar)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(nicht gefunden)</translation> </message> @@ -40189,32 +40189,32 @@ <translation>Externe Programme</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(unbekannt)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Rechtschreibprüfung – PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Formularcompiler (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Ressourcencompiler (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Übersetzungsextraktor (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation>Quelltextfärber – Pygments</translation> </message> @@ -40239,7 +40239,7 @@ <translation>Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation>Übersetzungsextraktor (Python, PyQt4)</translation> </message> @@ -40249,7 +40249,7 @@ <translation>Formularcompiler (Python, PyQt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation>Ressourcencompiler (Python, PyQt4)</translation> </message> @@ -40259,12 +40259,12 @@ <translation>Übersetzungsextraktor (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation>Formularcompiler (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation>Ressourcencompiler (Python, PyQt5)</translation> </message> @@ -41701,7 +41701,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Formulare</translation> </message> @@ -41741,12 +41741,12 @@ <translation>Die Übersetzung des Formulars war erfolgreich.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Formular übersetzen...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Abbrechen</translation> </message> @@ -41756,7 +41756,7 @@ <translation>Mit Qt Designer öffnen</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -41861,7 +41861,7 @@ <translation><p>Die Übersetzung des Formulars ist fehlgeschlagen.</p<p>Grund: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>{0} konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es sich im Suchpfad befindet.</translation> </message> @@ -41881,12 +41881,12 @@ <translation>Dialog mit Knöpfen (unten Mitte)</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>Ermittle veränderte Formulare...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Übersetze veränderte Formulare...</translation> </message> @@ -41981,7 +41981,7 @@ <translation>QStackedWidget</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation>%v/%m Formulare</translation> </message> @@ -42423,7 +42423,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Ressourcen</translation> </message> @@ -42538,32 +42538,32 @@ <translation>Die Übersetzung der Ressourcendatei ist fehlgeschlagen.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>{0} konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Übersetze Ressourcendateien...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>Ermittle veränderte Ressourcen...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Übersetze veränderte Ressourcen...</translation> </message> @@ -42583,7 +42583,7 @@ <translation>Pfad in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation>%v/%m Resourcen</translation> </message> @@ -42849,17 +42849,17 @@ <translation>Das Erzeugen der Übersetzungsdateien (*.ts) war erfolgreich.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Übersetzungsdatei freigeben</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>Die Freigabe der Übersetzungsdatei (*.qm) war erfolgreich.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>Die Freigabe der Übersetzungsdatei (*.qm) ist fehlgeschlagen.</translation> </message> @@ -42869,7 +42869,7 @@ <translation>Mit Qt Linguist öffnen</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -42919,7 +42919,7 @@ <translation><p>Die temporäre Projektdatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>lrelease konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -42949,7 +42949,7 @@ <translation>Keine Überstzungsdateien (*.ts) ausgewählt.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>{0} konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es sich im Suchpfad befindet.</translation> </message> @@ -48390,27 +48390,27 @@ <translation>Gib das Anhängsel für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation>pyuic / pyside-uic Optionen</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation>Einrückungstiefe:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation>Wähle die Einrücktiefe (Standard: 4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation>Erzeuge Imports relativ zu '.'</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation>Einrückungstiefe:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation>Wähle die Einrücktiefe (Standard: 4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation>Erzeuge Imports relativ zu '.'</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation>Verzeichnis:</translation> </message> @@ -48419,6 +48419,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Gib den Pfad des Verzeichnisses mit den Qt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation>PyQt-Werkzeuge</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation>Gib den Pfad des Verzeichnisses mit den PyQt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_empty.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_empty.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1425,17 +1425,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -21735,7 +21735,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -21815,212 +21815,212 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -39630,27 +39630,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39980,7 +39980,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -39990,7 +39990,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40000,72 +40000,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation type="unfinished"></translation> </message> @@ -41501,7 +41501,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation type="unfinished"></translation> </message> @@ -41751,37 +41751,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation type="unfinished"></translation> </message> @@ -42223,7 +42223,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation type="unfinished"></translation> </message> @@ -42353,37 +42353,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation type="unfinished"></translation> </message> @@ -42764,32 +42764,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -47960,7 +47960,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -48005,25 +48005,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_en.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_en.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1420,12 +1420,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> @@ -1435,7 +1435,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -21736,72 +21736,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -21811,72 +21811,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21906,7 +21906,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -21946,62 +21946,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -22036,12 +22036,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -39669,27 +39669,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39999,62 +39999,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation type="unfinished"></translation> </message> @@ -40079,7 +40079,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40089,7 +40089,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40099,12 +40099,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> @@ -41541,7 +41541,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation type="unfinished"></translation> </message> @@ -41741,32 +41741,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation type="unfinished"></translation> </message> @@ -41821,7 +41821,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -42263,7 +42263,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation type="unfinished"></translation> </message> @@ -42393,37 +42393,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation type="unfinished"></translation> </message> @@ -42789,32 +42789,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -48036,27 +48036,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -48065,6 +48065,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_es.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_es.ts Mon Apr 10 19:14:40 2017 +0200 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="200"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> <source>Add Bookmark</source> <translation>Añadir Marcador</translation> </message> @@ -1428,12 +1428,12 @@ <translation>¿Reiniciar cliente en background?</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation>Cliente en background desconectado.</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation>El cliente en background de Eric ha desconectado debido a una razón desconocida.</translation> </message> @@ -1448,7 +1448,7 @@ <translation><p>El cliente en background para <b>{0}</b> se ha detenido debido a una excepción. Éste es utilizado por varios plug-ins como los distintos comprobadores.</p><p>Seleccionar<ul><li><b>'Si'</b> para reiniciar el cliente, abortando el último trabajo</li><li><b>'Reintentar'</b> para reiniciar el cliente y el último trabajo</li><li><b>'No'</b> para dejar el cliente sin iniciar.</li></ul></p><p>Nota: El cliente se puede reiniciar abriendo y aceptando el diálogo de preferencias o recargando/cambiando el proyecto.</p></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation>El cliente en background para <b>{0}</b> ha desconectado por razón desconocida.<br>¿Reiniciarlo?</translation> </message> @@ -1724,7 +1724,7 @@ <translation>Editar &Dirección</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&Borrar</translation> </message> @@ -2421,12 +2421,12 @@ <translation>Pulsar para guardar el trazado de llamadas como archivo de texto</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="109"/> <source>From</source> <translation>Desde</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="114"/> <source>To</source> <translation>Hasta</translation> </message> @@ -2592,7 +2592,7 @@ <translation>Pulsar para cancelar la edición compartida</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation>Limpiar</translation> </message> @@ -2912,7 +2912,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> <source>ClickToFlash Whitelist</source> <translation>Lista Blanca de ClickToFlash</translation> </message> @@ -4937,7 +4937,7 @@ <translation>Dominio:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation><no hay cookie seleccionada></translation> </message> @@ -7536,7 +7536,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> + <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> <source>Downloads</source> <translation>Descargas</translation> </message> @@ -7995,92 +7995,92 @@ <translation>Botones Estándar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> <source>Discard</source> <translation>Descartar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> <source>Ignore</source> <translation>Ignorar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> <source>No</source> <translation>No</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> <source>No to all</source> <translation>No a todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> <source>Reset</source> <translation>Restaurar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> <source>Restore defaults</source> <translation>Restaurar valores por defecto</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> <source>Retry</source> <translation>Reintentar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> <source>Save all</source> <translation>Guardar todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> <source>Yes</source> <translation>Si</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> <source>Yes to all</source> <translation>Si a todo</translation> </message> @@ -10069,7 +10069,7 @@ <translation>Presione para seleccionar un archivo API desde la lista de APIs instaladas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> <source>Add from installed APIs</source> <translation>Añadir de las APIs instaladas</translation> </message> @@ -10079,7 +10079,7 @@ <translation>Pulse para compilar la definición de las APIs seleccionadas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> <source>Compile APIs</source> <translation>Compilar APIs</translation> </message> @@ -10134,7 +10134,7 @@ <translation>Pulse para seleccionar un archivo de API de la lista de archivos de API instalados por los plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> <source>Add from Plugin APIs</source> <translation>Añadir desde las APIs de plugins</translation> </message> @@ -11236,7 +11236,7 @@ <translation>Selecciona llenar hasta el fin de la línea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> <source>Fill to end of line</source> <translation>Llenar hasta el final de la línea</translation> </message> @@ -11281,7 +11281,7 @@ <translation>Selección de Fuente.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation>Fuente</translation> </message> @@ -12732,7 +12732,7 @@ <translation>Modo:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> <source>Disabled</source> <translation>Deshabilitado</translation> </message> @@ -13526,7 +13526,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="346"/> + <location filename="../UI/EmailDialog.ui" line="13"/> <source>Send bug report</source> <translation>Enviar informe de bugs</translation> </message> @@ -14944,12 +14944,12 @@ <translation>Notificaciones</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> <source>Permission</source> <translation>Permiso</translation> </message> @@ -14964,7 +14964,7 @@ <translation>Eliminar Todo</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> <source>Geolocation</source> <translation>Geolocalización</translation> </message> @@ -16088,7 +16088,7 @@ <translation>Nombre:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation><no hay cookie de flash seleccionada></translation> </message> @@ -16098,7 +16098,7 @@ <translation>Tamaño:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> <source>Origin:</source> <translation>Origen:</translation> </message> @@ -16133,7 +16133,7 @@ <translation>Pulsar para eliminar las cookies de flash seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> <source>Remove Cookie</source> <translation>Eliminar Cookie</translation> </message> @@ -16561,7 +16561,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> <source>GreaseMonkey Script Installation</source> <translation>Instalación de Script de GreaseMonkey</translation> </message> @@ -21824,7 +21824,7 @@ <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> @@ -21834,27 +21834,27 @@ <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> @@ -21874,42 +21874,42 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -21919,72 +21919,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -22014,7 +22014,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -22054,62 +22054,62 @@ <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -22144,12 +22144,12 @@ <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation> </message> @@ -22157,7 +22157,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> @@ -23340,7 +23340,7 @@ <translation>Pulsar para marcar las entradas seleccionadas como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> <source>Resolved</source> <translation>Resolved</translation> </message> @@ -23350,7 +23350,7 @@ <translation>Pulsar para marcar las entradas seleccionadas como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> <source>Unresolved</source> <translation>Unresolved</translation> </message> @@ -23943,7 +23943,7 @@ <translation>Seleccionar la categoría sobre la que filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> <source>Revision</source> <translation>Revisión</translation> </message> @@ -24315,7 +24315,7 @@ <translation><p>El archivo <b>{0}</b> no puede ser leído.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> <source>Edit Plan</source> <translation>Plan de Edición</translation> </message> @@ -24456,7 +24456,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> @@ -24486,17 +24486,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="211"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="221"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="231"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -25050,7 +25050,7 @@ <translation>Hacer Fetch de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="424"/> <source>Differences</source> <translation>Diferencias</translation> </message> @@ -28324,7 +28324,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -28456,7 +28456,7 @@ <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> <source>Commit</source> <translation>Commit</translation> </message> @@ -28511,7 +28511,7 @@ <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> <source>Differences</source> <translation>Diferencias</translation> </message> @@ -29927,7 +29927,7 @@ <translation>Pulse para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>&Eliminar</translation> </message> @@ -36005,92 +36005,92 @@ <translation>Botones Estándar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> <source>Ignore</source> <translation>Ignorar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> <source>Save all</source> <translation>Guardar todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> <source>Discard</source> <translation>Descartar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> <source>Yes to all</source> <translation>Si a todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> <source>No</source> <translation>No</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> <source>No to all</source> <translation>No a todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> <source>Retry</source> <translation>Reintentar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> <source>Restore defaults</source> <translation>Restaurar valores por defecto</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> <source>Yes</source> <translation>Si</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> <source>Close</source> <translation>Cerrar</translation> </message> @@ -37880,7 +37880,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> <source>Not Cached Hosts</source> <translation>Hosts no en Caché</translation> </message> @@ -37988,7 +37988,7 @@ <translation>Pulsar para seleccionar la posición visualmente, soltar para asignar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> <source>Visual Selection</source> <translation>Selección Visual</translation> </message> @@ -38661,7 +38661,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> <source>Saved Passwords</source> <translation>Contraseñas Almacenadas</translation> </message> @@ -39828,27 +39828,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation>Seleccionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation> </message> @@ -40158,62 +40158,62 @@ <translation>Presione para buscar programas</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Compilador de Formularios (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Compilador de Recursos (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>Compilador CORBA IDL</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(no configurado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(no ejecutable)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(no encontrado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(desconocido)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Corrección Ortográfica - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Compilador de Formularios (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Compilador de Recursos (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Extractor de traducciones (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation>Resaltador de Código Fuente - Pygments</translation> </message> @@ -40238,7 +40238,7 @@ <translation>Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation>Extractor de Traducciones (Python, PyQt4)</translation> </message> @@ -40248,7 +40248,7 @@ <translation>Compilador de Forms (Python, PyQt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation>Compilador de Recursos (Python, PyQt4)</translation> </message> @@ -40258,12 +40258,12 @@ <translation>Extractor de Traducciones (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation>Compilador de Forms (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation>Compilador de Recursos (Python, PyQt5)</translation> </message> @@ -41700,7 +41700,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Formularios</translation> </message> @@ -41880,27 +41880,27 @@ <translation>La compilación del archivo de formulario ha fallado.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Compilando formularios...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>Determinando que formularios han cambiado...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Compilando formularios que han cambiado...</translation> </message> @@ -41925,7 +41925,7 @@ <translation><p>La compilación del archivo de formulario ha fallado.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>No se ha podido ejecutar {0}.<br>Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -41980,7 +41980,7 @@ <translation>QStackedWidget</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation>%v/%m Formularios</translation> </message> @@ -42422,7 +42422,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Recursos</translation> </message> @@ -42532,27 +42532,27 @@ <translation>La compilación del archivo de recursos ha fallado.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Compilando recursos...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>Determinando que recursos han cambiado...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Compilando recursos que han cambiado...</translation> </message> @@ -42577,12 +42577,12 @@ <translation><p>La compilación del archivo de recursos ha fallado.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>No se ha podido ejecutar {0}.<br>Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation>%v/%m Recursos</translation> </message> @@ -42928,22 +42928,22 @@ <translation>La generación de archivos de traducción (*.ts) ha sido satisfactoria.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Crear versión release del archivo de traducción</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>La versión release de los archivos de traducción (*.qm) ha sido satisfactoria.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>La versión release de los archivos de traducción (*.qm) ha fallado.</translation> </message> @@ -42968,12 +42968,12 @@ <translation><p>El archivo temporal de proyecto <b>{0}</b> no ha podido guardarse.</p></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>No se ha podido ejecutar {0}.<br>Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar lrelease.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> @@ -43430,7 +43430,7 @@ <translation>Ejecutadas</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>Cobertura</translation> </message> @@ -43510,7 +43510,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="345"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> <source>%v/%m Files</source> <translation>%v/%m Archivos</translation> </message> @@ -43518,7 +43518,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.py" line="233"/> + <location filename="../DataViews/PyProfileDialog.ui" line="20"/> <source>Profile Results</source> <translation>Resultados de Profiling</translation> </message> @@ -48232,7 +48232,7 @@ <translation>Pulsar para eliminar los filtros seleccionados</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="151"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> <source>Remove Filters</source> <translation>Eliminar Filtros</translation> </message> @@ -48242,7 +48242,7 @@ <translation>Pulsar para eliminar los atributos seleccionados</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="179"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> <source>Remove Attributes</source> <translation>Eliminar Atributos</translation> </message> @@ -48353,27 +48353,27 @@ <translation>Introducir el postfijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation>Opciones de pyuic / pyside-uic</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation>Ancho de indentación:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation>Generar imports relativos a '.'</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation>Ancho de indentación:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation>Generar imports relativos a '.'</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation>Directorio de las Herramientas:</translation> </message> @@ -48382,6 +48382,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Introducir la ruta del directorio de las herramientas Qt, si no se encuentran automáticamente.</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -49765,7 +49775,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> <source>Send Referer Whitelist</source> <translation>Enviar Lista Blanca de Referers</translation> </message> @@ -50975,7 +50985,7 @@ <translation>Copiar y Vista &Preliminar</translation> </message> <message> - <location filename="../Snapshot/SnapWidget.py" line="531"/> + <location filename="../Snapshot/SnapWidget.ui" line="20"/> <source>eric6 Snapshot</source> <translation>Captura de Pantalla de eric6</translation> </message> @@ -53581,7 +53591,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> <source>Subversion Diff</source> <translation>Diff de Subversion</translation> </message> @@ -53884,17 +53894,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -54222,7 +54232,7 @@ <translation>&Protocolo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -54322,7 +54332,7 @@ <translation>Seleccionar el protocolo para acceder al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55507,7 +55517,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> <source>Subversion Status</source> <translation>Estado de Subversion</translation> </message> @@ -55764,7 +55774,7 @@ <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> <source>Commit</source> <translation>Commit</translation> </message> @@ -61006,7 +61016,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="403"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Test Unitario</translation> </message>
--- a/i18n/eric6_fr.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_fr.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1500,12 +1500,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> @@ -1515,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -22324,7 +22324,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -22334,27 +22334,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> @@ -22374,42 +22374,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22419,72 +22419,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22514,7 +22514,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22554,62 +22554,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -22644,12 +22644,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -40528,27 +40528,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -40858,62 +40858,62 @@ <translation>Cliquer pour rechercher les programmes externes</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Compilateur de feuilles (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Compilateur de ressources (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>Compilateur CORBA IDL</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(non configuré)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(non executable)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(non trouvé)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(inconnu)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Vérification d'orthographe - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation type="unfinished"></translation> </message> @@ -40938,7 +40938,7 @@ <translation type="unfinished">Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40948,7 +40948,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40958,12 +40958,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> @@ -42415,7 +42415,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Feuilles du projet</translation> </message> @@ -42515,17 +42515,17 @@ <translation>La compilation de la feuille a échoué.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Compilation des feuilles...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Abandon</translation> </message> @@ -42580,12 +42580,12 @@ <translation>Boite de dialogue avec boutons (Bas-Centre)</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>Détermination des feuilles modifiées...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Compilation des feuilles modifiées...</translation> </message> @@ -42640,7 +42640,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -42695,7 +42695,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -43137,7 +43137,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Ressources</translation> </message> @@ -43242,27 +43242,27 @@ <translation>La compilation du fichier ressource a échoué.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Compilation des ressources...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Abandonner</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>Détermination des fichiers ressource modifiés...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Compilation des fichiers ressource modifiés...</translation> </message> @@ -43292,12 +43292,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation type="unfinished"></translation> </message> @@ -43573,22 +43573,22 @@ <translation>La génération des fichiers de traduction (*.ts) a réussi.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Validation du fichier de traduction</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>La validation des fichiers de traduction (*.qm) a réussi.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>La validation des fichiers de traduction (*.qm) a échoué.</translation> </message> @@ -43683,12 +43683,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -49108,27 +49108,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -49137,6 +49137,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_it.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_it.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1498,12 +1498,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> @@ -1513,7 +1513,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -22537,7 +22537,7 @@ <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> @@ -22547,27 +22547,27 @@ <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> @@ -22587,42 +22587,42 @@ <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22632,72 +22632,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22727,7 +22727,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22767,62 +22767,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -22857,12 +22857,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -40977,27 +40977,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41317,62 +41317,62 @@ <translation>Premi per cercare per programmi</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Compilatore forms (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Compilatore risorse (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>Compilatore CORBA IDL</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(non configurato)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(non eseguibile)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(non trovato)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(sconosciuto)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Correttore - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Estrattore di traduzioni (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Compilatore forms (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Compilatore Risorse (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation>Evidenziatore Sorgente - Pygments</translation> </message> @@ -41397,7 +41397,7 @@ <translation type="unfinished">Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -41407,7 +41407,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -41417,12 +41417,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> @@ -42884,7 +42884,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Forms</translation> </message> @@ -42984,17 +42984,17 @@ <translation>La compilazione della form è fallita.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Compilazione form in corso...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Termina</translation> </message> @@ -43049,12 +43049,12 @@ <translation>Dialogo con pulsanti (centrati in basso)</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>Determina form modificate...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Compila le form modificate...</translation> </message> @@ -43109,7 +43109,7 @@ <translation><p>La compilazione del file form è fallita.</p><p>Motivo: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Non posso avviare {0}.<br>Assicurarsi che sia nel path.</translation> </message> @@ -43164,7 +43164,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -43606,7 +43606,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Risorse</translation> </message> @@ -43711,27 +43711,27 @@ <translation>La compilazione del file risorse è fallita.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Compilazione risorse in corso...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Termina</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>Determinazione risorse modificate...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Compilazione risorse modificate in corso...</translation> </message> @@ -43761,12 +43761,12 @@ <translation><p>La compilazione del file risorse è fallita.</p><p>Motivo: {0}</p></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Non posso avviare {0}.<br>Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation>Risorse %v/%m</translation> </message> @@ -44042,22 +44042,22 @@ <translation>La generazione dei file di traduzione (*.ts) è avvenuta con successo.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Rilascia file traduzione</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>Il rilascio dei file traduzione (*.qm) è avvenuta con successo.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>La generazione dei file di traduzione (*.qm) è fallita.</translation> </message> @@ -44152,12 +44152,12 @@ <translation><p>Il file temporaneo <b>{0}</b> del progetto non può essere scritto.</p></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Non posso avviare {0}.<br>Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare lrelease.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> @@ -49556,27 +49556,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -49585,6 +49585,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_pt.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_pt.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1508,12 +1508,12 @@ <translation>Um erro no cliente de fundo de Eric parou o serviço.</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation>Cliente de fundo de Eric desconectou-se por motivo desconhecido.</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation>Cliente de fundo desconectado.</translation> </message> @@ -1523,7 +1523,7 @@ <translation type="obsolete">O cliente de fundo para <b>{0}</b> desconectou-se por um motivo desconhecido.<br>Deverá ser reiniciado?</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation>Cliente de fundo para <b>{0}</b> desconetou-se por um motivo desconhecido. <br>Deveria reiniciar-se?</translation> </message> @@ -22533,72 +22533,72 @@ <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22608,72 +22608,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22703,7 +22703,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22773,72 +22773,72 @@ <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -41112,27 +41112,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation>Selecionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Selecionar o intérprete de Python{0} a usar:</translation> </message> @@ -41442,62 +41442,62 @@ <translation>Pressionar para procurar programas</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Extrator de Tradução (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Compilador de Formulários (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Compilador de Recursos (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Compilador de Formulários (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Compilador de Recursos (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>Compilador de CORBA IDL</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(desconhecido)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Corretor Ortográfico - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(não configurado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(não executável)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(não encontrado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation>Realçador de Fonte - Pygments</translation> </message> @@ -41522,7 +41522,7 @@ <translation>Assistente Qt</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation>Extrator de Tradução (Python, PyQt4)</translation> </message> @@ -41532,7 +41532,7 @@ <translation>Compilador de Formulários (Python, PyQt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation>Compilador de Recursos (Python, PyQt4)</translation> </message> @@ -41542,12 +41542,12 @@ <translation>Extrator de Tradução (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation>Compilador de Formulários (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation>Compilador de Recursos (Python, PyQt5)</translation> </message> @@ -42994,7 +42994,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Formulários</translation> </message> @@ -43194,32 +43194,32 @@ <translation>A compilação do ficheiro do form falhou.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>A compilar formulários...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Terminar</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>A determinar formulários alterados...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>A compilar formulários alterados...</translation> </message> @@ -43274,7 +43274,7 @@ <translation>QStackedWidget</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation>%v/%m Formulários</translation> </message> @@ -43716,7 +43716,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Recursos</translation> </message> @@ -43846,37 +43846,37 @@ <translation>A compilação do ficheiro de recurso falhou.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>A compilar recursos...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Cancelar</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>A determinar recursos alterados...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>A compilar recursos alterados...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation>%v/%m Recursos</translation> </message> @@ -44242,32 +44242,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -49543,27 +49543,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -49572,6 +49572,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_ru.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_ru.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1433,12 +1433,12 @@ <translation>Ошибка фонового клиента остановила сервис.</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation>Фоновый клиент прервал соединение по неизвестной причине.</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation>Соединение фонового клиента прервано.</translation> </message> @@ -1448,7 +1448,7 @@ <translation><p>Фоновый клиент <b>{0}</b> прекратил выполнение из-за ошибки. Этот клиент необходим для работы различных плагинов.</p><p>Выберите <ul><li><b>'Да'</b> чтобы перезапустить его и отменить последнее задание </li><li><b>'Повторить'</b> чтобы перезапустить его и последнее задание </li><li><b>'Нет'</b> чтобы не перезапускать клиента.</li></ul></p><p>Заметьте: Клиента можно перезапустить, открыв и сохранив диалог настроек или закрыв и снова открыв текущий проект.</p></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation>Соединение фонового клиента <b>{0}</b> прервано по неизвестной причине.<br>Перезапустить клиента?</translation> </message> @@ -21921,72 +21921,72 @@ <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неверная Bisect подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> @@ -21996,72 +21996,72 @@ <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> @@ -22091,7 +22091,7 @@ <translation>Вы действительно хотите откатить все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> @@ -22131,62 +22131,62 @@ <translation>Отмена незавершённого слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation>Загрузить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для загрузки:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</translation> </message> @@ -22221,12 +22221,12 @@ <translation>Пометить как 'разрешенный'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные bundles-пакеты, сохраненные в области резервного копирования <b>{0}</b>?</p></translation> </message> @@ -39938,27 +39938,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation>Задайте интерпретатор Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Задайте интерпретатор Python{0}:</translation> </message> @@ -40268,62 +40268,62 @@ <translation>Искать программы</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Извлечение переводов (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Компилятор форм (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Компилятор ресурсов (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Компилятор форм (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Компилятор ресурсов (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>Компилятор IDL CORBA</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(неизвестный)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Проверка орфографии - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(не настроено)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(не исполняемый)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(не найдено)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation>Подсветка синтаксиса - Pygments</translation> </message> @@ -40348,7 +40348,7 @@ <translation>Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation>Извлечение переводов (Python, PyQt4)</translation> </message> @@ -40358,7 +40358,7 @@ <translation>Компилятор форм (Python, PyQt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation>Компилятор ресурсов (Python, PyQt4)</translation> </message> @@ -40368,12 +40368,12 @@ <translation>Извлечение переводов (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation>Компилятор форм (Python, PyQt5)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation>Компилятор ресурсов (Python, PyQt5)</translation> </message> @@ -41830,7 +41830,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Формы</translation> </message> @@ -42030,32 +42030,32 @@ <translation>Компиляция формы не удалась.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Компилирую формы...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>Определяю изменённые формы...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Компилирую изменённые формы...</translation> </message> @@ -42110,7 +42110,7 @@ <translation>QStackedWidget</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation>%v/%m форм</translation> </message> @@ -42553,7 +42553,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Ресурсы</translation> </message> @@ -42683,37 +42683,37 @@ <translation>Компиляция ресурса не удалась.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Компилиляция ресурсов...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>Определяю изменённые ресурсы...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Компилирую изменённые ресурсы...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation>%v/%m ресурсов</translation> </message> @@ -43079,32 +43079,32 @@ <translation>Создание файлов перевода (*.ts) прошло успешно.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Релиз файлов перевода</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>Релиз файлов перевода (*.qm) успешно создан.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>Создание релиза файлов перевода (*.qm) не удалось.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить утилиту lrelease.<br>Убедитесь, что она доступна в <b>{0}</b>.</p></translation> </message> @@ -48554,27 +48554,27 @@ <translation>Задайте постфикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation>Параметры pyuic / pyside-uic</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation>Ширина отступа:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation>Задайте ширину отступа (по умолчанию: 4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation>Генерировать импорт относительно '.'</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation>Ширина отступа:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation>Задайте ширину отступа (по умолчанию: 4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation>Генерировать импорт относительно '.'</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation>Директория инструментов:</translation> </message> @@ -48583,6 +48583,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation>Задайте путь к директории инструментов Qt, если они не найдены.</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_tr.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_tr.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1494,12 +1494,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> @@ -1509,7 +1509,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -22342,72 +22342,72 @@ <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22417,72 +22417,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22512,7 +22512,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22552,62 +22552,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -22642,12 +22642,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -40568,27 +40568,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -40898,62 +40898,62 @@ <translation>Programlarda arama için basınız</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>Çeviri Çıkarıcı (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>Form Derleyici (Python, PySide)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>Kaynak Derleyici (Python, Pyside)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>Form Derleyici (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>Kaynak Derleyici (Ruby, Qt4)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>CORBA IDL Derleyicisi</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>(bilinmeyen)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>Heceleme Kontrolü - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>(ayarlanmadı)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>(yürütülemez)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>(bulunamadı)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation type="unfinished"></translation> </message> @@ -40978,7 +40978,7 @@ <translation type="unfinished">Qt Yardımcı</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40988,7 +40988,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation type="unfinished"></translation> </message> @@ -40998,12 +40998,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation type="unfinished"></translation> </message> @@ -42450,7 +42450,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>Formlar</translation> </message> @@ -42650,32 +42650,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>Formlar derleniyor...</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>Vazgeç</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>Değişen formlar derleniyor...</translation> </message> @@ -42730,7 +42730,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -43172,7 +43172,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> @@ -43302,37 +43302,37 @@ <translation>Kaynağın derlenmesinde hata.</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>Kaynaklar derleniyor...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>Vazgeç</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>Değişen kaynaklar derleniyor...</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation type="unfinished"></translation> </message> @@ -43698,32 +43698,32 @@ <translation>Çeviri dosyaları (*.ts) tam olarak üretildi.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>Yayımlanmış çeviri dosyası</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>Çeviri dosyaları (*.qm) tam olarak yayımlandı.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>Çeviri dosyalarının (*qm) yayımı başarısız oldu.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -48998,27 +48998,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -49027,6 +49027,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/i18n/eric6_zh_CN.ts Sun Apr 09 19:41:35 2017 +0200 +++ b/i18n/eric6_zh_CN.ts Mon Apr 10 19:14:40 2017 +0200 @@ -1499,12 +1499,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="406"/> + <location filename="../Utilities/BackgroundService.py" line="409"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation>Erics 后台客户端因未知原因断开连接。</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>Background client disconnected.</source> <translation>后台客户端已断开连接。</translation> </message> @@ -1519,7 +1519,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="412"/> + <location filename="../Utilities/BackgroundService.py" line="415"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> @@ -22320,7 +22320,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -22330,27 +22330,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> @@ -22370,42 +22370,42 @@ <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22415,72 +22415,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22510,7 +22510,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -22550,62 +22550,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -22640,12 +22640,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -40565,27 +40565,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1544"/> + <location filename="../Preferences/__init__.py" line="1545"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1572"/> + <location filename="../Preferences/__init__.py" line="1573"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select Python{0} Interpreter</source> <translation>选择 Python{0} 解释器</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1674"/> + <location filename="../Preferences/__init__.py" line="1675"/> <source>Select the Python{0} interpreter to be used:</source> <translation>选择要使用的 Python{0} 解释器：</translation> </message> @@ -40895,62 +40895,62 @@ <translation>点击搜索程序</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="193"/> + <location filename="../Preferences/ProgramsDialog.py" line="190"/> <source>Forms Compiler (Ruby, Qt4)</source> <translation>窗体编译器（Ruby, Qt4）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="198"/> + <location filename="../Preferences/ProgramsDialog.py" line="195"/> <source>Resource Compiler (Ruby, Qt4)</source> <translation>资源编译器（Ruby, Qt4）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="208"/> + <location filename="../Preferences/ProgramsDialog.py" line="205"/> <source>CORBA IDL Compiler</source> <translation>CORBA IDL 编译器</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="304"/> + <location filename="../Preferences/ProgramsDialog.py" line="301"/> <source>(not configured)</source> <translation>（未配置）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="343"/> + <location filename="../Preferences/ProgramsDialog.py" line="340"/> <source>(not executable)</source> <translation>（不可执行）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="370"/> + <location filename="../Preferences/ProgramsDialog.py" line="367"/> <source>(not found)</source> <translation>（未找到）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="341"/> + <location filename="../Preferences/ProgramsDialog.py" line="338"/> <source>(unknown)</source> <translation>（未知）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="226"/> + <location filename="../Preferences/ProgramsDialog.py" line="223"/> <source>Spell Checker - PyEnchant</source> <translation>拼写检查器——PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="181"/> + <location filename="../Preferences/ProgramsDialog.py" line="178"/> <source>Forms Compiler (Python, PySide)</source> <translation>窗体编译器（Python, PySide）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="186"/> + <location filename="../Preferences/ProgramsDialog.py" line="183"/> <source>Resource Compiler (Python, PySide)</source> <translation>资源编译器（Python, PySide）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="176"/> + <location filename="../Preferences/ProgramsDialog.py" line="173"/> <source>Translation Extractor (Python, PySide)</source> <translation>翻译提取工具（Python, PySide）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="244"/> + <location filename="../Preferences/ProgramsDialog.py" line="241"/> <source>Source Highlighter - Pygments</source> <translation>代码高亮工具——Pygments</translation> </message> @@ -40975,7 +40975,7 @@ <translation>Qt 助手</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="138"/> + <location filename="../Preferences/ProgramsDialog.py" line="139"/> <source>Translation Extractor (Python, PyQt4)</source> <translation>翻译提取工具（Python, PyQt4）</translation> </message> @@ -40985,7 +40985,7 @@ <translation>窗体编译器（Python, PyQt4）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="150"/> + <location filename="../Preferences/ProgramsDialog.py" line="149"/> <source>Resource Compiler (Python, PyQt4)</source> <translation>资源编译器（Python, PyQt4）</translation> </message> @@ -40995,12 +40995,12 @@ <translation>翻译提取工具（Python, PyQt5）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="162"/> + <location filename="../Preferences/ProgramsDialog.py" line="161"/> <source>Forms Compiler (Python, PyQt5)</source> <translation>窗体编译器（Python, PyQt5）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="168"/> + <location filename="../Preferences/ProgramsDialog.py" line="166"/> <source>Resource Compiler (Python, PyQt5)</source> <translation>资源编译器（Python, PyQt5）</translation> </message> @@ -42451,7 +42451,7 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="958"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Forms</source> <translation>窗体</translation> </message> @@ -42636,27 +42636,27 @@ <translation>窗体文件编译失败。</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Compiling forms...</source> <translation>正在编译窗体…</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="916"/> + <location filename="../Project/ProjectFormsBrowser.py" line="903"/> <source>Abort</source> <translation>终止</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>Determining changed forms...</source> <translation>正在确定更改的窗体…</translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="983"/> + <location filename="../Project/ProjectFormsBrowser.py" line="970"/> <source>Compiling changed forms...</source> <translation>正在编译更改的窗体…</translation> </message> @@ -42676,7 +42676,7 @@ <translation><p>窗体文件编译失败。</p><p>原因：{0}</p></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="824"/> + <location filename="../Project/ProjectFormsBrowser.py" line="811"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished">无法启动 {0}。请保证它处在搜索路径中。</translation> </message> @@ -42731,7 +42731,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="954"/> + <location filename="../Project/ProjectFormsBrowser.py" line="941"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -43173,7 +43173,7 @@ <context> <name>ProjectResourcesBrowser</name> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="858"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="849"/> <source>Resources</source> <translation>资源</translation> </message> @@ -43288,27 +43288,27 @@ <translation>资源文件编译失败。</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Compiling resources...</source> <translation>正在编译资源…</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="781"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="772"/> <source>Abort</source> <translation>终止</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>Determining changed resources...</source> <translation>正在确认改变的资源…</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="889"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="880"/> <source>Compiling changed resources...</source> <translation>正在编译改变的资源…</translation> </message> @@ -43328,12 +43328,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="715"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="706"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>无法启动 {0}。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Project/ProjectResourcesBrowser.py" line="854"/> + <location filename="../Project/ProjectResourcesBrowser.py" line="845"/> <source>%v/%m Resources</source> <translation type="unfinished"></translation> </message> @@ -43684,22 +43684,22 @@ <translation>翻译文件 (*.ts) 生成成功。</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>Translation file release</source> <translation>翻译文件发布</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1152"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1143"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>翻译文件 (*.qm) 发布成功。</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1168"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1159"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>翻译文件 (*.qm) 发布失败。</translation> </message> @@ -43719,12 +43719,12 @@ <translation><p>临时项目文件 <b>{0}</b> 不可写。</p></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1084"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1075"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>无法启动 {0}。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1254"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1245"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 lrelease。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> @@ -49148,27 +49148,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> <source>pyuic / pyside-uic Options</source> <translation>pyuic / pyside-uic 选项</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <source>Indent Width:</source> + <translation>缩进宽度：</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> + <source>Select the indent width (default: 4)</source> + <translation>缩进宽度（默认值：4）</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> - <source>Indent Width:</source> - <translation>缩进宽度：</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="191"/> - <source>Select the indent width (default: 4)</source> - <translation>缩进宽度（默认值：4）</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="92"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -49177,6 +49177,16 @@ <source>Enter the path of the Qt tools directory, if they are not found.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/> + <source>PyQt Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/> + <source>Enter the path of the PyQt tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
