Sun, 22 May 2011 18:00:52 +0200
Refined the Mercurial patches list dialog.
--- a/Documentation/Help/source.qhp Sun May 22 16:35:01 2011 +0200 +++ b/Documentation/Help/source.qhp Sun May 22 18:00:52 2011 +0200 @@ -9610,9 +9610,8 @@ <keyword name="HgQueuesListDialog (Constructor)" id="HgQueuesListDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__init__" /> <keyword name="HgQueuesListDialog.__finish" id="HgQueuesListDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__finish" /> <keyword name="HgQueuesListDialog.__generateItem" id="HgQueuesListDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__generateItem" /> - <keyword name="HgQueuesListDialog.__getApplied" id="HgQueuesListDialog.__getApplied" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__getApplied" /> + <keyword name="HgQueuesListDialog.__getSeries" id="HgQueuesListDialog.__getSeries" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__getSeries" /> <keyword name="HgQueuesListDialog.__getTop" id="HgQueuesListDialog.__getTop" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__getTop" /> - <keyword name="HgQueuesListDialog.__getUnapplied" id="HgQueuesListDialog.__getUnapplied" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__getUnapplied" /> <keyword name="HgQueuesListDialog.__markTopItem" id="HgQueuesListDialog.__markTopItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__markTopItem" /> <keyword name="HgQueuesListDialog.__procFinished" id="HgQueuesListDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__procFinished" /> <keyword name="HgQueuesListDialog.__readStderr" id="HgQueuesListDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__readStderr" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html Sun May 22 16:35:01 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html Sun May 22 18:00:52 2011 +0200 @@ -63,15 +63,12 @@ <td><a href="#HgQueuesListDialog.__generateItem">__generateItem</a></td> <td>Private method to generate a patch item in the list of patches.</td> </tr><tr> -<td><a href="#HgQueuesListDialog.__getApplied">__getApplied</a></td> -<td>Private slot to get the list of applied patches.</td> +<td><a href="#HgQueuesListDialog.__getSeries">__getSeries</a></td> +<td>Private slot to get the list of applied, unapplied and guarded patches and patches missing in the series file.</td> </tr><tr> <td><a href="#HgQueuesListDialog.__getTop">__getTop</a></td> <td>Private slot to get patch at the top of the stack.</td> </tr><tr> -<td><a href="#HgQueuesListDialog.__getUnapplied">__getUnapplied</a></td> -<td>Private slot to get the list of unapplied patches.</td> -</tr><tr> <td><a href="#HgQueuesListDialog.__markTopItem">__markTopItem</a></td> <td>Private slot to mark the top patch entry.</td> </tr><tr> @@ -132,11 +129,17 @@ Private slot called when the process finished or the user pressed the button. </p><a NAME="HgQueuesListDialog.__generateItem" ID="HgQueuesListDialog.__generateItem"></a> <h4>HgQueuesListDialog.__generateItem</h4> -<b>__generateItem</b>(<i>name, summary, error=False</i>) +<b>__generateItem</b>(<i>index, status, name, summary, error=False</i>) <p> Private method to generate a patch item in the list of patches. </p><dl> -<dt><i>name</i></dt> +<dt><i>index</i></dt> +<dd> +index of the patch (integer, -1 for missing) +</dd><dt><i>status</i></dt> +<dd> +status of the patch (string) +</dd><dt><i>name</i></dt> <dd> name of the patch (string) </dd><dt><i>summary</i></dt> @@ -146,21 +149,23 @@ <dd> flag indicating an error entry (boolean) </dd> -</dl><a NAME="HgQueuesListDialog.__getApplied" ID="HgQueuesListDialog.__getApplied"></a> -<h4>HgQueuesListDialog.__getApplied</h4> -<b>__getApplied</b>(<i></i>) +</dl><a NAME="HgQueuesListDialog.__getSeries" ID="HgQueuesListDialog.__getSeries"></a> +<h4>HgQueuesListDialog.__getSeries</h4> +<b>__getSeries</b>(<i>missing=False</i>) <p> - Private slot to get the list of applied patches. -</p><a NAME="HgQueuesListDialog.__getTop" ID="HgQueuesListDialog.__getTop"></a> + Private slot to get the list of applied, unapplied and guarded patches and + patches missing in the series file. +</p><dl> +<dt><i>missing</i></dt> +<dd> +flag indicating to get the patches missing in the series file + (boolean) +</dd> +</dl><a NAME="HgQueuesListDialog.__getTop" ID="HgQueuesListDialog.__getTop"></a> <h4>HgQueuesListDialog.__getTop</h4> <b>__getTop</b>(<i></i>) <p> Private slot to get patch at the top of the stack. -</p><a NAME="HgQueuesListDialog.__getUnapplied" ID="HgQueuesListDialog.__getUnapplied"></a> -<h4>HgQueuesListDialog.__getUnapplied</h4> -<b>__getUnapplied</b>(<i></i>) -<p> - Private slot to get the list of unapplied patches. </p><a NAME="HgQueuesListDialog.__markTopItem" ID="HgQueuesListDialog.__markTopItem"></a> <h4>HgQueuesListDialog.__markTopItem</h4> <b>__markTopItem</b>(<i>name</i>)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun May 22 16:35:01 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun May 22 18:00:52 2011 +0200 @@ -45,6 +45,13 @@ self.process.finished.connect(self.__procFinished) self.process.readyReadStandardOutput.connect(self.__readStdout) self.process.readyReadStandardError.connect(self.__readStderr) + + self.__statusDict = { + "A": self.trUtf8("applied"), + "U": self.trUtf8("not applied"), + "G": self.trUtf8("guarded"), + "D": self.trUtf8("missing"), + } def closeEvent(self, e): """ @@ -81,46 +88,27 @@ return self.__repodir = repodir - self.__patchesCount = 0 - self.__getApplied() + self.__getSeries() - def __getApplied(self): + def __getSeries(self, missing=False): """ - Private slot to get the list of applied patches. + Private slot to get the list of applied, unapplied and guarded patches and + patches missing in the series file. + + @param missing flag indicating to get the patches missing in the series file + (boolean) """ - self.__mode = "qapplied" + if missing: + self.__mode = "missing" + else: + self.__mode = "qseries" args = [] - args.append('qapplied') + args.append('qseries') args.append('--summary') - - self.process.kill() - self.process.setWorkingDirectory(self.__repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted() - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical(self, - self.trUtf8('Process Generation Error'), - self.trUtf8( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() - - def __getUnapplied(self): - """ - Private slot to get the list of unapplied patches. - """ - self.__mode = "qunapplied" - - args = [] - args.append('qunapplied') - args.append('--summary') + args.append('--verbose') + if missing: + args.append('--missing') self.process.kill() self.process.setWorkingDirectory(self.__repodir) @@ -188,7 +176,7 @@ self.process = None if self.patchesList.topLevelItemCount() == 0: - # no bookmarks defined + # no patches present self.__generateItem(self.trUtf8("no patches found"), "", True) self.patchesList.doItemsLayout() self.__resizeColumns() @@ -212,9 +200,9 @@ @param exitCode exit code of the process (integer) @param exitStatus exit status of the process (QProcess.ExitStatus) """ - if self.__mode == "qapplied": - self.__getUnapplied() - elif self.__mode == "qunapplied": + if self.__mode == "qseries": + self.__getSeries(True) + elif self.__mode == "missing": self.__getTop() else: self.__finish() @@ -233,10 +221,12 @@ self.patchesList.header().resizeSections(QHeaderView.ResizeToContents) self.patchesList.header().setStretchLastSection(True) - def __generateItem(self, name, summary, error=False): + def __generateItem(self, index, status, name, summary, error=False): """ Private method to generate a patch item in the list of patches. + @param index index of the patch (integer, -1 for missing) + @param status status of the patch (string) @param name name of the patch (string) @param summary first line of the patch header (string) @param error flag indicating an error entry (boolean) @@ -249,15 +239,29 @@ summary ]) else: - self.__patchesCount += 1 + if index == -1: + indexStr = "" + else: + indexStr = "{0:>7}".format(index) + try: + statusStr = self.__statusDict[status] + except KeyError: + statusStr = self.trUtf8("unknown") itm = QTreeWidgetItem(self.patchesList, [ - "{0:>7}".format(self.__patchesCount), + indexStr, name, - self.__mode == "qapplied" and \ - self.trUtf8("applied") or \ - self.trUtf8("not applied"), + statusStr, summary ]) + if status == "A": + # applied + for column in range(itm.columnCount()): + itm.setForeground(column, Qt.blue) + elif status == "D": + # missing + for column in range(itm.columnCount()): + itm.setForeground(column, Qt.red) + itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(2, Qt.AlignHCenter) @@ -293,10 +297,18 @@ else: l = s.split(": ", 1) if len(l) == 1: - name, summary = l[0][:-1], "" + data, summary = l[0][:-1], "" else: - name, summary = l[0], l[1] - self.__generateItem(name, summary) + data, summary = l[0], l[1] + l = data.split(None, 2) + if len(l) == 2: + # missing entry + index, status, name = -1, l[0], l[1] + elif len(l) == 3: + index, status, name = l[:3] + else: + continue + self.__generateItem(index, status, name, summary) def __readStderr(self): """
--- a/i18n/eric5_cs.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_cs.ts Sun May 22 18:00:52 2011 +0200 @@ -18674,27 +18674,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished">chybějící</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">neznámý</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_de.ts Sun May 22 18:00:52 2011 +0200 @@ -18433,30 +18433,45 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation>angewandt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation>nicht angewandt</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation>geschützt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation>fehlt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation>unbekannt</translation> + </message> </context> <context> <name>HgQueuesListGuardsDialog</name>
--- a/i18n/eric5_en.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_en.ts Sun May 22 18:00:52 2011 +0200 @@ -18323,27 +18323,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_es.ts Sun May 22 18:00:52 2011 +0200 @@ -18488,27 +18488,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">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/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished">perdido</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">desconocido</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_fr.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_fr.ts Sun May 22 18:00:52 2011 +0200 @@ -19908,27 +19908,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished">manquant</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">inconnu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_it.ts Sun May 22 18:00:52 2011 +0200 @@ -18429,27 +18429,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished">mancante</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">sconosciuto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_ru.ts Sun May 22 18:00:52 2011 +0200 @@ -18536,27 +18536,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">неизвестный</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_tr.ts Sun May 22 18:00:52 2011 +0200 @@ -18671,27 +18671,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished">kayıp</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">bilinmeyen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun May 22 16:35:01 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun May 22 18:00:52 2011 +0200 @@ -19874,27 +19874,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished">遗漏</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <source>unknown</source> + <translation type="unfinished">未知</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message>