|
|
1431.
|
|
|
after resolving the conflicts, mark the corrected paths 
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
con 'git add <rutas>' o 'git rm <rutas>' |
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:387
|
|
|
1432.
|
|
|
After resolving the conflicts, mark them with
"git add/rm <pathspec>", then run
"git cherry-pick --continue".
You can instead skip this commit with "git cherry-pick --skip".
To abort and get back to the state before "git cherry-pick",
run "git cherry-pick --abort". |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Luego de resolver los conflictos, márquelos con
"git add/rm <pathspec>", luego ejecute
"git cherry-pick --continue".
O puede saltar este commit con "git cherry-pick --skip".
Para abortar y regresar al estado anterior a "git cherry-pick",
ejecute "git cherry-pick --abort". |
|
Translated by
Alex Henrie
|
|
|
|
Located in
sequencer.c:423
|
|
|
1433.
|
|
|
After resolving the conflicts, mark them with
"git add/rm <pathspec>", then run
"git revert --continue".
You can instead skip this commit with "git revert --skip".
To abort and get back to the state before "git revert",
run "git revert --abort". |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Tras resolver los conflictos, márquelos con
"git add/rm <pathspec>", luego ejecute
"git revert --continue".
O puede saltar este commit con "git revert --skip".
Para abortar y regresar al estado anterior a "git revert",
ejecute "git revert --abort". |
|
Translated by
Alex Henrie
|
|
|
|
Located in
sequencer.c:430
|
|
|
1434.
|
|
|
could not lock '%s'
|
|
|
|
|
no se pudo bloquear '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:403 sequencer.c:2993
|
|
|
1435.
|
|
|
could not write to '%s'
|
|
|
|
|
no se pudo escribir en '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
wrapper.c:620
|
|
|
1436.
|
|
|
could not write eol to '%s'
|
|
|
|
|
no se pudo escribir EOL en '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:410
|
|
|
1437.
|
|
|
failed to finalize '%s'
|
|
|
|
|
falló al finalizar '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
sequencer.c:3277
|
|
|
1438.
|
|
|
could not read '%s'
|
|
|
|
|
no se pudo leer '%s'
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
builtin/rebase.c:589
|
|
|
1439.
|
|
|
your local changes would be overwritten by %s.
|
|
|
|
|
tus cambios locales serán sobreescritos por %s.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:464
|
|
|
1440.
|
|
|
commit your changes or stash them to proceed.
|
|
|
|
|
realiza un commit con tus cambios o aplica un stash para proceder.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
sequencer.c:468
|
