|
376.
|
|
|
Force resolution to the base version?
|
|
|
|
¿Forzar resolución a la versión base?
|
|
Translated by
Marcos Sánchez
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:8
|
|
377.
|
|
|
Force resolution to this branch?
|
|
|
|
¿Forzar resolución hacia esta rama?
|
|
Translated by
Marcos Sánchez
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:9
|
|
378.
|
|
|
Force resolution to the other branch?
|
|
|
|
¿Forzar resolución a la otra rama?
|
|
Translated by
Marcos Sánchez
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:10
|
|
379.
|
|
|
Note that the diff shows only conflicting changes.
%s will be overwritten.
This operation can be undone only by restarting the merge.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Note que la diferencia sólo muestra cambios conflictivos entre sí.
%s será sobreescrito.
Esta operación se puede revertir sólo reiniciando la fusión.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:14
|
|
380.
|
|
|
File %s seems to have unresolved conflicts, still stage?
|
|
|
|
El archivo %s parece tener conflictos aún sin resolver ¿Clasificar de todas formas?
|
|
Translated by
Marcos Sánchez
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:45
|
|
381.
|
|
|
Adding resolution for %s
|
|
|
|
Añadiendo resolución para %s
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:60
|
|
382.
|
|
|
Cannot resolve deletion or link conflicts using a tool
|
|
|
|
No se puede resolver la eliminación o los conflictos de enlaces usando una herramienta
|
|
Translated by
Marcos Sánchez
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:141
|
|
383.
|
|
|
Conflict file does not exist
|
|
|
|
El archivo de conflictos no existe
|
|
Translated by
Marcos Sánchez
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:146
|
|
384.
|
|
|
Not a GUI merge tool: '%s'
|
|
|
|
No es una herramienta gráfica de fusión: «%s»
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:246
|
|
385.
|
|
|
Unsupported merge tool '%s'
|
|
|
|
Herramienta de fusión no permitida: «%s»
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
lib/mergetool.tcl:275
|