Translations by Jaime Armendariz
Jaime Armendariz has submitted the following strings to this translation. Contributions are visually coded: currently used translations, unreviewed suggestions, rejected suggestions.
348. |
(fix conflicts and then run "git am --continue")
|
|
2015-07-21 |
(corrige conflictos y después ejecuta "git am --continue")
|
|
370. |
(all conflicts fixed: run "git revert --continue")
|
|
2015-07-21 |
(todos los conflictos corregidos: ejecuta "git revert --continue")
|
|
392. |
nothing to commit
|
|
2015-07-21 |
Nada que enviar (commit)
|
|
393. |
nothing to commit (use -u to show untracked files)
|
|
2015-07-21 |
Nada que enviar (usa -u para mostrar ficheros no seguidos)
|
|
422. |
ignore paths removed in the working tree (same as --no-all)
|
|
2015-07-21 |
ignorar rutas eliminadas en el arbol de trabajo (lo mismo que --no-all)
|
|
486. |
corrupt patch for submodule %s
|
|
2015-07-21 |
Parche corrupto para el submódulo %s
|
|
504. |
remove <num> leading slashes from traditional diff paths
|
|
2015-07-21 |
elimina <num> barras iniciales de los paths tradicionales del diff
|
|
507. |
show number of added and deleted lines in decimal notation
|
|
2015-07-21 |
mostrar numero de lineas añadidas y borradas en notación decimal
|
|
510. |
make sure the patch is applicable to the current index
|
|
2015-07-21 |
asegurate de que el parche es aplicable al índice actual
|
|
517. |
ensure at least <n> lines of context match
|
|
2015-07-21 |
asegurate de que las últimas <n> líneas del contexto coinciden
|
|
529. |
--3way outside a repository
|
|
2015-07-21 |
--3way fuera del repositorio
|
|
543. |
git bisect--helper --next-all [--no-checkout]
|
|
2015-07-21 |
git bisect--helper --next-all [--no-checkout]
|
|
551. |
Show work cost statistics
|
|
2015-07-21 |
Mostrar las estadísticas de coste del trabajo
|
|
580. |
Update of config-file failed
|
|
2015-07-21 |
Falló la actualización del config-file
|
|
589. |
Deleted branch %s (was %s).
|
|
2015-07-21 |
Borrada la rama %s (era %s)
|
|
632. |
edit the description for the branch
|
|
2015-07-21 |
editar la descripción de la rama
|
|
640. |
branch name required
|
|
2015-07-21 |
nombre de la rama requerido
|
|
642. |
cannot edit description of more than one branch
|
|
2015-07-21 |
no se puede editar la descripción de más de una rama
|
|
644. |
No branch named '%s'.
|
|
2015-07-21 |
No hay ninguna rama llamada '%s'.
|
|
645. |
too many branches for a rename operation
|
|
2015-07-21 |
demasiadas ramas para una operación de renombrado
|