--- a/i18n/eric5_es.ts Tue Mar 18 19:23:35 2014 +0100 +++ b/i18n/eric5_es.ts Wed Mar 19 18:42:09 2014 +0100 @@ -23636,17 +23636,17 @@ <translation>Mensaje de Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation>Error:</translation> </message> @@ -23756,42 +23756,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <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/QueuesExtension/HgQueuesListDialog.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="224"/> <source>no patches found</source> <translation>no se han encontrado patches</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <source>applied</source> + <translation>aplicado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>applied</source> - <translation>aplicado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>guarded</source> <translation>con guard</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="55"/> - <source>missing</source> - <translation>perdido</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="300"/> - <source>unknown</source> - <translation>desconocido</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation>perdido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="298"/> + <source>unknown</source> + <translation>desconocido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation>sin aplicar</translation> </message> @@ -24797,7 +24797,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="251"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -24879,102 +24879,102 @@ <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> <source>added</source> <translation>añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="155"/> <source>modified</source> <translation>modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>removed</source> <translation>eliminado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="157"/> <source>not tracked</source> <translation>sin seguimiento</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="153"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="158"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <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="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="813"/> <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="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <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="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>Remove from repository</source> - <translation>Eliminar de repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="715"/> + <translation type="obsolete">Eliminar de repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="734"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -25049,42 +25049,42 @@ <translation>&Restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> <source>Restore missing</source> <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="515"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="522"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="793"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <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="80"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> <source>Select all for commit</source> <translation>Seleccionar todo para hacer commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="83"/> <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="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="248"/> <source>Mercurial Queue Repository Status</source> <translation>Estado de Cola del Repositorio Mercurial</translation> </message> @@ -25099,30 +25099,35 @@ <translation>&Lado a Lado Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Side-by-Side Diff</source> <translation>Lado a Lado Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <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="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> <source>Add as Large File</source> <translation>Añadir como Archivo Grande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="131"/> <source>Add as Normal File</source> <translation>Añadir como Archivo Normal</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -51582,12 +51587,12 @@ <translation>Símbolos</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="85"/> + <location filename="../UI/SymbolsWidget.ui" line="82"/> <source>Symbol code:</source> <translation>Código del símbolo:</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="92"/> + <location filename="../UI/SymbolsWidget.ui" line="89"/> <source>Enter the symbol code</source> <translation>Introduzca el código del símbolo</translation> </message>