|
1260.
|
|
|
(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
|
|
1261.
|
|
|
(use "git am --skip" to skip this patch)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(use «git am --skip» para omitir este parche)
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
In upstream: |
|
(usa "git am --skip" para saltar este parche)
|
|
|
Suggested by
Carlos Osiel Rojas Velázquez
|
|
|
|
Located in
wt-status.c:1225
|
|
1262.
|
|
|
(use "git am --abort" to restore the original branch)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(use «git am --abort» para restaurar la rama original)
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
In upstream: |
|
(usa "git am --abort" para restaurar la rama original)
|
|
|
Suggested by
Carlos Osiel Rojas Velázquez
|
|
|
|
Located in
wt-status.c:1227
|
|
1263.
|
|
|
git-rebase-todo is missing.
|
|
|
|
git-rebase-todo no está presente.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1360
|
|
1264.
|
|
|
No commands done.
|
|
|
|
No se realizaron los comandos.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1362
|
|
1265.
|
|
|
Last command done (%d command done):
|
|
|
Last commands done (%d commands done):
|
|
|
|
El último comando realizado (%d comando realizado):
|
|
Translated by
Christopher-diaz-riv
|
|
|
Los últimos comandos realizados (%d comandos realizados):
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1365
|
|
1266.
|
|
|
(see more in file %s )
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(ver más en el archivo %s )
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1376
|
|
1267.
|
|
|
No commands remaining.
|
|
|
|
No quedan más comandos.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1381
|
|
1268.
|
|
|
Next command to do (%d remaining command):
|
|
|
Next commands to do (%d remaining commands):
|
|
|
|
Siguiente comando a realizar[nbsp] (%d comando restante):
|
|
Translated by
Alex Henrie
|
|
|
Siguientes comandos a realizar (%d comandos faltantes):
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
wt-status.c:1384
|
|
1269.
|
|
|
(use "git rebase --edit-todo" to view and edit)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(usa "git rebase --edit-todo" para ver y editar)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1392
|