--- a/i18n/eric6_es.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_es.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1479,8 +1479,8 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> - <translation>El cliente en background de Eric ha desconectado debido a una razón desconocida.</translation> + <source>Eric's background client disconnected because of an unknown reason.</source> + <translation type="unfinished">El cliente en background de Eric ha desconectado debido a una razón desconocida.</translation> </message> <message> <location filename="../Utilities/BackgroundService.py" line="211"/> @@ -17953,182 +17953,182 @@ <translation>Repetir Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation>Mostrar Info Remota</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation>Renombrar Repositorio Remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation>Introducir el nuevo nombre para el repositorio remoto:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation>Mostrar Shortlog</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation>Cherry-pick</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation>Copiar Changesets (Salir)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation>Copiar Changesets (Cancelar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation>Guardando stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation>Mostrar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation>Seleccionar un stash (dejar en blanco para el último stash):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation>Restaurar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation>Restaurando Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <source>Enter a branch name to restore a stash to:</source> - <translation>Introducir un nombre de branch sobre la que restaurar un stash:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3389"/> - <source>Creating branch</source> - <translation>Creando branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation>Borrar Stash</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Do you really want to delete the stash <b>{0}</b>?</source> - <translation>¿Desea realmente borrar el stash <b>{0}</b>?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3434"/> - <source>Deleting stash</source> - <translation>Borrando stash</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation>Borrar todos los Stashes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation>¿Desea realmente borrar todos los stashes?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation>Borrando todos los stashes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation>Mostrando los ajustes de configuración combinados</translation> + <source>Enter a branch name to restore a stash to:</source> + <translation>Introducir un nombre de branch sobre la que restaurar un stash:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <source>Creating branch</source> + <translation>Creando branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation>Borrar Stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Do you really want to delete the stash <b>{0}</b>?</source> + <translation>¿Desea realmente borrar el stash <b>{0}</b>?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <source>Deleting stash</source> + <translation>Borrando stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation>Borrar todos los Stashes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation>¿Desea realmente borrar todos los stashes?</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation>Verificando la integridad del repositorio Git</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation>Llevando a cabo Reorganización del Repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Estadísticas</b></td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de objetos sueltos: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3634"/> - <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por objetos sueltos: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> - <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de objetos empaquetados: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/> - <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de paquetes: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3646"/> - <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por objetos empaquetados: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3650"/> - <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> - <translation><tr><td>Objetos empaquetados en espera de pruning: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation><tr><td>Archivos basura: </td><td>{0}</td></tr></translation> + <source>Deleting all stashes</source> + <translation>Borrando todos los stashes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation>Verificando la integridad del repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation>Llevando a cabo Reorganización del Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Estadísticas</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de objetos sueltos: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por objetos sueltos: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de objetos empaquetados: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de paquetes: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por objetos empaquetados: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> + <translation><tr><td>Objetos empaquetados en espera de pruning: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <translation><tr><td>Archivos basura: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Espacio en disco utilizado por archivos basura: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>No hay estadísticas disponibles.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation>Creando Archivo</translation> </message> @@ -18158,57 +18158,57 @@ <translation>Aplicar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation>Añadir Submódulo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation>Listar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation>El proyecto no tiene submódulos definidos.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation>Ruta del Submódulo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation>Seleccionar ruta del submódulo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation>Inicializar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation>Desregistrar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation>Actualizar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation>Sincronizar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation>Resumen de Submódulos</translation> </message> @@ -18240,6 +18240,31 @@ <source>Enter the remote URL</source> <translation>Introducir la URL remota</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation type="unfinished">Contraseña:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18869,6 +18894,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21126,7 +21179,7 @@ <translation><b>Mostrar Remotos</b><p>Muestra los repositorios remotos disponibles para pull, fetch y push.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation>Mostrar Info Remota</translation> </message> @@ -21141,7 +21194,7 @@ <translation>Mostrar información sobre un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation>Añadir</translation> </message> @@ -21161,7 +21214,7 @@ <translation><b>Añadir</b><p>Añade un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation>Eliminar</translation> </message> @@ -21181,7 +21234,7 @@ <translation><b>Eliminar</b><p>Elimina un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation>Prune</translation> </message> @@ -21201,7 +21254,7 @@ <translation><b>Prune</b><p>Elimina (prune) las tracking branches remotas que han quedado fuera de alcance en un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation>Renombrar</translation> </message> @@ -21221,717 +21274,717 @@ <translation><b>Renombrar</b><p>Renombra un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation>Copiar Commits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation>Copiar commits dentro de la branch actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation><b>Copiar Commits</b><p>Copia commits en la parte superior de la branch actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation>Continuar Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <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/vcsGit/ProjectHelper.py" line="626"/> - <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 Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation>Abandonar Sesión de Copia</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> - <translation>Abandonar la sesión de copia actual</translation> + <source>Copies commits into the current branch</source> + <translation>Copiar commits dentro de la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> + <translation><b>Copiar Commits</b><p>Copia commits en la parte superior de la branch actual.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> - <translation>Cancelar Sesión de Copia</translation> + <source>Continue Copying Session</source> + <translation>Continuar Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation>Cancelar la copia de sesión actual y volver al estado previo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> - <translation><b>Cancelar Sesión de copia</b><p>Cancela la sesión de copia actual y vuelve al estado previo.</p></translation> + <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/vcsGit/ProjectHelper.py" line="656"/> + <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 Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation>Guardado rápido de cambios (stash)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> - <translation>Guardado rápido de cambios (stash)...</translation> + <source>Quit Copying Session</source> + <translation>Abandonar Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> - <translation>Hacer guardado rápido de todos los cambios actuales en el proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> - <translation><b>Guardado rápido de cambios (stash)</b><p>Hace un guardado rápido de todos los cambios actuales en el proyecto.</p></translation> + <source>Quit the current copying session</source> + <translation>Abandonar la sesión de copia actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation>Mostrar navegador de stash (guardado rápido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> - <translation>Mostrar navegador de stash (guardado rápido)...</translation> + <source>Cancel Copying Session</source> + <translation>Cancelar Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation>Mostrar un diálogo con todos los stashes (guardado rápido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> - <translation><b>Mostrar navegador de stash...</b><p>Muestra un diálogo listando todos los elementos disponibles en stash (guardado rápido). Se pueden ejecutar acciones sobre estos elementos vía menú de context.</p></translation> + <source>Cancel the current copying session and return to the previous state</source> + <translation>Cancelar la copia de sesión actual y volver al estado previo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <translation><b>Cancelar Sesión de copia</b><p>Cancela la sesión de copia actual y vuelve al estado previo.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> - <translation>Mostrar stash</translation> + <source>Stash changes</source> + <translation>Guardado rápido de cambios (stash)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> - <translation>Mostrar stash...</translation> + <source>Stash changes...</source> + <translation>Guardado rápido de cambios (stash)...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> - <translation>Muestra un diálogo con un patch de un stash (guardado rápido)</translation> + <source>Stash all current changes of the project</source> + <translation>Hacer guardado rápido de todos los cambios actuales en el proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation><b>Guardado rápido de cambios (stash)</b><p>Hace un guardado rápido de todos los cambios actuales en el proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation>Mostrar navegador de stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation>Mostrar navegador de stash (guardado rápido)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation>Mostrar un diálogo con todos los stashes (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation><b>Mostrar navegador de stash...</b><p>Muestra un diálogo listando todos los elementos disponibles en stash (guardado rápido). Se pueden ejecutar acciones sobre estos elementos vía menú de context.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation>Mostrar stash</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation>Mostrar stash...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation>Muestra un diálogo con un patch de un stash (guardado rápido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation><b>Mostrar stash (guardado rápido)...</b><p>Muestra un diálogo con un patch de un stash seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation>Restaurar && Conservar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation>Restaurar un stash (guardado rápido) pero conservarlo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation><b>Restaurar &amp; Conservar</b><p>Restaura un stash (guardado rápido) seleccionable pero éste es conservado.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation>Restaurar && Borrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation>Restaurar un stash (guardado rápido) y borrarlo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation><b>Restaurar &amp; Borrar</b><p>Restaura un stash (guardado rápido) seleccionable y luego lo borra.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation>Crear una nueva branch y restaurar un stash (guardado rápido) en ella</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch y restaura un stash (guardado rápido) en ella.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation>Borrar un stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation><b>Borrar</b><p>Borra un stash (guardado rápido).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation>Borrar todos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation>Borrar todos los stashes (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation><b>Borrar Todos</b><p>Borra todos los stashes (guardado rápido).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <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/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <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/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <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/vcsGit/ProjectHelper.py" line="802"/> - <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/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation>Crear .gitignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation>Crear un archivo .gitignore con valores por defecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation><b>Crear .gitignore</b><p>Crea un archivo .gitignore con valores por defecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <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/vcsGit/ProjectHelper.py" line="832"/> - <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> + <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/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> + <source>Create .gitignore</source> + <translation>Crear .gitignore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> - <translation>Verificar la conectividad y validez de los objetos de la base de datos</translation> + <source>Create a .gitignore file with default values</source> + <translation>Crear un archivo .gitignore con valores por defecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica la conectividad y validez de los objetos de la base de datos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation>Optimizar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation>Optimizar repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> - <translation>Limpiar y optimizar el repositorio local</translation> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation><b>Crear .gitignore</b><p>Crea un archivo .gitignore con valores por defecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation>Mostrar ajustes de configuración combinados...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <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/vcsGit/ProjectHelper.py" line="862"/> + <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/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation>Verificar la conectividad y validez de los objetos de la base de datos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica la conectividad y validez de los objetos de la base de datos.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation>Optimizar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation>Optimizar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation>Limpiar y optimizar el repositorio local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation><b>Optimizar repositorio</b><p>Limpia y optimiza el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation>Estadísticas del Repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation>Estadísticas del Repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation>Mostrar estadísticas del repositorio local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation><b>Estadísticas del Repositorio</b><p>Muestra una serie de estadísticas del repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation>Crear Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation>Crear un archivo a partir del repositorio local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation><b>Crear Archivo</b><p>Crea un archivo a partir del repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation>Crear bundle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation>Crear bundle...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation>Crear archivo de bundle recopilando changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation><b>Crear bundle</b><p>Crea un archivo de bundle recolectando los changesets seleccionados (git bundle create).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation>Verificar bundle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation>Verificar bundle...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation>Verificar la validez y aplicabilidad de un archivo de bundle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation><b>Verificar bundle</b><p>Verifica que un archivo de bundle es válido y que se puede aplicar limpiamente.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> - <translation>Listar bundle heads</translation> + <source>Create bundle</source> + <translation>Crear bundle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> - <translation>Listar bundle heads...</translation> + <source>Create bundle...</source> + <translation>Crear bundle...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> - <translation>Lista todos los heads contenidos en un archivo de bundle</translation> + <source>Create bundle file collecting changesets</source> + <translation>Crear archivo de bundle recopilando changesets</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation><b>Crear bundle</b><p>Crea un archivo de bundle recolectando los changesets seleccionados (git bundle create).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation>Verificar bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation>Verificar bundle...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation>Verificar la validez y aplicabilidad de un archivo de bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation><b>Verificar bundle</b><p>Verifica que un archivo de bundle es válido y que se puede aplicar limpiamente.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation>Listar bundle heads</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation>Listar bundle heads...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation>Lista todos los heads contenidos en un archivo de bundle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation><b>Listar bundle heads</b><p>Lista todos los all heads contenidos en un archivo de bundle.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation>Aplicar Bundle (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation>Aplicar Bundle (fetch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation>Aplicar un head de un archivo de bundle utilizando fetch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation><b>Applicar Bundle (fetch)</b><p>Aplica un head de un archivo de bundle usando fetch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation>Aplicar Bundle (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation>Aplicar Bundle (pull)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation>Aplicar un head de un archivo de bundle utilizando pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation><b>Applicar Bundle (pull)</b><p>Aplica un head de un archivo de bundle usando pull.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation>Iniciar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation>Iniciar una sesión de bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation><b>Iniciar</b><p>Inicia una sesión de bisect.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation>Iniciar (Extendido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation>Iniciar una sesión de bisect dando un commit malo y opcionalmente un commit bueno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation><b>Iniciar (Extendido)</b><p>Inicia una sesión de bisect dando un commit malo y opcionalmente un commit bueno.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation>Marcar como "buena"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation>Marcar como "buena"...</translation> + <source>Start</source> + <translation>Iniciar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> - <translation>Marcar una revisión seleccionable como buena</translation> + <source>Start a bisect session</source> + <translation>Iniciar una sesión de bisect</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> - <translation><b>Marcar como "buena"</b><p>Marca una revisión seleccionable dándola por buena.</p></translation> + <source><b>Start</b><p>This starts a bisect session.</p></source> + <translation><b>Iniciar</b><p>Inicia una sesión de bisect.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation>Marcar como "mala"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation>Marcar como "mala"...</translation> + <source>Start (Extended)</source> + <translation>Iniciar (Extendido)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> - <translation>Marcar una revisión seleccionable como mala</translation> + <source>Start a bisect session giving a bad and optionally good commits</source> + <translation>Iniciar una sesión de bisect dando un commit malo y opcionalmente un commit bueno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation><b>Iniciar (Extendido)</b><p>Inicia una sesión de bisect dando un commit malo y opcionalmente un commit bueno.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation>Marcar como "buena"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation>Marcar como "buena"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation>Marcar una revisión seleccionable como buena</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation><b>Marcar como "buena"</b><p>Marca una revisión seleccionable dándola por buena.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation>Marcar como "mala"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation>Marcar como "mala"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation>Marcar una revisión seleccionable como mala</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation><b>Marcar como "mala"</b><p>Marca una revisión seleccionable no dándola por buena.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation>Saltarse una revisión seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation><b>Saltar</b><p>Se salta una revisión seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation>Resetear</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation>Resetear...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation>Resetear la sesión de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation><b>Resetear</b><p>Resetea la sesión de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation>Mostrar navegador de log de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation>Mostrar un diálogo para navegar el log de bisect del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation><b>Mostrar navegador de log de bisect</b><p>Muestra un diálogo para navegar el log de bisect del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation>Crear archivo de replay</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation>Crear un archivo de replay para poder repetir la sesión de bisect actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation><b>Crear archivo de replay</b><p>Crea un archivo de replay para poder repetir la sesión de bisect actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation>Editar archivo de replay</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation>Editar un archivo de replay bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation><b>Editar archivo replay</b><p>Edita un archivo de replay bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation>Replay de sesión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation>Replay de una sesión bisect desde archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation><b>Replay de sesión</b><p>Hace un replay de una sesión de bisect a partir de un archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation>Gestión de Bundles</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation>Gestionar Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation>Repositorios Remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation>Cherry-pick</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation>Stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation>Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <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/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation>Sacar cambios del área de preparación (unstage)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation>Seleccionar repositorio-remoto:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation>Copiar Commits (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation>Copiar Commits (Salir)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation>Copiar Commits (Cancelar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation>Guardar Stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation>Restaurar Stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation><b>Abandonar Sesión de Copia</b><p>Abandona la sesión de copia actual.</p></translation> </message> @@ -21956,225 +22009,265 @@ <translation><b>Hacer commit de los cambios al repositorio</b>Envia los cambios del proyecto local al repositorio Git.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation>Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation>Comprobar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation>Comprobar si los archivos de parche de una lista se van a aplicar limpiamente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation><b>Comprobar archivos de parche</b><p>Comprueba si los archivos de parche de una lista se van a aplicar limpiamente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation>Aplicar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation>Aplicar una lista de archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation><b>Aplciar archivos de parche</b><p>Aplica una lista de archivos de parche.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation>Mostrar estadísticas del parche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation>Mostrar algunas estadísticas para una lista de archivos de parche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation><b>Mostrar estadísticas de parche</b><p>Muestra algunas estadísticas para una lista de archivos de parche.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> - <source>Patch Management</source> - <translation>Gestión de Parches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation>Añadir un submódulo al proyecto actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation><b>Añadir</b><p>Añade un submódulo al proyecto actual.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> - <translation>Listar</translation> + <source>Show patch statistics</source> + <translation>Mostrar estadísticas del parche</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> - <translation>Listar submódulos del proyecto actual</translation> + <source>Show some statistics for a list of patch files</source> + <translation>Mostrar algunas estadísticas para una lista de archivos de parche</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation><b>Listar</b><p>Lista los submódulos del proyecto actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> - <translation>Inicializar</translation> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> + <translation><b>Mostrar estadísticas de parche</b><p>Muestra algunas estadísticas para una lista de archivos de parche.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> + <source>Patch Management</source> + <translation>Gestión de Parches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> - <translation>Inicializar los submódulos del proyecto actual</translation> + <source>Add a submodule to the current project</source> + <translation>Añadir un submódulo al proyecto actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation><b>Añadir</b><p>Añade un submódulo al proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation>Listar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation>Listar submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation><b>Listar</b><p>Lista los submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation>Inicializar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation>Inicializar los submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation><b>Inicializar</b><p>Inicializa los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation>Desregistrar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation>Desregistrar submódulos del proyecto actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation><b>Desregistrar</b><p>Desregistra submódulos del proyecto actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation>Actualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation>Actualizar submódulos del proyecto actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation><b>Actualizar</b><p>Actualiza submódulos del proyecto actual.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> - <translation>Inicializar y Actualizar</translation> + <source>Unregister</source> + <translation>Desregistrar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> - <translation>Inicializar y actualizar los submódulos del proyecto actual</translation> + <source>Unregister submodules of the current project</source> + <translation>Desregistrar submódulos del proyecto actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation><b>Desregistrar</b><p>Desregistra submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation>Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation>Actualizar submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation><b>Actualizar</b><p>Actualiza submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation>Inicializar y Actualizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation>Inicializar y actualizar los submódulos del proyecto actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation><b>Inicializar y actualizar</b><p>Inicializa y actualiza los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation>Fetch y Actualizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation>Fetch y actualizar los módulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation><b>Fetch y actualizar</b><p>Hace fetch y y actualiza los submódulos del proyecto actual.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation>Actualizar con Opciones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation>Actualizar submódulos del proyecto actual ofreciendo un diálogo para introducir opciones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation><b>Actualizar con Opciones</b><p>Actualiza submódulos del proyecto actual ofreciendo un diálogo para introducir opciones de actualización.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation>Sincronizar URLs</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation><b>Fetch y actualizar</b><p>Hace fetch y y actualiza los submódulos del proyecto actual.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation>Actualizar con Opciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation>Actualizar submódulos del proyecto actual ofreciendo un diálogo para introducir opciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation><b>Actualizar con Opciones</b><p>Actualiza submódulos del proyecto actual ofreciendo un diálogo para introducir opciones de actualización.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation>Sincronizar URLs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation>Sincronizar URLs de los submódulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation><b>Sincronizar URLs</b><p>Sincroniza URLs de submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation>Mostrar status de los submódulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation><b>Mostrar Status</b><p>Muestra un diálogo con el estado de los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation>Mostrar Resumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation>Mostrar información de resumen para los submódulos del proyecto actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation><b>Mostrar Resumen</b><p>Muestra información de resumen para los submódulos del proyecto actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation>Submódulos</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22476,6 +22569,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation type="unfinished">URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation type="unfinished">Contraseña:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22520,92 +22656,92 @@ <translation>&Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> <source>Press to rename the selected repository</source> <translation>Pulsar para renombrar el repositorio seleccionado</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation>&Renombrar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to remove the selected repository</source> + <translation>Pulsar para eliminar el repositorio seleccionado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> - <translation>&Renombrar</translation> + <source>Re&move</source> + <translation>Eli&minar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> - <translation>Pulsar para eliminar el repositorio seleccionado</translation> + <source>Press to delete stale tracking branches under the selected repository </source> + <translation>Pulsar para eliminar las tracking branches que han quedado fuera de alcance en el repositorio seleccionado </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation>Eli&minar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation>Pulsar para eliminar las tracking branches que han quedado fuera de alcance en el repositorio seleccionado </translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation>&Prune</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation>Pulsar para mostrar información acerca del repositorio seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation>Mostrar &Info...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation>Errores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation><b>Errores de Git log</b><p>Muestra posibles mensajes de error del comando git log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation>Pulsar para enviar el input al proceso git</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation>Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation><b>Errores de Git log</b><p>Muestra posibles mensajes de error del comando git log.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation>Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation>Pulsar para enviar el input al proceso git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation>Introduzca los datos a enviar al proceso de git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -22629,6 +22765,26 @@ <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/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>