|
2.
|
|
|
Invalid font specified in %s:
|
|
|
|
Tipo de letra no válido especificado en %s:
|
|
Translated and reviewed by
Adolfo Jayme Barrientos
|
In upstream: |
|
Tipografía inválida especificada en %s:
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
git-gui.sh:847
|
|
3.
|
|
|
Main Font
|
|
|
|
Tipo de letra principal
|
|
Translated and reviewed by
Adolfo Jayme Barrientos
|
In upstream: |
|
Tipografía principal
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
git-gui.sh:901
|
|
61.
|
|
|
Rename...
|
|
|
|
Renombrar…
|
|
Translated and reviewed by
Adolfo Jayme Barrientos
|
In upstream: |
|
Renombrar ...
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
git-gui.sh:2877
|
|
62.
|
|
|
Delete...
|
|
|
|
Eliminar…
|
|
Translated and reviewed by
Adolfo Jayme Barrientos
|
In upstream: |
|
Borrar...
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
git-gui.sh:2882
|
|
63.
|
|
|
Reset...
|
|
|
|
Restablecer…
|
|
Translated and reviewed by
Adolfo Jayme Barrientos
|
In upstream: |
|
Restablecer...
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
git-gui.sh:2887
|
|
286.
|
|
|
Cannot amend while merging.
You are currently in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
No se puede corregir mientras se mezcla.
Usted está actualmente en la mitad de una combinación que no ha sido completada por entero. No puede corregir la asignación anterior a menos que primero aborte la actividad de combinación actual.
|
|
Translated and reviewed by
Paco Molinero
|
In upstream: |
|
No se puede corregir mientras se combina.
Usted está actualmente en la mitad de una combinación que no ha sido completada por entero. No puede corregir la asignación anterior a menos que primero aborte la actividad de combinación actual.
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
lib/commit.tcl:18
|
|
292.
|
|
|
Unmerged files cannot be committed.
File %s has merge conflicts. You must resolve them and stage the file before committing.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Archivos no mezclados no pueden ser ejecutados.
El archivo %s tiene conflictos de combinación. Usted debe resolverlos y organizar el archivo antes de ejecutarlos.
|
|
Translated and reviewed by
Paco Molinero
|
In upstream: |
|
Archivos no combinados no pueden ser ejecutados.
El archivo %s tiene conflictos de combinación. Usted debe resolverlos y organizar el archivo antes de ejecutarlos.
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
lib/commit.tcl:182
|
|
368.
|
|
|
Revision To Merge
|
|
|
|
Revisión para mezclar
|
|
Translated and reviewed by
Paco Molinero
|
In upstream: |
|
Revisión para combinar
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
lib/merge.tcl:183
|
|
399.
|
|
|
Summarize Merge Commits
|
|
|
|
Resumir las ejecuciones de mezcla
|
|
Translated and reviewed by
Paco Molinero
|
In upstream: |
|
Resumir las ejecuciones de combinación
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
lib/option.tcl:143
|