|
|
434.
|
|
|
merging of trees %s and %s failed
|
|
|
|
|
falló la fusión de los árboles %s y %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:3491
|
|
|
435.
|
|
|
Merging:
|
|
|
|
|
Fusionando:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:3585
|
|
|
436.
|
|
|
found %u common ancestor:
|
|
|
|
found %u common ancestors:
|
|
|
|
|
se encontró %u ancestro común:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
se encontraron %u ancestros comunes:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:3598
|
|
|
437.
|
|
|
merge returned no commit
|
|
|
|
|
la fusión no devolvió ningún commit
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:3648
|
|
|
438.
|
|
|
Could not parse object '%s'
|
|
|
|
|
No se pudo analizar el objeto '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:3816
|
|
|
439.
|
|
|
Unable to write index.
|
|
|
|
|
Incapaz de escribir el índice.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
builtin/stash.c:489
|
|
|
440.
|
|
|
You have not concluded your previous notes merge ( %s exists). 
Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
No has concluido tu fusión previa de notas ( %s existe).
Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para confirmar/abortar la fusión previa antes de comenzar una nueva fusión de notas. |
|
Translated by
Alex Henrie
|
|
|
|
Located in
notes-merge.c:277
|
|
|
441.
|
|
|
You have not concluded your notes merge (%s exists).
|
|
|
|
|
No has terminado tu fusión de notas (%s existe).
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
notes-merge.c:284
|
|
|
442.
|
|
|
Cannot commit uninitialized/unreferenced notes tree
|
|
|
|
|
No se puede realizar commit, árbol de notas no inicializado o no referenciado
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
notes-utils.c:46
|
|
|
443.
|
|
|
Bad notes.rewriteMode value: '%s'
|
|
|
|
|
Valor erróneo para notes.rewriteMode: '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
notes-utils.c:105
|
