diff -r 37089cbeb1b9 -r e07d1df4c64a i18n/eric6_es.ts --- a/i18n/eric6_es.ts Mon Feb 13 19:08:26 2017 +0100 +++ b/i18n/eric6_es.ts Tue Feb 14 19:57:58 2017 +0100 @@ -28237,319 +28237,374 @@ <p>Este diálogo muestra el estado del proyecto o archivo seleccionado.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="102"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="107"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="155"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="174"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="196"/> <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="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="199"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="209"/> <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="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="216"/> <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="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="219"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <source>Refresh</source> + <translation>Recargar</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="59"/> - <source>Refresh</source> - <translation>Recargar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <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="113"/> <source>Commit changes to repository...</source> - <translation>Hacer commit de los cambios al repositorio...</translation> + <translation type="obsolete">Hacer commit de los cambios al repositorio...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> <source>Add to repository</source> - <translation>Añadir al repositorio</translation> + <translation type="obsolete">Añadir al repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="139"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> - <source>Adjust column sizes</source> - <translation>Adjustar tamaño de columnas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> - <source>added</source> - <translation>añadido</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/> - <source>modified</source> - <translation>modificado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="197"/> - <source>removed</source> - <translation>eliminado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="198"/> - <source>not tracked</source> - <translation>sin seguimiento</translation> + <source>Commit the selected changes</source> + <translation>Aplicar commit a los cambios seleccionados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="194"/> + <source>Adjust column sizes</source> + <translation type="unfinished">Adjustar tamaño de columnas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <source>added</source> + <translation>añadido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> + <source>modified</source> + <translation>modificado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="114"/> + <source>removed</source> + <translation>eliminado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="115"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="111"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="112"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="116"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="384"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="384"/> <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.ui" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="97"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="802"/> <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="778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="700"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="700"/> <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="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="764"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="723"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="764"/> <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"/> - <source>&Filter on Status:</source> - <translation>&Filtro sobre Status:</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>&Filter on Status:</source> + <translation>&Filtro sobre Status:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="59"/> <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="116"/> - <source>Commit the selected changes</source> - <translation>Aplicar commit a los cambios seleccionados</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="119"/> <source>&Commit</source> - <translation>&Commit</translation> + <translation type="obsolete">&Commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="133"/> <source>Add the selected entries to the repository</source> - <translation>Añadir las entradas seleccionadas al repositorio</translation> + <translation type="obsolete">Añadir las entradas seleccionadas al repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="136"/> <source>&Add</source> - <translation>&Add</translation> + <translation type="obsolete">&Add</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="143"/> <source>Show differences of the selected entries to the repository</source> - <translation>Mostrar las diferencias de las entradas seleccionadas con el repositorio</translation> + <translation type="obsolete">Mostrar las diferencias de las entradas seleccionadas con el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="146"/> <source>&Differences</source> - <translation>&Diferencias</translation> + <translation type="obsolete">&Diferencias</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="163"/> <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> + <translation type="obsolete">Revertir las entradas seleccionadas a la última revisión en el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="166"/> <source>Re&vert</source> - <translation>Re&vert</translation> + <translation type="obsolete">Re&vert</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="173"/> <source>Forget about the selected missing entries</source> - <translation>Olvidar las entradas perdidas seleccionadas</translation> + <translation type="obsolete">Olvidar las entradas perdidas seleccionadas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="176"/> <source>For&get</source> - <translation>Ol&vidar</translation> + <translation type="obsolete">Ol&vidar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="183"/> <source>Restore the selected missing entries from the repository</source> - <translation>Restaurar las entradas perdidas seleccionadas desde el repositorio</translation> + <translation type="obsolete">Restaurar las entradas perdidas seleccionadas desde el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="186"/> <source>&Restore</source> - <translation>&Restore</translation> + <translation type="obsolete">&Restore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="132"/> <source>Show differences</source> - <translation>Mostrar diferencias</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> + <translation type="obsolete">Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> <source>Restore missing</source> <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="579"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="116"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="636"/> <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="116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="140"/> <source>Select all for commit</source> <translation>Seleccionar todo para hacer commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="118"/> <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="313"/> + <translation type="obsolete">Deshacer selección de todo en el commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> <source>Mercurial Queue Repository Status</source> <translation>Estado de Cola Repositorio Mercurial</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="153"/> <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> + <translation type="obsolete">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="156"/> <source>Side-b&y-Side Diff</source> - <translation>&Lado a Lado Diff</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="887"/> + <translation type="obsolete">&Lado a Lado Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="809"/> <source>Side-by-Side Diff</source> <translation>Lado a Lado Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="809"/> <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="135"/> <source>Show differences side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> - <source>Add as Large File</source> - <translation>Añadir como Archivo Grande</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="167"/> - <source>Add as Normal File</source> - <translation>Añadir como Archivo Normal</translation> + <translation type="obsolete">Mostrar diferencias lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>Add as Large Files</source> + <translation type="unfinished">Añadir como Archivo Grande</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="155"/> + <source>Add as Normal Files</source> + <translation type="unfinished">Añadir como Archivo Normal</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="183"/> + <source>Forget missing</source> + <translation>Olvidar elementos perdidos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> - <source>Forget missing</source> - <translation>Olvidar elementos perdidos</translation> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> + <source>Add the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <source>Add the selected files as a large files using the 'Large Files' extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="157"/> + <source>Add the selected files as a normal files using the 'Large Files' extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <source>Shows the differences of the selected entry in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="168"/> + <source>Differences Side-By-Side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="170"/> + <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> + <source>Reverts the changes of the selected files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="185"/> + <source>Forgets about the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="26"/> + <source>Select action from menu</source> + <translation type="unfinished">Seleccionar acción del menú</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <source>Restores the selected missing files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> </message> </context> <context>