--- a/i18n/eric6_es.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_es.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8915,7 +8915,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -9015,207 +9015,207 @@ <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <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="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <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="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <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="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -9290,7 +9290,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -9300,12 +9300,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -9345,32 +9345,32 @@ <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <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="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <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="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <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="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <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="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -9400,42 +9400,42 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <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="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <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="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation>Activando el Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <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="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation>Activando Proveedor de Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <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> @@ -9460,27 +9460,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -9505,7 +9505,7 @@ <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?</p></translation> </message> @@ -9520,32 +9520,32 @@ <translation>Completo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation>Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> @@ -19772,7 +19772,7 @@ <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> @@ -19787,117 +19787,117 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <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="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <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="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <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="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <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="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <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="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <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="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <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="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <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> @@ -19907,72 +19907,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -20002,7 +20002,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -20027,7 +20027,7 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> @@ -20037,67 +20037,67 @@ <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -20122,12 +20122,12 @@ <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> @@ -22135,7 +22135,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> @@ -22165,17 +22165,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Autor</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -22285,27 +22285,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Añadido</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Borrado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Borrado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <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> @@ -22320,17 +22320,17 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <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/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <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/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -22370,32 +22370,32 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation>Pulsar para actualizar la lista de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> @@ -22405,29 +22405,29 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation>Cambiar la fase de las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Cambiar Fase</b> <p>Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -22447,42 +22447,42 @@ <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation>Aplicar Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation>Hacer pull de archivos grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -22507,45 +22507,90 @@ <translation>Pulsar para encontrar la ocurrencia siguiente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation><table><tr><td><b>Revisión</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <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/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation>Archivo</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished">Borrador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished">Público</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished">Secreto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Hacer pull de cambios desde un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32153,57 +32198,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Cerrar todo</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Guardar como...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Guardar todo</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Sin título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation>Abrir archivo 'de rechazo'</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation>Cerrar Otras</translation> </message> @@ -54913,7 +54958,7 @@ <translation>Sin título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> @@ -64007,6 +64052,26 @@ <comment>Edit|Calltip</comment> <translation>Meta+Alt+Space</translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64730,17 +64795,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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="2139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <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> @@ -64751,19 +64816,19 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <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> @@ -64784,7 +64849,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <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>