|
|
1796.
|
|
|
Submodule changes to be committed:
|
|
|
|
|
Submódulos cambiados listos para realizar commit:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:991
|
|
|
1797.
|
|
|
Do not modify or remove the line above. 
Everything below it will be ignored. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
No modifiques ni borres la línea de encima.
Todo lo que esté por abajo será ignorado. |
|
Translated by
Alex Henrie
|
|
|
|
Located in
wt-status.c:1073
|
|
|
1798.
|
|
|
It took %.2f seconds to compute the branch ahead/behind values.
You can use '--no-ahead-behind' to avoid this.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Tomó %.2f segundos para calcular los valores anterior/posterior del branch.
Puedes usar '--no-ahead-behind' para evitar esto.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1165
|
|
|
1799.
|
|
|
You have unmerged paths.
|
|
|
|
|
Tienes rutas no fusionadas.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1195
|
|
|
1800.
|
|
|
(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
|
|
|
1801.
|
|
|
(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
|
|
|
1802.
|
|
|
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
|
|
|
1803.
|
|
|
(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
|
|
|
1804.
|
|
|
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
|
|
|
1805.
|
|
|
The current patch is empty.
|
|
|
|
|
El parche actual está vacío.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
wt-status.c:1219
|
