Mercurial Repositories > eric / file diff

--- a/eric6/i18n/eric6_es.ts	Mon Mar 09 19:51:02 2020 +0100
+++ b/eric6/i18n/eric6_es.ts	Mon Mar 09 19:51:19 2020 +0100
@@ -27962,7 +27962,7 @@
         <translation>Haciendo commit de cambios al repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/>
         <source>Mercurial Command Server</source>
         <translation>Servidor de Comandos de Mercurial</translation>
     </message>
@@ -27972,7 +27972,7 @@
         <translation>&lt;p&gt;El Servidor de Comandos de Mercurial no ha podido reiniciarse.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El Servidor de Comandos de Mercurial no ha podido iniciarse.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
@@ -28087,62 +28087,62 @@
         <translation>Tip branch actual</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/>
         <source>Mercurial Bookmark</source>
         <translation>Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
         <source>Delete Bookmark</source>
         <translation>Borrar Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
         <source>Select the bookmark to be deleted:</source>
         <translation>Seleccionar el marcador a borrar:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/>
         <source>Delete Mercurial Bookmark</source>
         <translation>Borrar Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/>
         <source>Rename Mercurial Bookmark</source>
         <translation>Renombrar Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/>
         <source>Move Mercurial Bookmark</source>
         <translation>Mover Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/>
         <source>Pull Bookmark</source>
         <translation>Pull de Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/>
         <source>Select the bookmark to be pulled:</source>
         <translation>Seleccinar el marcador sobre el que hacer pull:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/>
         <source>Push Bookmark</source>
         <translation>Push de Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/>
         <source>Select the bookmark to be push:</source>
         <translation>Seleccinar el marcador sobre el que hacer push:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation>
     </message>
@@ -28991,42 +28991,42 @@
 <context>
     <name>HgClient</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/>
         <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/HgClient.py" line="133"/>
-        <source>Did not receive the &apos;hello&apos; message.</source>
-        <translation>No se ha recibido el mensaje &apos;hello&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/>
-        <source>Received data on unexpected channel.</source>
-        <translation>Datos recibidos en canal no esperado.</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/>
+        <source>Did not receive the &apos;hello&apos; message.</source>
+        <translation>No se ha recibido el mensaje &apos;hello&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/>
+        <source>Received data on unexpected channel.</source>
+        <translation>Datos recibidos en canal no esperado.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/>
         <source>Bad &apos;hello&apos; message, expected &apos;capabilities: &apos; but got &apos;{0}&apos;.</source>
         <translation>Mensaje &apos;hello&apos; erróneo, se esperaba &apos;capabilities&apos; pero se obtuvo &apos;{0}&apos;.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/>
         <source>&apos;capabilities&apos; message did not contain any capability.</source>
         <translation>El mensaje &apos;capabilities&apos; no contiene ninguna capacidad.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/>
         <source>Bad &apos;hello&apos; message, expected &apos;encoding: &apos; but got &apos;{0}&apos;.</source>
         <translation>Mensaje &apos;hello&apos; erróneo, se esperaba &apos;encoding&apos; pero se obtuvo &apos;{0}&apos;.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/>
         <source>&apos;encoding&apos; message did not contain any encoding.</source>
         <translation>El mensaje &apos;encoding&apos; no contiene ninguna codificación.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/>
         <source>For message see output dialog.</source>
         <translation>Para mensaje ver el diálogo de output.</translation>
     </message>
@@ -29395,6 +29395,51 @@
         <source>Errors</source>
         <translation>Errores</translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/>
+        <source>Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/>
+        <source>Press to send the input to the subversion process</source>
+        <translation type="obsolete">Pulsar para enviar el input al proceso de subversion</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/>
+        <source>&amp;Send</source>
+        <translation type="unfinished">&amp;Enviar</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/>
+        <source>Alt+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/>
+        <source>Select to switch the input field to password mode</source>
+        <translation type="unfinished">Seleccionar para cambiar el campo de input a modo contraseña</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/>
+        <source>&amp;Password Mode</source>
+        <translation type="unfinished">&amp;Modo de contraseña</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/>
+        <source>Press to send the input to the Mercurial process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/>
+        <source>Enter data to be sent to the Mercurial process</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgDiffDialog</name>
@@ -49227,17 +49272,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1621"/>
+        <location filename="../Preferences/__init__.py" line="1622"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1649"/>
+        <location filename="../Preferences/__init__.py" line="1650"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1649"/>
+        <location filename="../Preferences/__init__.py" line="1650"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
@@ -58387,27 +58432,27 @@
         <translation>Introducir el postfijo para nombre de las herramientas Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/>
         <source>pyuic / pyside-uic Options</source>
         <translation>Opciones de pyuic / pyside-uic</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/>
+        <source>Indent Width:</source>
+        <translation>Ancho de indentación:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/>
+        <source>Select the indent width (default: 4)</source>
+        <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/>
+        <source>Generate imports relative to &apos;.&apos;</source>
+        <translation>Generar imports relativos a &apos;.&apos;</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/>
-        <source>Indent Width:</source>
-        <translation>Ancho de indentación:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/>
-        <source>Select the indent width (default: 4)</source>
-        <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/>
-        <source>Generate imports relative to &apos;.&apos;</source>
-        <translation>Generar imports relativos a &apos;.&apos;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/>
         <source>Tools Directory:</source>
         <translation>Directorio de las Herramientas:</translation>
     </message>
@@ -58427,10 +58472,20 @@
         <translation>Introducir la ruta del directorio de las herramientas PyQt, si no se encuentran automáticamente.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/>
         <source>Sample: {0}designer{1}</source>
         <translation>Muestra: {0}designer{1}</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/>
+        <source>PySide2 Tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/>
+        <source>Enter the path of the PySide2 tools directory, if they are not found.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Queues</name>