|
119.
|
|
|
Error while running merge tool (code %d)
|
|
|
|
Error durante la ejecución de la herramienta de mezclado (code %d)
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:235
|
|
120.
|
|
|
Error
|
|
|
|
Error
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
lib\conflicts.py:236 lib\conflicts.py:298 lib\tag.py:194 lib\trace.py:193
lib\trace.py:200 lib\tree_branch.py:95 lib\util.py:420 lib\util.py:1011
lib\util.py:1021
|
|
121.
|
|
|
Bazaar 2.4 or later is required for external mergetools support
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:265
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
Asigne la aplicación de external_merge en qconfig bajo la pestaña de Mezcla
|
|
Translated by
DiegoJ
|
|
Reviewed by
Luis Alejandro Rangel Sánchez
|
|
|
|
Located in
lib\conflicts.py:275
|
|
123.
|
|
|
External merge tool %(tool)s is not available
|
|
|
|
Herramienta de fusión externa %(tool)s no disponible
|
|
Translated and reviewed by
Monkey
|
|
|
|
Located in
lib\conflicts.py:279
|
|
124.
|
|
|
The extmerge definition: '%(tool)s' is invalid.
Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge tab.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
La definición extmerge: '%(tool)s' no es válida.
Falta la bandera: %(flags)s. Esto debe ser corregido en qconfig en la ficha Combinar correspondencia.
|
|
Translated and reviewed by
hhlp
|
|
|
|
Located in
lib\conflicts.py:299
|
|
125.
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
|
|
No se encontró la bandera: %s. Configúrela en qconfig bajo la pestaña de mezcla.
|
|
Translated by
DiegoJ
|
|
Reviewed by
Luis Alejandro Rangel Sánchez
|
|
|
|
Located in
lib\conflicts.py:305
|
|
126.
|
|
|
path conflict
|
|
|
|
conflicto en la ruta
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:310
|
|
127.
|
|
|
contents conflict
|
|
|
|
conflicto de contenidos
|
|
Translated by
DiegoJ
|
|
Reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:311
|
|
128.
|
|
|
text conflict
|
|
|
|
texto conflictivo
|
|
Translated and reviewed by
Luis Alejandro Rangel Sánchez
|
|
|
|
Located in
lib\conflicts.py:312
|