--- a/i18n/eric5_es.ts Sun Jun 17 13:34:46 2012 +0200 +++ b/i18n/eric5_es.ts Sun Jun 17 14:08:47 2012 +0200 @@ -7422,7 +7422,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4301"/> + <location filename="QScintilla/Editor.py" line="4304"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -7522,207 +7522,207 @@ <translation>Guardar archivo</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3811"/> + <location filename="QScintilla/Editor.py" line="3814"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3811"/> + <location filename="QScintilla/Editor.py" line="3814"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4304"/> + <location filename="QScintilla/Editor.py" line="4307"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4621"/> + <location filename="QScintilla/Editor.py" line="4624"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4621"/> + <location filename="QScintilla/Editor.py" line="4624"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4667"/> + <location filename="QScintilla/Editor.py" line="4670"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4663"/> + <location filename="QScintilla/Editor.py" line="4666"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4667"/> + <location filename="QScintilla/Editor.py" line="4670"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4759"/> + <location filename="QScintilla/Editor.py" line="4762"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4759"/> + <location filename="QScintilla/Editor.py" line="4762"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4892"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4892"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5114"/> + <location filename="QScintilla/Editor.py" line="5117"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5114"/> + <location filename="QScintilla/Editor.py" line="5117"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5142"/> + <location filename="QScintilla/Editor.py" line="5145"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5182"/> + <location filename="QScintilla/Editor.py" line="5185"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5163"/> + <location filename="QScintilla/Editor.py" line="5166"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5182"/> + <location filename="QScintilla/Editor.py" line="5185"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5199"/> + <location filename="QScintilla/Editor.py" line="5202"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5214"/> + <location filename="QScintilla/Editor.py" line="5217"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5225"/> + <location filename="QScintilla/Editor.py" line="5228"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5225"/> + <location filename="QScintilla/Editor.py" line="5228"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5250"/> + <location filename="QScintilla/Editor.py" line="5253"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5250"/> + <location filename="QScintilla/Editor.py" line="5253"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5379"/> + <location filename="QScintilla/Editor.py" line="5382"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5636"/> + <location filename="QScintilla/Editor.py" line="5639"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5654"/> + <location filename="QScintilla/Editor.py" line="5657"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5659"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5661"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5663"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5662"/> - <source>Add localized resource...</source> - <translation>Añadir recursos localizados...</translation> - </message> - <message> <location filename="QScintilla/Editor.py" line="5665"/> + <source>Add localized resource...</source> + <translation>Añadir recursos localizados...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5668"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5683"/> + <location filename="QScintilla/Editor.py" line="5686"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5699"/> + <location filename="QScintilla/Editor.py" line="5702"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5726"/> + <location filename="QScintilla/Editor.py" line="5729"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5787"/> + <location filename="QScintilla/Editor.py" line="5790"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5787"/> + <location filename="QScintilla/Editor.py" line="5790"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5804"/> + <location filename="QScintilla/Editor.py" line="5807"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5804"/> + <location filename="QScintilla/Editor.py" line="5807"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5816"/> + <location filename="QScintilla/Editor.py" line="5819"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5816"/> + <location filename="QScintilla/Editor.py" line="5819"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -7797,7 +7797,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="6077"/> + <location filename="QScintilla/Editor.py" line="6080"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -7807,12 +7807,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="6079"/> + <location filename="QScintilla/Editor.py" line="6082"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="6081"/> + <location filename="QScintilla/Editor.py" line="6084"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -7852,37 +7852,37 @@ <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5156"/> + <location filename="QScintilla/Editor.py" line="5159"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5163"/> + <location filename="QScintilla/Editor.py" line="5166"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5214"/> + <location filename="QScintilla/Editor.py" line="5217"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5370"/> + <location filename="QScintilla/Editor.py" line="5373"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric5. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5517"/> + <location filename="QScintilla/Editor.py" line="5520"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5636"/> + <location filename="QScintilla/Editor.py" line="5639"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5726"/> + <location filename="QScintilla/Editor.py" line="5729"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -7907,12 +7907,12 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5015"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>py3flakes Warning</source> <translation>Advertencia de py3flakes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5015"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>No py3flakes warning message available.</source> <translation>No hay un mensaje de advertencia de py3flakes disponible.</translation> </message> @@ -7922,42 +7922,42 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5199"/> + <location filename="QScintilla/Editor.py" line="5202"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5058"/> + <location filename="QScintilla/Editor.py" line="5061"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5064"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5375"/> + <location filename="QScintilla/Editor.py" line="5378"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3907"/> + <location filename="QScintilla/Editor.py" line="3910"/> <source>Activating Auto-Completion Provider</source> <translation>Activando el Proveedor de Autocompletado</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3907"/> + <location filename="QScintilla/Editor.py" line="3910"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de autocompletado no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4092"/> + <location filename="QScintilla/Editor.py" line="4095"/> <source>Activating Calltip Provider</source> <translation>Activando Proveedor de Calltip</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4092"/> + <location filename="QScintilla/Editor.py" line="4095"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de calltip no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> @@ -16521,280 +16521,358 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="253"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> - <source>The hg process did not finish within 30s.</source> - <translation>El proceso hg no terminó en un plazo de 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> + <source>The hg process did not finish within 30s.</source> + <translation>El proceso hg no terminó en un plazo de 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="329"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="375"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="593"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="657"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="721"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="850"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="883"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1186"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1931"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1954"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2249"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2371"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="489"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2906"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2785"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2906"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <source>Add Sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2740"/> + <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> + <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <source>Remove Sub-repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgAddSubrepositoryDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="91"/> + <source>Add Sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="23"/> + <source>&Path within Project:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="35"/> + <source>Enter the path of the sub-repository relative to the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="42"/> + <source>Select the path of the sub-repository with a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="54"/> + <source>&Type:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="66"/> + <source>Select the type of the sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="88"/> + <source>&URL:</source> + <translation type="unfinished">&URL:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="98"/> + <source>Enter the URL of the sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="91"/> + <source>The sub-repository path must be inside the project.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17634,6 +17712,16 @@ <source>Amend the last commit</source> <translation>Enmendar último commit</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="70"/> + <source>Select to commit sub-repositories as well</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="73"/> + <source>Commit sub-repositories</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -17851,37 +17939,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="194"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="194"/> <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/HgDiffDialog.py" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="219"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="431"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="399"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="431"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="416"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> @@ -17891,12 +17979,12 @@ <translation>Contenido del Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="232"/> <source><Start></source> <translation><Inicio></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="233"/> <source><End></source> <translation><Fin></translation> </message> @@ -18483,12 +18571,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1177"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Author</source> <translation>Autor</translation> </message> @@ -18623,12 +18711,12 @@ <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="693"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="693"/> <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> @@ -18823,112 +18911,112 @@ <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="186"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="186"/> <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/HgLogDialog.py" line="267"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="325"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="339"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="345"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="351"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="241"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="335"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Añadido {0} (copiado de {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Bookmarks: {0}<br /> </source> <translation>Marcadores: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Phase: {0}<br /> </source> <translation>Fase: {0}<br /> @@ -19430,142 +19518,142 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="100"/> <source>New from repository</source> <translation>Nuevo desde repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="100"/> <source>&New from repository...</source> <translation>&Nuevo desde repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="103"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crear (clonar) un nuevo proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="98"/> - <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> - <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> + <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> + <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="114"/> <source>Show incoming log</source> <translation>Mostrar log entrante</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> <source>Show the log of incoming changes</source> <translation>Mostrar el log de los cambios entrantes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="121"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar log entrante</b><p>Muestra el log de cambios entrantes en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Pull changes</source> <translation>Hacer pull de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="127"/> - <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> - <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> - <source>Update from repository</source> - <translation>Hacer update desde repositorio</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> + <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> + <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143"/> + <source>Update from repository</source> + <translation>Hacer update desde repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143"/> <source>&Update from repository</source> <translation>Hacer &update desde repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source>Update the local project from the Mercurial repository</source> <translation>Actualizar el proyecto local desde el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Hacer update desde repositorio</b><p>Actualiza el proyecto local desde el repositorio Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Commit changes to repository</source> <translation>Hacer commit de los cambios al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>&Commit changes to repository...</source> <translation>Hacer &commit de los cambios al repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Hacer commit de los cambios en el proyecto local al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> - <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> - <translation><b>Hacer commit de los cambios al repositorio</b>Envia los cambios del proyecto local al repositorio Mercurial.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> + <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> + <translation><b>Hacer commit de los cambios al repositorio</b>Envia los cambios del proyecto local al repositorio Mercurial.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> <source>Show outgoing log</source> <translation>Mostrar log saliente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Show the log of outgoing changes</source> <translation>Mostrar el log de los cambios salientes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostrar log saliente</b><p>Muestra el log de cambios salientes en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="186"/> <source>Push changes</source> <translation>Hacer push de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> <source>Push changes to a remote repository</source> <translation>Hacer push de cambios hacia un repositorio remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Hacer push de cambios</b><p>Hace un push de cambios desde un repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>&Export from repository...</source> <translation>&Exportar desde repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="223"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> @@ -19610,137 +19698,137 @@ <translation type="obsolete"><b>Eliminar del repositorio</b><p>Elimina el proyecto local del repositorio (y del disco).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> <source>Show &log</source> <translation>Mostrar &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234"/> <source>Show the log of the local project</source> <translation>Mostrar el log del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260"/> <source>Show difference</source> <translation>Mostrar diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source>Show heads</source> <translation>Mostrar heads</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305"/> <source>Show the heads of the repository</source> <translation>Mostrar los heads del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show parents</source> <translation>Mostrar parents</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> <source>Show the parents of the repository</source> <translation>Mostrar los parents del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source>Show tip</source> <translation>Mostrar tip</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> <source>Show the tip of the repository</source> <translation>Mostrar el tip del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/> <source>Merge changes of a revision into the local project</source> <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> @@ -19765,810 +19853,855 @@ <translation type="obsolete"><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show &status</source> <translation>Mostrar e&stado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source>Re&vert changes</source> <translation>Re&vertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="412"/> <source>List branches of the project</source> <translation>Lista las branches del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source>Create branch</source> <translation>Crear branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source>Create &branch...</source> <translation>Crear &branch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Switch the working directory to another revision</source> <translation>Hacer switch del directorio de trabajo a otra revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Cleanup the local project</source> <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Execute an arbitrary Mercurial command</source> <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source>Command options</source> <translation>Opciones de comando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source>Command &options...</source> <translation>&Opciones de comando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Show the Mercurial command options</source> - <translation>Mostrar opciones de comando Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <source>Show the Mercurial command options</source> + <translation>Mostrar opciones de comando Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Show the aliases for remote repositories</source> <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> <source>Verify the integrity of the repository</source> <translation>Verificar la integridad del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar de una transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source>Create a .hgignore file with default values</source> <translation>Creare un archivo .hgignore con valores por defecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source>Create changegroup...</source> <translation>Crear changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1288"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> - <source>Show current branch</source> - <translation>Mostrar la branch actual</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> - <source>Show the current branch of the project</source> - <translation>Mostrar la branch actual del proyecto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <source>Show current branch</source> + <translation>Mostrar la branch actual</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show the current branch of the project</source> + <translation>Mostrar la branch actual del proyecto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Mark a selectable changeset as good</source> <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Mark a selectable changeset as bad</source> <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> - <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Identify changegroup</source> - <translation>Identificar changegroup</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> + <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <source>Identify changegroup</source> + <translation>Identificar changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <source>Identify changegroup...</source> <translation>Identificar changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identificar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="201"/> <source>Push changes (force)</source> <translation>Hacer push de cambios (force)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Push changes to a remote repository with force option</source> <translation>Se hace un push de los cambios a un repositorio remoto con la opción force</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1395"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Show an editor to edit the repository configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Show combined configuration settings</source> <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Show combined configuration settings...</source> <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Export revisions to patch files</source> <translation>Exportar revisiones a archivos de patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> <source>Change the phase of revisions</source> <translation>Cambiar la fase de revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Graft</source> <translation>Graft</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1395"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876"/> + <source>Add</source> + <translation type="unfinished">Añadir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876"/> + <source>Add...</source> + <translation type="unfinished">Añadir...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <source>Remove</source> + <translation type="unfinished">Eliminar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <source>Remove sub-repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <source>Sub-Repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -21296,6 +21429,34 @@ </message> </context> <context> + <name>HgRemoveSubrepositoriesDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.ui" line="14"/> + <source>Remove Sub-repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.ui" line="36"/> + <source>Press to remove the selected entries</source> + <translation type="unfinished">Pulse para eliminar las entradas seleccionadas</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.ui" line="39"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.ui" line="46"/> + <source>Select to delete the removed entries from disc</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.ui" line="49"/> + <source>Delete removed entries from disc</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="29"/> @@ -21704,37 +21865,37 @@ <translation>perdido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="248"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="248"/> <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="546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <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="585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <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="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Revertir</translation> </message> @@ -21744,12 +21905,12 @@ <translation>Eliminar de repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="609"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -21834,17 +21995,17 @@ <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="458"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="461"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> @@ -53249,17 +53410,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -53270,31 +53431,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1246"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -53303,7 +53464,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1292"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53320,7 +53481,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>