diff -r ae21f79512b7 -r 10a133f3a5e8 i18n/eric5_es.ts --- a/i18n/eric5_es.ts Thu Aug 01 18:52:01 2013 +0200 +++ b/i18n/eric5_es.ts Thu Aug 01 19:12:57 2013 +0200 @@ -21043,117 +21043,117 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation>Mostrar diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> + <source>Select all versioned file entries</source> + <translation>Seleccionar todas las entradas de archivo versionadas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Select all versioned file entries</source> - <translation>Seleccionar todas las entradas de archivo versionadas</translation> + <source>Select all local directory entries</source> + <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> - <source>Select all local directory entries</source> - <translation>Seleccionar todas las entradas de directorio locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="243"/> <source>Show annotated file</source> <translation>Mostrar archivo anotado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> <source>Remove from repository only</source> <translation>Eliminar solamente del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos de traducción del repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> <source>Conflict resolved</source> <translation>Conflicto resuelto</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="404"/> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation>Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> @@ -23361,7 +23361,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -23383,47 +23383,47 @@ <translation>Ruta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="198"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="217"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="239"/> <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/HgStatusDialog.ui" line="232"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="242"/> - <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/HgStatusDialog.ui" line="249"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> + <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/HgStatusDialog.ui" line="259"/> + <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/HgStatusDialog.ui" line="262"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="265"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -23438,107 +23438,107 @@ <translation>Presione para actualizar el estado visualizado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="80"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> - <source>added</source> - <translation>añadido</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="116"/> - <source>modified</source> - <translation>modificado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="117"/> - <source>removed</source> - <translation>eliminado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="118"/> - <source>not tracked</source> - <translation>sin seguimiento</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="114"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="115"/> - <source>ignored</source> - <translation>ignorado</translation> + <source>added</source> + <translation>añadido</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="119"/> + <source>modified</source> + <translation>modificado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="120"/> + <source>removed</source> + <translation>eliminado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="117"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="118"/> + <source>ignored</source> + <translation>ignorado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="271"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="271"/> <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/HgStatusDialog.py" line="571"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="583"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="718"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="622"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="622"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="682"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> <source>Remove from repository</source> <translation>Eliminar de repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="643"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="682"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -23583,75 +23583,100 @@ <translation>&Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> <source>Revert the selected entries to the last revision in the repository</source> <translation>Revertir las entradas seleccionadas a la última revisión en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> - <source>Re&vert</source> - <translation>Re&vert</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> - <source>Forget about the selected missing entries</source> - <translation>Olvidar las entradas perdidas seleccionadas</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> - <source>For&get</source> - <translation>Ol&vidar</translation> + <source>Re&vert</source> + <translation>Re&vert</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> - <source>Restore the selected missing entries from the repository</source> - <translation>Restaurar las entradas perdidas seleccionadas desde el repositorio</translation> + <source>Forget about the selected missing entries</source> + <translation>Olvidar las entradas perdidas seleccionadas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>For&get</source> + <translation>Ol&vidar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="167"/> + <source>Restore the selected missing entries from the repository</source> + <translation>Restaurar las entradas perdidas seleccionadas desde el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="170"/> <source>&Restore</source> <translation>&Restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="82"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> <source>Restore missing</source> <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="485"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="699"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="571"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="583"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Select all for commit</source> <translation>Seleccionar todo para hacer commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Deselect all from commit</source> <translation>Deshacer selección de todo en el commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="209"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Show differences of the selected entry to the repository in a side-by-side manner</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Side-b&y-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="724"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="724"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="84"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name>