--- a/i18n/eric5_es.ts Wed Apr 28 15:41:48 2010 +0000 +++ b/i18n/eric5_es.ts Wed Apr 28 17:17:09 2010 +0000 @@ -6251,197 +6251,197 @@ <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4142"/> + <location filename="QScintilla/Editor.py" line="4143"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4142"/> + <location filename="QScintilla/Editor.py" line="4143"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4188"/> + <location filename="QScintilla/Editor.py" line="4189"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4184"/> + <location filename="QScintilla/Editor.py" line="4185"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4188"/> + <location filename="QScintilla/Editor.py" line="4189"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4281"/> + <location filename="QScintilla/Editor.py" line="4282"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4281"/> + <location filename="QScintilla/Editor.py" line="4282"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4397"/> + <location filename="QScintilla/Editor.py" line="4398"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4397"/> + <location filename="QScintilla/Editor.py" line="4398"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4536"/> + <location filename="QScintilla/Editor.py" line="4537"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4536"/> + <location filename="QScintilla/Editor.py" line="4537"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4564"/> + <location filename="QScintilla/Editor.py" line="4565"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4604"/> + <location filename="QScintilla/Editor.py" line="4605"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4585"/> + <location filename="QScintilla/Editor.py" line="4586"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4604"/> + <location filename="QScintilla/Editor.py" line="4605"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4621"/> + <location filename="QScintilla/Editor.py" line="4622"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4639"/> + <location filename="QScintilla/Editor.py" line="4640"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4650"/> + <location filename="QScintilla/Editor.py" line="4651"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4650"/> + <location filename="QScintilla/Editor.py" line="4651"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4677"/> + <location filename="QScintilla/Editor.py" line="4678"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4677"/> + <location filename="QScintilla/Editor.py" line="4678"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4800"/> + <location filename="QScintilla/Editor.py" line="4801"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4804"/> + <location filename="QScintilla/Editor.py" line="4805"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5000"/> + <location filename="QScintilla/Editor.py" line="5001"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5018"/> + <location filename="QScintilla/Editor.py" line="5019"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5020"/> + <location filename="QScintilla/Editor.py" line="5021"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5022"/> + <location filename="QScintilla/Editor.py" line="5023"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5025"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5026"/> + <location filename="QScintilla/Editor.py" line="5027"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5029"/> + <location filename="QScintilla/Editor.py" line="5030"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5047"/> + <location filename="QScintilla/Editor.py" line="5048"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5063"/> + <location filename="QScintilla/Editor.py" line="5064"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5090"/> + <location filename="QScintilla/Editor.py" line="5091"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5151"/> + <location filename="QScintilla/Editor.py" line="5152"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5151"/> + <location filename="QScintilla/Editor.py" line="5152"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5172"/> + <location filename="QScintilla/Editor.py" line="5173"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5172"/> + <location filename="QScintilla/Editor.py" line="5173"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5188"/> + <location filename="QScintilla/Editor.py" line="5189"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5188"/> + <location filename="QScintilla/Editor.py" line="5189"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -6516,7 +6516,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -6526,12 +6526,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5423"/> + <location filename="QScintilla/Editor.py" line="5424"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5425"/> + <location filename="QScintilla/Editor.py" line="5426"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -6576,42 +6576,42 @@ <translation><p>El archivo <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4578"/> + <location filename="QScintilla/Editor.py" line="4579"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4585"/> + <location filename="QScintilla/Editor.py" line="4586"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4621"/> + <location filename="QScintilla/Editor.py" line="4622"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4639"/> + <location filename="QScintilla/Editor.py" line="4640"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4795"/> + <location filename="QScintilla/Editor.py" line="4796"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric5. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4883"/> + <location filename="QScintilla/Editor.py" line="4884"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5000"/> + <location filename="QScintilla/Editor.py" line="5001"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5090"/> + <location filename="QScintilla/Editor.py" line="5091"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -6636,12 +6636,12 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4517"/> + <location filename="QScintilla/Editor.py" line="4518"/> <source>py3flakes Warning</source> <translation>Advertencia de py3flakes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4517"/> + <location filename="QScintilla/Editor.py" line="4518"/> <source>No py3flakes warning message available.</source> <translation>No hay un mensaje de advertencia de py3flakes disponible.</translation> </message> @@ -13206,197 +13206,197 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="165"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="167"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> <source>Commiting changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="524"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="582"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1526"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1596"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <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="1667"/> + <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="1712"/> + <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1732"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> @@ -13878,37 +13878,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.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/HgDiffDialog.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> <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="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> <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 +13946,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="802"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="799"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -13966,175 +13966,200 @@ <translation>Introduzca la expresión regular de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="136"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="189"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="194"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="199"/> <source>Copy from</source> <translation>Copiar desde</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="207"/> <source>Copy from Rev</source> - <translation>Copiar desde la Rev</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="217"/> + <translation type="obsolete">Copiar desde la Rev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="209"/> <source>Press to get the next bunch of log entries</source> <translation>Pulse para recuperar el siguiente conjunto de entradas de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="212"/> <source>&Next</source> <translation>Siguie&nte</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="219"/> <source>Enter the limit of entries to fetch</source> <translation>Introduzca el límite de entradas a recuperar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="238"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleccione para detener el listado de mensajes de log de copy o move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="241"/> <source>Stop on Copy/Move</source> <translation>Detener en copy/move</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>Press to generate a diff to the previous revision</source> - <translation>Pulse para generar un diff con la anterior revisión</translation> + <translation type="obsolete">Pulse para generar un diff con la anterior revisión</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="266"/> <source>&Diff to Previous</source> - <translation>&Diff con la anterior</translation> + <translation type="obsolete">&Diff con la anterior</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="273"/> <source>Press to compare two revisions</source> - <translation>Pulse para comparar dos revisiones</translation> + <translation type="obsolete">Pulse para comparar dos revisiones</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="276"/> <source>&Compare Revisions</source> - <translation>&Comparar Revisiones</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <translation type="obsolete">&Comparar Revisiones</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="296"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="305"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="321"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="343"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> <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/HgLogBrowserDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="121"/> <source>Branch</source> <translation>Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="146"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> <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="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> <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="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="116"/> + <source>Graph</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <source>Press to generate a diff to the first parent revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <source>Diff to Parent &1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <source>Press to generate a diff to the second parent revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="268"/> + <source>Diff to Parent &2</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -14204,91 +14229,112 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="49"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> <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="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> <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="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> <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="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> <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="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <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"/> + <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"/> + <source>Mercurial Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <source>Added {0} (copied from {1})<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -40990,17 +41036,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -41011,31 +41057,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1377"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1026"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -41044,7 +41090,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>