|
887.
|
|
|
renamed
|
|
|
|
renombrado
|
|
Translated and reviewed by
Monkey
|
|
|
|
Located in
merge-recursive.c:1534
|
|
888.
|
|
|
Refusing to lose dirty file at %s
|
|
|
|
Rehusando perder el archivo sucio en %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
|
|
889.
|
|
|
Refusing to lose untracked file at %s , even though it's in the way.
|
|
|
|
Rehusando perder el archivo no rastreado en %s , incluso aunque se está interponiendo.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1624
|
|
890.
|
|
|
CONFLICT (rename/add): Rename %s ->%s in %s . Added %s in %s
|
|
|
|
CONFLICTO (renombrar/agregar): Renombrar %s ->%s en %s . %s agregado en %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1682
|
|
891.
|
|
|
%s is a directory in %s adding as %s instead
|
|
|
|
%s es un directorio en %s agregando como %s más bien
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1713
|
|
892.
|
|
|
Refusing to lose untracked file at %s ; adding as %s instead
|
|
|
|
Rehusando perder el archivo no rastreado en %s ; agregándolo como %s en cambio
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1718
|
|
893.
|
|
|
CONFLICT (rename/rename): Rename "%s "->"%s " in branch "%s " rename "%s "->"%s " in "%s "%s
|
|
|
|
CONFLICTO (renombrar/renombrar): Renombrar "%s "->"%s " en la rama "%s " renombrar "%s "->"%s " en "%s "%s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1737
|
|
894.
|
|
|
(left unresolved)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(dejado sin resolver)
|
|
Translated by
Miguel Angel del Olmo
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
merge-recursive.c:1742
|
|
895.
|
|
|
CONFLICT (rename/rename): Rename %s ->%s in %s . Rename %s ->%s in %s
|
|
|
|
CONFLICTO (renombrar/renombrar): Renombrar %s ->%s en %s . Renombrar %s ->%s en %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1851
|
|
896.
|
|
|
CONFLICT (directory rename split): Unclear where to place %s because directory %s was renamed to multiple other directories, with no destination getting a majority of the files.
|
|
|
|
CONFLICTO (división de cambio de nombre de directorio): No es claro dónde colocar %s porque el directorio %s fue renombrado a otros múltiples directorios, sin ningún que contenga la mayoría de archivos.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:2114
|