--- a/i18n/eric6_es.ts Wed Feb 25 19:15:33 2015 +0100 +++ b/i18n/eric6_es.ts Wed Feb 25 19:21:32 2015 +0100 @@ -4228,7 +4228,7 @@ <message> <location filename="../Preferences/ConfigurationDialog.py" line="145"/> <source>Log-Viewer</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Visor Log</translation> </message> <message> <location filename="../Preferences/ConfigurationDialog.py" line="148"/> @@ -25288,7 +25288,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="295"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -25300,317 +25300,317 @@ <p>Este diálogo muestra el estado del proyecto o archivo seleccionado.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="98"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <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="217"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <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="242"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="261"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="283"/> + <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="286"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="289"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="296"/> <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"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="303"/> <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"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="306"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="309"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Refresh</source> <translation>Recargar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="58"/> <source>Press to refresh the status display</source> <translation>Presione para actualizar el estado visualizado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> <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="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="118"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="183"/> <source>added</source> <translation>añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>modified</source> <translation>modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> <source>removed</source> <translation>eliminado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>not tracked</source> <translation>sin seguimiento</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="185"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="347"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="347"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="690"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="856"/> <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="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="754"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="754"/> <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="818"/> + <source>Revert</source> + <translation>Revertir</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="777"/> - <source>Revert</source> - <translation>Revertir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="818"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="52"/> <source>&Filter on Status:</source> <translation>&Filtro sobre Status:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="62"/> <source>Select the status of entries to be shown</source> <translation>Seleccionar el status de las entradas a mostrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="144"/> <source>Commit the selected changes</source> <translation>Aplicar commit a los cambios seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> - <source>&Commit</source> - <translation>&Commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> - <source>Add the selected entries to the repository</source> - <translation>Añadir las entradas seleccionadas al repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> - <source>&Add</source> - <translation>&Add</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> - <source>Show differences of the selected entries to the repository</source> - <translation>Mostrar las diferencias de las entradas seleccionadas con el repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> - <source>&Differences</source> - <translation>&Diferencias</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>&Commit</source> + <translation>&Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="161"/> + <source>Add the selected entries to the repository</source> + <translation>Añadir las entradas seleccionadas al repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="164"/> + <source>&Add</source> + <translation>&Add</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="171"/> + <source>Show differences of the selected entries to the repository</source> + <translation>Mostrar las diferencias de las entradas seleccionadas con el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="174"/> + <source>&Differences</source> + <translation>&Diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="191"/> <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="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="194"/> <source>Re&vert</source> <translation>Re&vert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="201"/> <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"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="204"/> <source>For&get</source> <translation>Ol&vidar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="211"/> <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"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="214"/> <source>&Restore</source> <translation>&Restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="140"/> <source>Restore missing</source> <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="564"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="690"/> <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="93"/> - <source>Select all for commit</source> - <translation>Seleccionar todo para hacer commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> - <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="261"/> - <source>Mercurial Queue Repository Status</source> - <translation>Estado de Cola Repositorio Mercurial</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>Mostrar diferencias de la entrada seleccionada con el repositorio en modo lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> - <source>Side-b&y-Side Diff</source> - <translation>&Lado a Lado Diff</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="822"/> - <source>Side-by-Side Diff</source> - <translation>Lado a Lado Diff</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="822"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="112"/> + <source>Select all for commit</source> + <translation>Seleccionar todo para hacer commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="114"/> + <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="292"/> + <source>Mercurial Queue Repository Status</source> + <translation>Estado de Cola Repositorio Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="181"/> + <source>Show differences of the selected entry to the repository in a side-by-side manner</source> + <translation>Mostrar diferencias de la entrada seleccionada con el repositorio en modo lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="184"/> + <source>Side-b&y-Side Diff</source> + <translation>&Lado a Lado Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="863"/> + <source>Side-by-Side Diff</source> + <translation>Lado a Lado Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="863"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="131"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="159"/> <source>Add as Large File</source> <translation>Añadir como Archivo Grande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="162"/> <source>Add as Normal File</source> <translation>Añadir como Archivo Normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> <source>Forget missing</source> <translation>Olvidar elementos perdidos</translation> </message>