--- a/i18n/eric5_es.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_es.ts Fri Apr 30 16:23:24 2010 +0000 @@ -13356,22 +13356,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -13386,20 +13376,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13878,37 +13883,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <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/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> @@ -13946,17 +13951,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -14086,27 +14091,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -14121,17 +14126,17 @@ <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished">No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -14229,108 +14234,108 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Procesando la solicitud, por favor aguarde...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <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/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished">No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -15355,7 +15360,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -15375,22 +15380,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -15400,7 +15405,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -15420,80 +15425,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Saltar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>