|
131.
|
|
|
Could not open '%s ' for writing
|
|
|
|
No se pudo abrir '%s ' para escritura
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
refs.c:706
|
|
132.
|
|
|
Could not write to '%s '
|
|
|
|
No se puede escribir en «%s »
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
builtin/merge.c:988
|
|
133.
|
|
|
after resolving the conflicts, mark the corrected paths ![](/@@/translation-newline)
with 'git add <paths>' or 'git rm <paths>'
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
después de resolver los conflictos, marca las rutas corregidas ![](/@@/translation-newline)
con 'git add <rutas>' o 'git rm <rutas>'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:420
|
|
134.
|
|
|
after resolving the conflicts, mark the corrected paths ![](/@@/translation-newline)
with 'git add <paths>' or 'git rm <paths>' ![](/@@/translation-newline)
and commit the result with 'git commit'
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
tras resolver los conflictos, marca las rutas corregidas ![](/@@/translation-newline)
con 'git add <rutas>' o 'git rm <rutas>' ![](/@@/translation-newline)
y haz un commit del resultado con 'git commit'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:390
|
|
135.
|
|
|
Could not write to %s
|
|
|
|
No se pudo escribir en %s
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
sequencer.c:199 sequencer.c:842 sequencer.c:922
|
|
136.
|
|
|
Error wrapping up %s
|
|
|
|
Error al envolver %s
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
sequencer.c:202
|
|
137.
|
|
|
Your local changes would be overwritten by cherry-pick.
|
|
|
|
cherry-pick sobrescribirá sus cambios locales.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
sequencer.c:217
|
|
138.
|
|
|
Your local changes would be overwritten by revert.
|
|
|
|
Sus cambios locales se sobrescribirán por revert.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
sequencer.c:219
|
|
139.
|
|
|
Commit your changes or stash them to proceed.
|
|
|
|
Hacer commit de los cambios o esconderlos para proceder.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
sequencer.c:222
|
|
140.
|
|
|
%s : Unable to write new index file
|
|
|
TRANSLATORS: %s will be "revert", "cherry-pick" or
"rebase".
|
|
|
|
%s : Incapaz de escribir el nuevo archivo índice
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:685
|