|
|
831.
|
|
|
failed to create path '%s'%s
|
|
|
|
|
falló al crear la ruta '%s'%s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:881
|
|
|
832.
|
|
|
Removing %s to make room for subdirectory 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Quitando %s para hacer espacio para un subdirectorio
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:892
|
|
|
833.
|
|
|
: perhaps a D/F conflict?
|
|
|
|
|
: ¿tal vez un conflicto D/F?
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:906 merge-recursive.c:925
|
|
|
834.
|
|
|
refusing to lose untracked file at '%s'
|
|
|
|
|
rehusando perder el archivo no rastreado en '%s'
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:915
|
|
|
835.
|
|
|
cannot read object %s '%s'
|
|
|
|
|
no se puede leer el objeto %s «%s»
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
| In upstream: |
|
no se puede leer el objeto %s '%s'
|
|
|
Suggested by
Víctor Fernández
|
|
|
|
Located in
merge-recursive.c:956 builtin/cat-file.c:41
|
|
|
836.
|
|
|
blob expected for %s '%s'
|
|
|
|
|
se esperaba blob para %s '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:961
|
|
|
837.
|
|
|
failed to open '%s': %s
|
|
|
|
|
falló al abrir '%s': %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:986
|
|
|
838.
|
|
|
failed to symlink '%s': %s
|
|
|
|
|
falló al crear el enlace simbólico '%s': %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:997
|
|
|
839.
|
|
|
do not know what to do with %06o %s '%s'
|
|
|
|
|
no sé qué hacer con %06o %s '%s'
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:1002
|
|
|
840.
|
|
|
Failed to merge submodule %s (not checked out)
|
|
|
|
|
Falló al fusionar el submódulo %s (no revisado)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-ort.c:1584 merge-recursive.c:1211
|
