|
1289.
|
|
|
(all conflicts fixed: run "git revert --continue")
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(todos los conflictos corregidos: ejecute «git revert --continue»)
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
In upstream: |
|
(todos los conflictos corregidos: ejecuta "git revert --continue")
|
|
|
Suggested by
Jaime Armendariz
|
|
|
|
Located in
wt-status.c:1515
|
|
1290.
|
|
|
(use "git revert --abort" to cancel the revert operation)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(usa "git revert --abort" para cancelar la operación de revertir)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1519
|
|
1291.
|
|
|
You are currently bisecting, started from branch '%s '.
|
|
|
|
Estás aplicando un bisect, comenzando en la rama '%s '.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1529
|
|
1292.
|
|
|
You are currently bisecting.
|
|
|
|
Estás aplicando un bisect.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1533
|
|
1293.
|
|
|
(use "git bisect reset" to get back to the original branch)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(use «git bisect reset» para volver a la rama original)
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
In upstream: |
|
(usa "git bisect reset" para volver a la rama original)
|
|
|
Suggested by
Carlos Osiel Rojas Velázquez
|
|
|
|
Located in
wt-status.c:1536
|
|
1294.
|
|
|
On branch
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
En la rama
|
|
Translated by
Carlos Perelló Marín
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
wt-status.c:1794
|
|
1295.
|
|
|
interactive rebase in progress; onto
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
rebase interactivo en progreso; sobre
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
wt-status.c:1801
|
|
1296.
|
|
|
rebase in progress; onto
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
rebase en progreso; sobre
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
wt-status.c:1803
|
|
1297.
|
|
|
HEAD detached at
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
HEAD desacoplada en
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1808
|
|
1298.
|
|
|
HEAD detached from
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
HEAD desacoplada de
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1810
|