|
663.
|
|
|
Submodule changes to be committed:
|
|
|
|
Submódulos cambiados listos para realizar commit:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:991
|
|
664.
|
|
|
Do not touch the line above.
Everything below will be removed.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
No toque la línea de arriba.
Todo lo de debajo se eliminará.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
wt-status.c:837
|
|
665.
|
|
|
You have unmerged paths.
|
|
|
|
Tienes rutas no fusionadas.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1195
|
|
666.
|
|
|
(fix conflicts and run "git commit")
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(arregla los conflictos y ejecuta "git commit"
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
wt-status.c:1198
|
|
667.
|
|
|
(use "git merge --abort" to abort the merge)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(usa "git merge --abort" para abortar la fusion)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1200
|
|
668.
|
|
|
All conflicts fixed but you are still merging.
|
|
|
|
Todos los conflictos resueltos pero sigues fusionando.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1204
|
|
669.
|
|
|
(use "git commit" to conclude merge)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(usa "git commit" para concluir la fusión)
|
|
Translated by
Carlos Osiel Rojas Velázquez
|
|
|
|
Located in
wt-status.c:1207
|
|
670.
|
|
|
You are in the middle of an am session.
|
|
|
|
Estás en medio de una sesión am.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1216
|
|
671.
|
|
|
The current patch is empty.
|
|
|
|
El parche actual está vacío.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1219
|
|
672.
|
|
|
(fix conflicts and then run "git am --continue")
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(arregla los conflictos y luego ejecuta "git am --continue"
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
wt-status.c:1223
|