[gimp-help-2/gimp-help-2-6-0] Updated Spanish translation

From: Jorge Gonzalez Gonzalez <jorgegonz src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp-help-2/gimp-help-2-6-0] Updated Spanish translation
Date: Sat, 11 Dec 2010 15:28:11 +0000 (UTC)
commit aec179751782bfaa2d859a39a84d539282db5c2d
Author: Ignacio AntI <ant ign gmail com>
Date:   Sat Dec 11 16:28:03 2010 +0100

    Updated Spanish translation

 po/es/toolbox.po |11088 +++++++++++++++++++++++++++---------------------------
 1 files changed, 5520 insertions(+), 5568 deletions(-)
---
diff --git a/po/es/toolbox.po b/po/es/toolbox.po
index e92da57..e518875 100644
--- a/po/es/toolbox.po
+++ b/po/es/toolbox.po
@@ -1,11 +1,15 @@
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-01-25 20:53+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
-"Language-Team: LANGUAGE <LL li org>\n"
+# TraducciÃ³n para es de toolbox.po
+# Ignacio AntI <ant dot ign at gmail dot com>, 2010.
+# Daniel Mustieles <daniel mustieles gmail com>, 2010.
+# Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GIMP-2.6-Help-Caja_de_herramientas\n"
+"POT-Creation-Date: 2010-11-16 22:44+0000\n"
+"PO-Revision-Date: 2010-12-05 20:00+0100\n"
+"Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
+"Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,340 +70,482 @@ msgstr ""
 "#-#-#-#-#  tool-threshold.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  tool-transform.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "#-#-#-#-#  tool-zoom.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/toolbox/tools-transform.xml:9(title)
+#: src/toolbox/tool-transform.xml:22(secondary)
+msgid "Transform Tools"
+msgstr "Herramientas de transformaciÃ³n"
+
+#: src/toolbox/tools-selection.xml:4(title)
+msgid "Selection Tools"
+msgstr "Herramientas de selecciÃ³n"
+
+#: src/toolbox/tools-painting.xml:13(title)
+msgid "Painting Tools (Pencil, Paintbrush, Airbrush)"
+msgstr "Herramientas de pintura (lÃ¡piz, pincel, aerÃ³grafo)"
+
+#: src/toolbox/tools-painting.xml:16(primary)
+#: src/toolbox/tool-zoom.xml:20(primary)
+#: src/toolbox/tool-transform.xml:21(primary)
+#: src/toolbox/tool-threshold.xml:18(primary)
+#: src/toolbox/tool-text.xml:20(primary)
+#: src/toolbox/tool-smudge.xml:16(primary)
+#: src/toolbox/tool-shear.xml:16(primary)
+#: src/toolbox/tool-scale.xml:18(primary)
+#: src/toolbox/tool-rotate.xml:18(primary)
+#: src/toolbox/tool-rect-select.xml:17(primary)
+#: src/toolbox/tool-posterize.xml:15(primary)
+#: src/toolbox/tool-perspective.xml:16(primary)
+#: src/toolbox/tool-perspective-clone.xml:14(primary)
+#: src/toolbox/tool-pencil.xml:16(primary)
+#: src/toolbox/tool-path.xml:20(primary)
+#: src/toolbox/tool-paintbrush.xml:12(primary)
+#: src/toolbox/tool-move.xml:20(primary)
+#: src/toolbox/tool-measure.xml:17(primary)
+#: src/toolbox/tool-levels.xml:18(primary)
+#: src/toolbox/tool-iscissors.xml:23(primary)
+#: src/toolbox/tool-ink.xml:17(primary)
+#: src/toolbox/tool-hue-saturation.xml:19(primary)
+#: src/toolbox/tool-heal.xml:15(primary)
+#: src/toolbox/tool-fuzzy-select.xml:18(primary)
+#: src/toolbox/tool-free-select.xml:18(primary)
+#: src/toolbox/tool-foreground-select.xml:17(primary)
+#: src/toolbox/tool-flip.xml:17(primary)
+#: src/toolbox/tool-eraser.xml:20(primary)
+#: src/toolbox/tool-ellipse-select.xml:19(primary)
+#: src/toolbox/tool-dodge-burn.xml:15(primary)
+#: src/toolbox/tool-curves.xml:19(primary)
+#: src/toolbox/tool-crop.xml:24(primary)
+#: src/toolbox/tool-convolve.xml:17(primary)
+#: src/toolbox/tool-colorize.xml:16(primary)
+#: src/toolbox/tool-color-picker.xml:18(primary)
+#: src/toolbox/tool-color-balance.xml:16(primary)
+#: src/toolbox/tool-clone.xml:25(primary)
+#: src/toolbox/tool-by-color-select.xml:17(primary)
+#: src/toolbox/tool-bucket-fill.xml:17(primary)
+#: src/toolbox/tool-brightness-contrast.xml:16(primary)
+#: src/toolbox/tool-blend.xml:30(primary)
+#: src/toolbox/tool-align.xml:18(primary)
+#: src/toolbox/tool-airbrush.xml:20(primary)
+msgid "Tools"
+msgstr "Herramientas"
+
+#: src/toolbox/tools-painting.xml:17(secondary)
+msgid "Painting"
+msgstr "Pintar"
+
+#: src/toolbox/tools-painting.xml:21(title)
+msgid "Painting example"
+msgstr "Ejemplos de trazos"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-zoom.xml:46(None)
-msgid "@@image: 'images/toolbox/toolbox-zoom.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-zoom.xml:75(None) src/toolbox/tool-zoom.xml:136(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-zoom-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-zoom.xml:125(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-zoom.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:19(revnumber)
-#: src/toolbox/tool-threshold.xml:18(revnumber)
-#: src/toolbox/tool-text.xml:16(revnumber)
-#: src/toolbox/tools-painting.xml:15(revnumber)
-#: src/toolbox/tool-smudge.xml:16(revnumber)
-#: src/toolbox/tool-shear.xml:16(revnumber)
-#: src/toolbox/tool-select.xml:19(revnumber)
-#: src/toolbox/tool-scale.xml:17(revnumber)
-#: src/toolbox/tool-rotate.xml:18(revnumber)
-#: src/toolbox/tool-rect-select.xml:18(revnumber)
-#: src/toolbox/tool-posterize.xml:16(revnumber)
-#: src/toolbox/tool-perspective.xml:17(revnumber)
-#: src/toolbox/tool-perspective-clone.xml:14(revnumber)
-#: src/toolbox/tool-pencil.xml:15(revnumber)
-#: src/toolbox/tool-path.xml:20(revnumber)
-#: src/toolbox/tool-paintbrush.xml:13(revnumber)
-#: src/toolbox/tool-move.xml:18(revnumber)
-#: src/toolbox/tool-measure.xml:18(revnumber)
-#: src/toolbox/tool-levels.xml:16(revnumber)
-#: src/toolbox/tool-iscissors.xml:21(revnumber)
-#: src/toolbox/tool-ink.xml:17(revnumber)
-#: src/toolbox/tool-hue-saturation.xml:17(revnumber)
-#: src/toolbox/tool-heal.xml:14(revnumber)
-#: src/toolbox/tool-fuzzy-select.xml:17(revnumber)
-#: src/toolbox/tool-free-select.xml:17(revnumber)
-#: src/toolbox/tool-foreground-select.xml:16(revnumber)
-#: src/toolbox/tool-flip.xml:17(revnumber)
-#: src/toolbox/tool-eraser.xml:19(revnumber)
-#: src/toolbox/tool-ellipse-select.xml:18(revnumber)
-#: src/toolbox/tool-dodge-burn.xml:15(revnumber)
-#: src/toolbox/tool-curves.xml:17(revnumber)
-#: src/toolbox/tool-crop.xml:19(revnumber)
-#: src/toolbox/tool-convolve.xml:17(revnumber)
-#: src/toolbox/tool-color-picker.xml:18(revnumber)
-#: src/toolbox/tool-colorize.xml:16(revnumber)
-#: src/toolbox/tool-color-balance.xml:16(revnumber)
-#: src/toolbox/tool-by-color-select.xml:18(revnumber)
-#: src/toolbox/tool-bucket-fill.xml:17(revnumber)
-#: src/toolbox/tool-brightness-contrast.xml:15(revnumber)
-#: src/toolbox/toolbox-color-area.xml:16(revnumber)
-#: src/toolbox/tool-blend.xml:23(revnumber)
-#: src/toolbox/tool-align.xml:16(revnumber)
-#: src/toolbox/tool-airbrush.xml:17(revnumber)
-#: src/toolbox/intro.xml:16(revnumber)
-msgid "$Revision: 2687 $"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:20(date)
-msgid "2007-12-21"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:21(authorinitials)
-#: src/toolbox/tool-threshold.xml:20(authorinitials)
-#: src/toolbox/tool-text.xml:18(authorinitials)
-#: src/toolbox/tools-painting.xml:17(authorinitials)
-#: src/toolbox/tool-smudge.xml:18(authorinitials)
-#: src/toolbox/tool-shear.xml:18(authorinitials)
-#: src/toolbox/tool-select.xml:21(authorinitials)
-#: src/toolbox/tool-scale.xml:19(authorinitials)
-#: src/toolbox/tool-rotate.xml:20(authorinitials)
-#: src/toolbox/tool-posterize.xml:18(authorinitials)
-#: src/toolbox/tool-perspective.xml:19(authorinitials)
-#: src/toolbox/tool-perspective-clone.xml:16(authorinitials)
-#: src/toolbox/tool-pencil.xml:17(authorinitials)
-#: src/toolbox/tool-path.xml:22(authorinitials)
-#: src/toolbox/tool-paintbrush.xml:15(authorinitials)
-#: src/toolbox/tool-move.xml:20(authorinitials)
-#: src/toolbox/tool-measure.xml:20(authorinitials)
-#: src/toolbox/tool-levels.xml:18(authorinitials)
-#: src/toolbox/tool-ink.xml:19(authorinitials)
-#: src/toolbox/tool-hue-saturation.xml:19(authorinitials)
-#: src/toolbox/tool-heal.xml:16(authorinitials)
-#: src/toolbox/tool-foreground-select.xml:18(authorinitials)
-#: src/toolbox/tool-flip.xml:19(authorinitials)
-#: src/toolbox/tool-eraser.xml:21(authorinitials)
-#: src/toolbox/tool-dodge-burn.xml:17(authorinitials)
-#: src/toolbox/tool-curves.xml:19(authorinitials)
-#: src/toolbox/tool-crop.xml:21(authorinitials)
-#: src/toolbox/tool-convolve.xml:19(authorinitials)
-#: src/toolbox/tool-color-picker.xml:20(authorinitials)
-#: src/toolbox/tool-colorize.xml:18(authorinitials)
-#: src/toolbox/tool-color-balance.xml:18(authorinitials)
-#: src/toolbox/tool-bucket-fill.xml:19(authorinitials)
-#: src/toolbox/tool-brightness-contrast.xml:17(authorinitials)
-#: src/toolbox/toolbox-color-area.xml:18(authorinitials)
-#: src/toolbox/tool-airbrush.xml:19(authorinitials)
-#: src/toolbox/intro.xml:18(authorinitials)
-#, fuzzy
-msgid "j.h"
+#: src/toolbox/tools-painting.xml:28(para)
+msgid ""
+"Three strokes painted with the same round fuzzy brush (outline shown in "
+"upper left), using the Pencil (left), Paintbrush (middle), and Airbrush "
+"(right)."
 msgstr ""
-"#-#-#-#-#  intro.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  tool-airbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  toolbox-color-area.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuq\n"
-"#-#-#-#-#  tool-brightness-contrast.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-color-balance.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-colorize.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
+"Tres trazos ejecutados con la misma brocha circular difusa (mostrada en la "
+"esquina superior izquierda), usando el lÃ¡piz (izquierda), el pincel "
+"(centro), y el aerÃ³grafo (derecha)."
+
+#: src/toolbox/tools-painting.xml:37(para)
+msgid ""
+"The tools in this group are GIMP's basic painting tools, and they have "
+"enough features in common to be worth discussing together in this section. "
+"Features common to all brush tools are described in the <link linkend=\"gimp-"
+"tool-brush\">Common Features</link> section. Features specific to an "
+"individual tool are described in the section devoted to that tool."
+msgstr ""
+"Las herramientas de este grupo son las mÃ¡s bÃ¡sicas para pintar en el GIMP, y "
+"tienen sufientes caracterÃsticas en comÃºn como para ser discutidas en "
+"conjunto en esta secciÃ³n. Las caracterÃsticas comunes a todas las "
+"herramientas de brocha fueron descriptas en la secciÃ³n sobre <link linkend="
+"\"gimp-tool-brush\">CaracterÃsticas en comÃºn</link>. Las caracterÃsticas "
+"especÃficas a cada herramienta en particular son descriptas en las secciones "
+"dedicadas a cada una."
+
+#: src/toolbox/tools-painting.xml:45(para)
+#, fuzzy
+#| msgid ""
+#| "The Pencil is the crudest of the tools in this group: it makes hard, non-"
+#| "anti-aliased brushstrokes. The Paintbrush is intermediate: it is probably "
+#| "the most commonly used of the group. The Airbrush is the most flexible "
+#| "and controllable: it is the only one for which the amount of paint "
+#| "applied depends on the speed of brush movement. This flexibility also "
+#| "makes it a bit more difficult to use than the Paintbrush, however."
+msgid ""
+"The Pencil is the crudest of the tools in this group: it makes hard, non-"
+"anti-aliased brushstrokes. The Paintbrush is intermediate: it is probably "
+"the most commonly used of the group. The Airbrush is the most flexible and "
+"controllable. This flexibility also makes it a bit more difficult to use "
+"than the Paintbrush, however."
+msgstr ""
+"El lÃ¡piz es la mÃ¡s ruda de las herramientas de este grupo: hace trazos "
+"duros, sin antidentado. El pincel es intermedio: es probablemente la "
+"herramienta mÃ¡s usada de este grupo. El aerÃ³grafo es la mÃ¡s flexible y "
+"controlable: es la Ãºnica para la que la cantidad de pintura aplicada depende "
+"de la velocidad de la brocha en movimiento. Esta flexibilidad tambiÃ©n la "
+"hace mÃ¡s difÃcil de usar que el pincel."
+
+#: src/toolbox/tools-painting.xml:52(para)
+msgid ""
+"All of these tools share the same brushes, and the same options for choosing "
+"colors, either from the basic palette or from a gradient. All are capable of "
+"painting in a wide variety of modes."
+msgstr ""
+"Todas estas herramientas comparten las mismas brochas, y las mismas opciones "
+"para seleccionar colores, tanto desde una paleta bÃ¡sica o desde un "
+"degradado. Todas son capaces de pintar en una amplia variedad de modos."
+
+#: src/toolbox/tools-painting.xml:59(title)
+#: src/toolbox/tool-rect-select.xml:84(title)
+#: src/toolbox/tool-iscissors.xml:98(title)
+#: src/toolbox/tool-free-select.xml:125(title)
+#: src/toolbox/tool-eraser.xml:129(title)
+#: src/toolbox/tool-ellipse-select.xml:103(title)
+#: src/toolbox/tool-brush.xml:155(title)
+#, fuzzy
+msgid "Key modifiers"
+msgstr ""
+"#-#-#-#-#  tool-brush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras\n"
+"#-#-#-#-#  tool-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
 "#-#-#-#-#  tool-convolve.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-curves.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-dodge-burn.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-ellipse-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por defecto)\n"
 "#-#-#-#-#  tool-eraser.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-hue-saturation.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"m.q\n"
-"#-#-#-#-#  tool-levels.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-move.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuq\n"
-"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-posterize.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-shear.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI\n"
-"#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-free-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras\n"
+"#-#-#-#-#  tool-rect-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por defecto)\n"
 "#-#-#-#-#  tools-painting.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"manuelq\n"
-"#-#-#-#-#  tool-threshold.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"AntI"
+"Teclas modificadoras (por omisiÃ³n)"
+
+#: src/toolbox/tools-painting.xml:63(keycap)
+#: src/toolbox/tool-zoom.xml:75(keycap) src/toolbox/tool-zoom.xml:87(keycap)
+#: src/toolbox/tool-text.xml:419(keycap)
+#: src/toolbox/tool-smudge.xml:91(keycap)
+#: src/toolbox/tool-select.xml:111(keycap)
+#: src/toolbox/tool-select.xml:189(keycap)
+#: src/toolbox/tool-scale.xml:99(keycap)
+#: src/toolbox/tool-rotate.xml:86(keycap)
+#: src/toolbox/tool-rect-select.xml:89(keycap)
+#: src/toolbox/tool-rect-select.xml:135(keycap)
+#: src/toolbox/tool-perspective-clone.xml:73(keycap)
+#: src/toolbox/tool-pencil.xml:89(keycap)
+#: src/toolbox/tool-paintbrush.xml:68(keycap)
+#: src/toolbox/tool-measure.xml:120(term)
+#: src/toolbox/tool-measure.xml:152(keycap)
+#: src/toolbox/tool-heal.xml:88(keycap)
+#: src/toolbox/tool-foreground-select.xml:194(keycap)
+#: src/toolbox/tool-flip.xml:77(keycap)
+#: src/toolbox/tool-eraser.xml:137(keycap)
+#: src/toolbox/tool-ellipse-select.xml:109(keycap)
+#: src/toolbox/tool-ellipse-select.xml:138(keycap)
+#: src/toolbox/tool-dodge-burn.xml:76(keycap)
+#: src/toolbox/tool-color-picker.xml:92(term)
+#: src/toolbox/tool-clone.xml:119(keycap)
+#: src/toolbox/tool-brush.xml:159(keycap)
+#: src/toolbox/tool-brush.xml:205(keycap)
+#: src/toolbox/tool-blend.xml:120(keycap)
+#: src/toolbox/tool-airbrush.xml:73(keycap)
+msgid "Ctrl"
+msgstr "Ctrl"
 
-#: src/toolbox/tool-zoom.xml:26(phrase)
-#: src/toolbox/tool-zoom.xml:30(secondary)
-#: src/toolbox/tool-zoom.xml:33(primary)
-msgid "Magnify"
+#: src/toolbox/tools-painting.xml:66(para)
+msgid ""
+"Holding down the <keycap>Ctrl</keycap> key changes each of these tools to a "
+"<link linkend=\"gimp-tool-color-picker\">Color Picker</link>: clicking on "
+"any pixel of any layer sets the foreground color (as displayed in the "
+"Toolbox Color Area) to the color of the pixel."
 msgstr ""
+"Manteniendo presionada la tecla <keycap>Ctrl</keycap> se cambia de estas "
+"herramientas a la herramienta Recoge color: clicando en cualquier pÃxel de "
+"cualquier capa asigna el color del mismo al color de frente (que se muestra "
+"en el Ã¡rea de color de la caja de herramientas)."
 
-#: src/toolbox/tool-zoom.xml:29(primary)
-#: src/toolbox/tool-transform.xml:18(primary)
-#: src/toolbox/tool-threshold.xml:28(primary)
-#: src/toolbox/tool-text.xml:24(primary)
-#: src/toolbox/tools-painting.xml:25(primary)
-#: src/toolbox/tool-smudge.xml:26(primary)
-#: src/toolbox/tool-shear.xml:26(primary)
-#: src/toolbox/tool-scale.xml:27(primary)
-#: src/toolbox/tool-rotate.xml:28(primary)
-#: src/toolbox/tool-rect-select.xml:28(primary)
-#: src/toolbox/tool-posterize.xml:24(primary)
-#: src/toolbox/tool-perspective.xml:27(primary)
-#: src/toolbox/tool-perspective-clone.xml:24(primary)
-#: src/toolbox/tool-pencil.xml:25(primary)
-#: src/toolbox/tool-path.xml:30(primary)
-#: src/toolbox/tool-paintbrush.xml:23(primary)
-#: src/toolbox/tool-move.xml:28(primary)
-#: src/toolbox/tool-measure.xml:28(primary)
-#: src/toolbox/tool-levels.xml:26(primary)
-#: src/toolbox/tool-iscissors.xml:31(primary)
-#: src/toolbox/tool-ink.xml:27(primary)
-#: src/toolbox/tool-hue-saturation.xml:27(primary)
-#: src/toolbox/tool-heal.xml:24(primary)
-#: src/toolbox/tool-fuzzy-select.xml:27(primary)
-#: src/toolbox/tool-free-select.xml:27(primary)
-#: src/toolbox/tool-foreground-select.xml:26(primary)
-#: src/toolbox/tool-flip.xml:27(primary)
-#: src/toolbox/tool-eraser.xml:29(primary)
-#: src/toolbox/tool-ellipse-select.xml:28(primary)
-#: src/toolbox/tool-dodge-burn.xml:25(primary)
-#: src/toolbox/tool-curves.xml:27(primary)
-#: src/toolbox/tool-crop.xml:32(primary)
-#: src/toolbox/tool-convolve.xml:27(primary)
-#: src/toolbox/tool-color-picker.xml:28(primary)
-#: src/toolbox/tool-colorize.xml:26(primary)
-#: src/toolbox/tool-color-balance.xml:26(primary)
-#: src/toolbox/tool-clone.xml:24(primary)
-#: src/toolbox/tool-by-color-select.xml:28(primary)
-#: src/toolbox/tool-bucket-fill.xml:27(primary)
-#: src/toolbox/tool-brightness-contrast.xml:25(primary)
-#: src/toolbox/tool-blend.xml:40(primary)
-#: src/toolbox/tool-align.xml:29(primary)
-#: src/toolbox/tool-airbrush.xml:30(primary)
-msgid "Tools"
-msgstr "Herramientas"
+#: src/toolbox/tools-paint.xml:11(phrase)
+#: src/toolbox/tool-brush.xml:27(secondary)
+msgid "Brush Tools"
+msgstr "Herramientas de brocha"
 
-#: src/toolbox/tool-zoom.xml:36(primary)
-msgid "Zoom"
+#: src/toolbox/tools-color.xml:11(phrase)
+msgid "Color Tools"
+msgstr "Herramientas de color"
+
+#: src/toolbox/toolbox-color-area.xml:14(title)
+msgid "Color and Indicator Area"
+msgstr "Ã?reas de indicaciones y de colores"
+
+#: src/toolbox/toolbox-color-area.xml:17(title)
+#: src/toolbox/toolbox-color-area.xml:21(secondary)
+#: src/toolbox/toolbox-color-area.xml:24(primary)
+msgid "Color Area"
+msgstr "Ã?rea de colores"
+
+#: src/toolbox/toolbox-color-area.xml:20(primary)
+#: src/toolbox/toolbox-color-area.xml:88(primary)
+#: src/toolbox/toolbox-color-area.xml:123(primary)
+#: src/toolbox/tool-brush.xml:26(primary) src/toolbox/intro.xml:17(primary)
+msgid "Toolbox"
+msgstr "Caja de herramientas"
+
+#: src/toolbox/toolbox-color-area.xml:27(primary)
+msgid "Foreground color"
+msgstr "Color de frente"
+
+#: src/toolbox/toolbox-color-area.xml:30(primary)
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: src/toolbox/toolbox-color-area.xml:33(title)
+msgid "Color area in the Toolbox Palette"
+msgstr "El Ã¡rea de colores en la caja de herramientas"
+
+#: src/toolbox/toolbox-color-area.xml:43(term)
+msgid "Color area"
+msgstr "Ã?rea de colores"
+
+#: src/toolbox/toolbox-color-area.xml:45(para)
+msgid ""
+"This area shows GIMP's basic palette, consisting of two colors, the "
+"Foreground and Background, used for painting, filling, and many other "
+"operations. Clicking on either of the color displays brings up a Color "
+"Editor dialog, which permits you to change it."
 msgstr ""
+"Este Ã¡rea muestra la paleta bÃ¡sica del GIMP, que consiste de dos colores, el "
+"color de frente y el color de fondo. Estos colores se utilizan al pintar, "
+"rellenar, y en muchas otras operaciones. Al hacer clic en cualquiera de "
+"ellos aparece el diÃ¡logo editor de colores, que permite modificarlo."
 
-#: src/toolbox/tool-zoom.xml:40(phrase)
-msgid "The <quote>Zoom</quote> tool in Toolbox"
+#: src/toolbox/toolbox-color-area.xml:54(term)
+msgid "Default colors"
+msgstr "Colores predeterminados"
+
+#: src/toolbox/toolbox-color-area.xml:57(para)
+msgid ""
+"Clicking on this small symbol resets the Foreground and Background colors to "
+"black and white, respectively. Pressing the <keycap>D</keycap> key has the "
+"same effect."
 msgstr ""
+"Al hacer clic en este pequeÃ±o sÃmbolo, se vuelven los colores de frente y "
+"fondo a negro y blanco, respectivamente."
 
-#: src/toolbox/tool-zoom.xml:50(para)
+#: src/toolbox/toolbox-color-area.xml:65(term)
+msgid "Swap FG/BG colors"
+msgstr "Intercambiar los colores de frente y fondo"
+
+#: src/toolbox/toolbox-color-area.xml:68(para)
+msgid ""
+"Clicking on the small curved line with two arrowheads causes the Foreground "
+"and Background colors to be swapped. Pressing the <keycap>X</keycap> key has "
+"the same effect."
+msgstr ""
+"Al hacer clic sobre la pequeÃ±a flecha curva, los colores de frente y fondo "
+"se intercambian. Presionar la tecla <keycap>X</keycap> surte el mismo efecto."
+
+#: src/toolbox/toolbox-color-area.xml:74(para)
+msgid ""
+"You can click-and-drag one of these colors directly into a layer: it will "
+"fill the whole layer."
+msgstr ""
+"Puede pulsar y arrastrar uno de esos colores directamente dentro de una "
+"capa: se rellenaraÌ? con ese color."
+
+#: src/toolbox/toolbox-color-area.xml:85(title)
+#: src/toolbox/toolbox-color-area.xml:89(secondary)
+msgid "Indicator Area"
+msgstr "Ã?rea de indicaciones"
+
+#: src/toolbox/toolbox-color-area.xml:92(primary)
+#: src/toolbox/tool-clone.xml:435(primary)
+#: src/toolbox/tool-clone.xml:456(primary)
+msgid "Brushes"
+msgstr "Brochas"
+
+#: src/toolbox/toolbox-color-area.xml:93(secondary)
+#: src/toolbox/toolbox-color-area.xml:97(secondary)
+#: src/toolbox/toolbox-color-area.xml:101(secondary)
+msgid "Toolbox Indicator Area"
+msgstr "Ã?rea de indicaciones"
+
+#: src/toolbox/toolbox-color-area.xml:96(primary)
+#: src/toolbox/tool-clone.xml:181(primary)
+msgid "Patterns"
+msgstr "Patrones"
+
+#: src/toolbox/toolbox-color-area.xml:100(primary)
+#: src/toolbox/tool-brush.xml:507(term) src/toolbox/tool-blend.xml:152(term)
+#, fuzzy
+msgid "Gradient"
+msgstr ""
+"#-#-#-#-#  tool-blend.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Degradado\n"
+"#-#-#-#-#  toolbox-color-area.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Caja de herramientas\n"
+"#-#-#-#-#  tool-brush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Degradado"
+
+#: src/toolbox/toolbox-color-area.xml:105(title)
+msgid "Active tool indicator area"
+msgstr "Ã?rea de indicaciones de la herramienta activa"
+
+#: src/toolbox/toolbox-color-area.xml:112(para)
+msgid ""
+"This part of the Toolbox shows the currently selected brush, pattern, and "
+"gradient. Clicking on any of them brings up a dialog that allows you to "
+"change it."
+msgstr ""
+"Esta parte de la caja de herramientas muestra la brocha actualmente "
+"seleccionada, el patrÃ³n activo, y el degradado activo. Al hacer clic sobe "
+"cualquiera de ellos, aparece un diÃ¡logo que le permite cambiarlo."
+
+#: src/toolbox/toolbox-color-area.xml:120(title)
+msgid "Active image Area"
+msgstr "Ã?rea de la imagen activa"
+
+#: src/toolbox/toolbox-color-area.xml:124(secondary)
+msgid "Active image area"
+msgstr "Ã?rea de la imagen activa"
+
+#: src/toolbox/toolbox-color-area.xml:128(title)
+msgid "Current image in the toolbox"
+msgstr "La imagen activa en la caja de herramientas"
+
+#: src/toolbox/toolbox-color-area.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "A thumbnail of the active image can be displayed in this area if the "
+#| "<quote>Display Active Image</quote> option is checked in Preferences/"
+#| "Toolbox. If you click on this thumbnail, the <quote>Images</quote> dialog "
+#| "is opened, useful if you have many images on your screen. You can also "
+#| "click and drag this thumbnail to an enabled XDS<placeholder-1/> file "
+#| "manager to directly save the corresponding image; this opens a dialog "
+#| "where you can enter a name for the image:"
+msgid ""
+"A thumbnail of the active image can be displayed in this area if the "
+"<quote>Display Active Image</quote> option is checked in Preferences/"
+"Toolbox. If you click on this thumbnail, the <quote>Images</quote> dialog is "
+"opened, useful if you have many images on your screen. You can also click "
+"and drag this thumbnail to an enabled XDS<footnote><para> See <xref linkend="
+"\"bibliography-online-xds\"/>. </para></footnote> file manager to directly "
+"save the corresponding image; this opens a dialog where you can enter a name "
+"for the image:"
+msgstr ""
+"Puede hacer que se muestre una miniatura de la imagen activa en este Ã¡rea si "
+"se activa la opciÃ³n <quote>Mostrar imagen activa</quote> en Preferencias/"
+"Caja de herramientas. <placeholder-1/>"
+
+#: src/toolbox/toolbox-color-area.xml:148(title)
+msgid "A Direct Save Protocol (XDS) dialog"
+msgstr ""
+
+#: src/toolbox/tool-zoom.xml:18(title) src/toolbox/tool-zoom.xml:21(secondary)
+#: src/toolbox/tool-zoom.xml:24(primary)
+msgid "Zoom"
+msgstr "AmpliacioÌ?n"
+
+#: src/toolbox/tool-zoom.xml:27(title)
+msgid "The <quote>Zoom</quote> tool in Toolbox"
+msgstr "La herramienta <quote>AmpliacioÌ?n</quote> en la caja de herramientas"
+
+#: src/toolbox/tool-zoom.xml:34(para)
 msgid ""
-"The Magnify Tool is used to change the zoom level of your working image. If "
-"you only click on the image, the zoom is applied to the whole image. But you "
-"can also click-and-drag the mouse pointer to create a zoom rectangle. Then, "
-"the action of this rectangle is better understood if the <quote>Allow window "
+"The Zoom Tool is used to change the zoom level of your working image. If you "
+"only click on the image, the zoom is applied to the whole image. But you can "
+"also click-and-drag the mouse pointer to create a zoom rectangle. Then, the "
+"action of this rectangle is better understood if the <quote>Allow window "
 "resizing</quote> option is unchecked: you can see that the content of this "
 "rectangle will be enlarged or reduced so that its biggest dimension fit the "
 "corresponding dimension of the image window (if the biggest dimension of the "
 "rectangle is width, then it will fit the width of the image window)."
 msgstr ""
 
-#: src/toolbox/tool-zoom.xml:63(phrase)
-#: src/toolbox/tool-threshold.xml:53(phrase)
-#: src/toolbox/tool-text.xml:55(phrase) src/toolbox/tool-smudge.xml:49(phrase)
-#: src/toolbox/tool-shear.xml:72(phrase) src/toolbox/tool-scale.xml:63(phrase)
-#: src/toolbox/tool-rotate.xml:59(phrase)
-#: src/toolbox/tool-posterize.xml:37(phrase)
-#: src/toolbox/tool-perspective.xml:63(phrase)
-#: src/toolbox/tool-move.xml:50(phrase)
-#: src/toolbox/tool-measure.xml:80(phrase)
-#: src/toolbox/tool-levels.xml:56(phrase) src/toolbox/tool-ink.xml:52(phrase)
-#: src/toolbox/tool-hue-saturation.xml:39(phrase)
-#: src/toolbox/tool-dodge-burn.xml:48(phrase)
-#: src/toolbox/tool-curves.xml:42(phrase) src/toolbox/tool-crop.xml:81(phrase)
-#: src/toolbox/tool-color-picker.xml:63(phrase)
-#: src/toolbox/tool-colorize.xml:44(phrase)
-#: src/toolbox/tool-color-balance.xml:43(phrase)
-#: src/toolbox/tool-brightness-contrast.xml:48(phrase)
-#: src/toolbox/tool-blend.xml:93(phrase) src/toolbox/tool-align.xml:56(phrase)
-#: src/toolbox/tool-airbrush.xml:49(phrase)
-#, fuzzy
-msgid "Activate the Tool"
+#: src/toolbox/tool-zoom.xml:47(title)
+#: src/toolbox/tool-threshold.xml:43(title)
+#: src/toolbox/tool-text.xml:72(title) src/toolbox/tool-smudge.xml:38(title)
+#: src/toolbox/tool-shear.xml:60(title) src/toolbox/tool-scale.xml:60(title)
+#: src/toolbox/tool-rotate.xml:47(title)
+#: src/toolbox/tool-posterize.xml:27(title)
+#: src/toolbox/tool-perspective.xml:52(title)
+#: src/toolbox/tool-perspective-clone.xml:40(title)
+#: src/toolbox/tool-pencil.xml:56(title) src/toolbox/tool-path.xml:48(title)
+#: src/toolbox/tool-paintbrush.xml:34(title)
+#: src/toolbox/tool-move.xml:42(phrase) src/toolbox/tool-measure.xml:80(title)
+#: src/toolbox/tool-levels.xml:49(title) src/toolbox/tool-ink.xml:40(title)
+#: src/toolbox/tool-hue-saturation.xml:31(title)
+#: src/toolbox/tool-heal.xml:51(title)
+#: src/toolbox/tool-foreground-select.xml:147(title)
+#: src/toolbox/tool-flip.xml:40(title)
+#: src/toolbox/tool-dodge-burn.xml:37(title)
+#: src/toolbox/tool-curves.xml:35(title) src/toolbox/tool-crop.xml:89(title)
+#: src/toolbox/tool-convolve.xml:76(title)
+#: src/toolbox/tool-color-picker.xml:50(title)
+#: src/toolbox/tool-color-balance.xml:32(title)
+#: src/toolbox/tool-brightness-contrast.xml:40(title)
+#: src/toolbox/tool-blend.xml:83(title) src/toolbox/tool-align.xml:44(title)
+#: src/toolbox/tool-airbrush.xml:38(title)
+#, fuzzy
+msgid "Activating the Tool"
 msgstr ""
-"#-#-#-#-#  tool-airbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-align.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-blend.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-brightness-contrast.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-color-balance.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-colorize.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Activar herramienta\n"
-"#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-curves.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Activar la herramienta\n"
-"#-#-#-#-#  tool-dodge-burn.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-hue-saturation.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n la herramienta\n"
-"#-#-#-#-#  tool-levels.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar herramienta\n"
-"#-#-#-#-#  tool-move.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar herramienta\n"
-"#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar\n"
-"#-#-#-#-#  tool-posterize.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar\n"
-"#-#-#-#-#  tool-shear.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar\n"
-"#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-threshold.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta"
-
-#: src/toolbox/tool-zoom.xml:67(para)
-msgid ""
-"You can get to the Magnify Tool from the image-menu through : "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu>M<accel>a</"
-"accel>gnify</guisubmenu></menuchoice>,"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:73(para) src/toolbox/tool-measure.xml:90(para)
-msgid "or by clicking the tool icon: <placeholder-1/> in Toolbox."
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:83(phrase) src/toolbox/tool-smudge.xml:78(phrase)
-#: src/toolbox/tool-select.xml:104(phrase)
-#: src/toolbox/tool-scale.xml:89(phrase)
-#: src/toolbox/tool-rotate.xml:85(phrase)
-#: src/toolbox/tool-perspective-clone.xml:81(phrase)
-#: src/toolbox/tool-pencil.xml:89(phrase) src/toolbox/tool-path.xml:86(phrase)
-#: src/toolbox/tool-paintbrush.xml:70(phrase)
-#: src/toolbox/tool-iscissors.xml:96(phrase)
-#: src/toolbox/tool-ink.xml:77(phrase) src/toolbox/tool-heal.xml:89(phrase)
-#: src/toolbox/tool-fuzzy-select.xml:96(phrase)
-#: src/toolbox/tool-foreground-select.xml:186(phrase)
-#: src/toolbox/tool-flip.xml:81(phrase)
-#: src/toolbox/tool-dodge-burn.xml:77(phrase)
-#: src/toolbox/tool-crop.xml:113(phrase)
-#: src/toolbox/tool-color-picker.xml:98(phrase)
-#: src/toolbox/tool-by-color-select.xml:75(phrase)
-#: src/toolbox/tool-bucket-fill.xml:103(phrase)
-#: src/toolbox/tool-blend.xml:120(phrase)
-#: src/toolbox/tool-align.xml:82(phrase)
-#: src/toolbox/tool-airbrush.xml:75(phrase)
+"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta"
+
+#: src/toolbox/tool-zoom.xml:50(para)
+#, fuzzy
+#| msgid ""
+#| "You can access this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
+#| "guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
+msgid ""
+"You can get to the Zoom Tool from the image-menu through : "
+"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Zoom</guisubmenu></"
+"menuchoice>,"
+msgstr ""
+"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
+"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
+
+#: src/toolbox/tool-zoom.xml:59(para)
+msgid ""
+"or by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-zoom-22.png\"/></guiicon> in Toolbox."
+msgstr ""
+"o pulsando sobre el icono de la herramienta: <guiicon><inlinegraphic fileref="
+"\"images/toolbox/stock-tool-zoom-22.png\"/></guiicon> en la caja de "
+"herramientas."
+
+#: src/toolbox/tool-zoom.xml:72(title) src/toolbox/tool-smudge.xml:73(title)
+#: src/toolbox/tool-select.xml:94(title) src/toolbox/tool-scale.xml:95(title)
+#: src/toolbox/tool-rotate.xml:82(title)
+#: src/toolbox/tool-perspective-clone.xml:69(title)
+#: src/toolbox/tool-pencil.xml:85(title) src/toolbox/tool-path.xml:79(title)
+#: src/toolbox/tool-paintbrush.xml:64(title)
+#: src/toolbox/tool-measure.xml:104(title) src/toolbox/tool-ink.xml:70(title)
+#: src/toolbox/tool-heal.xml:84(title)
+#: src/toolbox/tool-fuzzy-select.xml:112(phrase)
+#: src/toolbox/tool-foreground-select.xml:190(title)
+#: src/toolbox/tool-flip.xml:73(title)
+#: src/toolbox/tool-dodge-burn.xml:72(title)
+#: src/toolbox/tool-crop.xml:123(title)
+#: src/toolbox/tool-convolve.xml:109(title)
+#: src/toolbox/tool-color-picker.xml:89(title)
+#: src/toolbox/tool-by-color-select.xml:84(title)
+#: src/toolbox/tool-bucket-fill.xml:96(phrase)
+#: src/toolbox/tool-blend.xml:115(title) src/toolbox/tool-align.xml:76(title)
+#: src/toolbox/tool-airbrush.xml:69(title)
 #, fuzzy
 msgid "Key modifiers (Defaults)"
 msgstr ""
@@ -446,89 +592,58 @@ msgstr ""
 "#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Teclas modificadoras (por omisiÃ³n)"
 
-#: src/toolbox/tool-zoom.xml:88(keycap) src/toolbox/tool-zoom.xml:101(keycap)
-#: src/toolbox/tools-painting.xml:73(keycap)
-#: src/toolbox/tool-smudge.xml:97(keycap)
-#: src/toolbox/tool-select.xml:122(keycap)
-#: src/toolbox/tool-select.xml:200(keycap)
-#: src/toolbox/tool-scale.xml:94(keycap)
-#: src/toolbox/tool-rotate.xml:90(keycap)
-#: src/toolbox/tool-rect-select.xml:105(keycap)
-#: src/toolbox/tool-rect-select.xml:146(keycap)
-#: src/toolbox/tool-perspective-clone.xml:86(keycap)
-#: src/toolbox/tool-pencil.xml:94(keycap)
-#: src/toolbox/tool-paintbrush.xml:75(keycap)
-#: src/toolbox/tool-measure.xml:123(keycap)
-#: src/toolbox/tool-measure.xml:157(keycap)
-#: src/toolbox/tool-heal.xml:94(keycap)
-#: src/toolbox/tool-foreground-select.xml:191(keycap)
-#: src/toolbox/tool-flip.xml:95(keycap)
-#: src/toolbox/tool-eraser.xml:115(keycap)
-#: src/toolbox/tool-ellipse-select.xml:91(keycap)
-#: src/toolbox/tool-ellipse-select.xml:123(keycap)
-#: src/toolbox/tool-dodge-burn.xml:82(keycap)
-#: src/toolbox/tool-color-picker.xml:110(term)
-#: src/toolbox/tool-clone.xml:111(keycap)
-#: src/toolbox/tool-brush.xml:158(keycap)
-#: src/toolbox/tool-brush.xml:202(keycap)
-#: src/toolbox/tool-blend.xml:126(keycap)
-#: src/toolbox/tool-airbrush.xml:80(keycap)
-msgid "Ctrl"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:91(para)
+#: src/toolbox/tool-zoom.xml:77(para)
 msgid ""
 "Holding <keycap>Ctrl</keycap> when clicking on a point of your image will "
 "change the zoom direction from zooming in to zooming out."
 msgstr ""
+"Al mantener pulsado <keycap>Ctrl</keycap> y pulsar sobre un punto de la "
+"imagen, se cambiarÃ¡ el modo de ampliaciÃ³n de ampliar y reducir."
 
-#: src/toolbox/tool-zoom.xml:102(keycap)
+#: src/toolbox/tool-zoom.xml:88(keycap)
 msgid "Mouse wheel"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:107(para)
-msgid ""
-"Spinning the mouse wheel, without clicking, while pressing Ctrl, varies the "
-"zoom."
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:117(phrase)
-#: src/toolbox/tool-threshold.xml:72(phrase)
-#: src/toolbox/tool-text.xml:83(phrase)
-#: src/toolbox/tool-smudge.xml:111(phrase)
-#: src/toolbox/tool-shear.xml:100(phrase)
-#: src/toolbox/tool-select.xml:249(phrase)
-#: src/toolbox/tool-scale.xml:107(phrase)
-#: src/toolbox/tool-rotate.xml:103(phrase)
-#: src/toolbox/tool-posterize.xml:52(phrase)
-#: src/toolbox/tool-perspective.xml:96(phrase)
-#: src/toolbox/tool-perspective-clone.xml:112(phrase)
-#: src/toolbox/tool-pencil.xml:121(phrase)
-#: src/toolbox/tool-path.xml:121(phrase)
-#: src/toolbox/tool-paintbrush.xml:102(phrase)
-#: src/toolbox/tool-move.xml:93(phrase)
-#: src/toolbox/tool-measure.xml:177(phrase)
-#: src/toolbox/tool-levels.xml:72(phrase)
-#: src/toolbox/tool-iscissors.xml:157(phrase)
-#: src/toolbox/tool-ink.xml:83(phrase)
-#: src/toolbox/tool-hue-saturation.xml:63(phrase)
-#: src/toolbox/tool-heal.xml:132(phrase)
-#: src/toolbox/tool-fuzzy-select.xml:137(phrase)
-#: src/toolbox/tool-free-select.xml:115(phrase)
-#: src/toolbox/tool-foreground-select.xml:204(phrase)
-#: src/toolbox/tool-flip.xml:107(phrase)
-#: src/toolbox/tool-ellipse-select.xml:168(phrase)
-#: src/toolbox/tool-dodge-burn.xml:109(phrase)
-#: src/toolbox/tool-crop.xml:154(phrase)
-#: src/toolbox/tool-color-picker.xml:145(phrase)
-#: src/toolbox/tool-colorize.xml:71(phrase)
-#: src/toolbox/tool-color-balance.xml:69(phrase)
-#: src/toolbox/tool-by-color-select.xml:114(phrase)
-#: src/toolbox/tool-bucket-fill.xml:120(phrase)
-#: src/toolbox/tool-brightness-contrast.xml:74(phrase)
-#: src/toolbox/tool-blend.xml:139(phrase)
-#: src/toolbox/tool-align.xml:114(phrase)
-#: src/toolbox/tool-airbrush.xml:105(phrase)
+msgstr "Rueda del ratoÌ?n"
+
+#: src/toolbox/tool-zoom.xml:92(para)
+msgid "Spinning the mouse wheel, while pressing Ctrl, varies the zoom level."
+msgstr ""
+"Mover la rueda del ratÃ³n, mientras se presiona Ctrl, cambia el nivel de la "
+"ampliaciÃ³n."
+
+#: src/toolbox/tool-zoom.xml:102(title)
+#: src/toolbox/tool-threshold.xml:82(title)
+#: src/toolbox/tool-text.xml:104(title) src/toolbox/tool-smudge.xml:105(title)
+#: src/toolbox/tool-shear.xml:96(title) src/toolbox/tool-select.xml:246(title)
+#: src/toolbox/tool-rotate.xml:99(title)
+#: src/toolbox/tool-posterize.xml:50(title)
+#: src/toolbox/tool-perspective.xml:85(title)
+#: src/toolbox/tool-perspective-clone.xml:99(title)
+#: src/toolbox/tool-pencil.xml:116(title) src/toolbox/tool-path.xml:113(title)
+#: src/toolbox/tool-paintbrush.xml:95(title)
+#: src/toolbox/tool-move.xml:101(title)
+#: src/toolbox/tool-measure.xml:172(title)
+#: src/toolbox/tool-levels.xml:86(title)
+#: src/toolbox/tool-iscissors.xml:198(title)
+#: src/toolbox/tool-ink.xml:75(title)
+#: src/toolbox/tool-hue-saturation.xml:64(title)
+#: src/toolbox/tool-heal.xml:122(title)
+#: src/toolbox/tool-fuzzy-select.xml:155(phrase)
+#: src/toolbox/tool-free-select.xml:151(title)
+#: src/toolbox/tool-foreground-select.xml:207(title)
+#: src/toolbox/tool-flip.xml:89(title)
+#: src/toolbox/tool-ellipse-select.xml:181(title)
+#: src/toolbox/tool-dodge-burn.xml:103(title)
+#: src/toolbox/tool-desaturate.xml:74(title)
+#: src/toolbox/tool-convolve.xml:126(title)
+#: src/toolbox/tool-colorize.xml:69(title)
+#: src/toolbox/tool-color-picker.xml:127(title)
+#: src/toolbox/tool-color-balance.xml:67(title)
+#: src/toolbox/tool-clone.xml:145(title)
+#: src/toolbox/tool-by-color-select.xml:119(title)
+#: src/toolbox/tool-bucket-fill.xml:112(title)
+#: src/toolbox/tool-brightness-contrast.xml:75(title)
+#: src/toolbox/tool-blend.xml:132(title)
+#: src/toolbox/tool-airbrush.xml:98(title)
 #, fuzzy
 msgid "Options"
 msgstr ""
@@ -599,142 +714,50 @@ msgstr ""
 "#-#-#-#-#  tool-threshold.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Opciones"
 
-#: src/toolbox/tool-zoom.xml:121(phrase)
+#: src/toolbox/tool-zoom.xml:104(title)
 msgid "Zoom tool options"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:131(term) src/toolbox/tool-text.xml:97(term)
-#: src/toolbox/tool-text.xml:330(term) src/toolbox/tool-smudge.xml:125(term)
-#: src/toolbox/tool-shear.xml:114(term) src/toolbox/tool-scale.xml:45(phrase)
-#: src/toolbox/tool-scale.xml:121(term) src/toolbox/tool-rotate.xml:46(phrase)
-#: src/toolbox/tool-rotate.xml:117(term)
-#: src/toolbox/tool-perspective.xml:111(term)
-#: src/toolbox/tool-path.xml:136(term) src/toolbox/tool-move.xml:107(term)
-#: src/toolbox/tool-measure.xml:191(term) src/toolbox/tool-flip.xml:121(term)
-#: src/toolbox/tool-dodge-burn.xml:124(term)
-#: src/toolbox/tool-crop.xml:168(term)
-#: src/toolbox/tool-color-picker.xml:159(term)
-#: src/toolbox/tool-align.xml:128(term)
-msgid "Overview"
-msgstr "Generalidades"
+msgstr "Opciones de la herramienta de ampliacioÌ?n"
 
-#: src/toolbox/tool-zoom.xml:133(para)
-msgid ""
-"The available tool options for Magnify can be accessed by double clicking "
-"the Magnify tool icon. <placeholder-1/>"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:141(term)
-msgid "Allow Window Resizing"
-msgstr ""
+#: src/toolbox/tool-zoom.xml:114(term)
+msgid "Auto-resize window"
+msgstr "Auto-redimensionar ventana"
 
-#: src/toolbox/tool-zoom.xml:143(para)
+#: src/toolbox/tool-zoom.xml:116(para)
 msgid ""
 "This option will allow the canvas to be resized if the zoom level dictates "
 "it."
 msgstr ""
+"Esta opciÃ³n permite que la ventana se redimensione si el nivel de ampliaciÃ³n "
+"lo marca."
 
-#: src/toolbox/tool-zoom.xml:150(term)
+#: src/toolbox/tool-zoom.xml:123(term)
 msgid "Tool Toggle"
-msgstr ""
+msgstr "Conmutar herramienta"
 
-#: src/toolbox/tool-zoom.xml:152(para)
+#: src/toolbox/tool-zoom.xml:125(para)
 msgid ""
 "The two available tool toggles are used for changing the zoom direction "
 "between zooming in and zooming out."
 msgstr ""
+"Los dos conmutadores de herramientas disponibles se usan para cambiar el "
+"modo de ampliaciÃ³n entre ampliar y reducir."
 
-#: src/toolbox/tool-zoom.xml:162(phrase)
+#: src/toolbox/tool-zoom.xml:135(title)
 msgid "Zoom menu"
-msgstr ""
-
-#: src/toolbox/tool-zoom.xml:164(para)
-msgid ""
-"Using the Magnify tool is not the only way to zoom an image. The <link "
-"linkend=\"gimp-view-zoom\">Zoom menu</link> provides access to several "
-"functions for changing the image magnification level. For example, you can "
-"easily choose an exact magnification level from this menu."
-msgstr ""
+msgstr "MenuÌ? de ampliacioÌ?n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:27(None)
+#: src/toolbox/tool-zoom.xml:136(para)
 msgid ""
-"@@image: 'images/toolbox/transform-tools.png'; md5=THIS FILE DOESN'T EXIST"
+"Using the Zoom tool is not the only way to zoom an image. The <link linkend="
+"\"gimp-view-zoom\">Zoom menu</link> provides access to several functions for "
+"changing the image magnification level. For example, you can easily choose "
+"an exact magnification level from this menu."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:47(None)
-msgid ""
-"@@image: 'images/toolbox/transform-tools-common-options.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:73(None)
-msgid ""
-"@@image: 'images/tool-options/rotate-affect-layer.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:81(None)
-msgid ""
-"@@image: 'images/tool-options/rotate-affect-selection.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:89(None)
-msgid ""
-"@@image: 'images/tool-options/rotate-affect-path.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:148(None)
-msgid "@@image: 'images/toolbox/clip-orig.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:156(None)
-msgid "@@image: 'images/toolbox/clip-adjust.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:166(None)
-msgid "@@image: 'images/toolbox/clip-adjust2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:196(None)
-msgid "@@image: 'images/toolbox/clip-crop.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:219(None)
-msgid "@@image: 'images/toolbox/clip-3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:244(None)
-msgid "@@image: 'images/toolbox/clip-4.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-transform.xml:15(phrase)
-#: src/toolbox/tool-select.xml:26(phrase)
-#: src/toolbox/tool-select.xml:30(secondary)
-#: src/toolbox/tool-brush.xml:19(phrase)
+#: src/toolbox/tool-transform.xml:18(title)
+#: src/toolbox/tool-select.xml:17(title)
+#: src/toolbox/tool-select.xml:21(secondary)
+#: src/toolbox/tool-brush.xml:20(title)
 #, fuzzy
 msgid "Common Features"
 msgstr ""
@@ -745,16 +768,11 @@ msgstr ""
 "#-#-#-#-#  tool-transform.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "CaracterÃsticas comunes"
 
-#: src/toolbox/tool-transform.xml:19(secondary)
-#: src/toolbox/tools-transform.xml:9(phrase)
-msgid "Transform Tools"
-msgstr "Herramientas de transformaciÃ³n"
-
-#: src/toolbox/tool-transform.xml:23(phrase)
+#: src/toolbox/tool-transform.xml:26(title)
 msgid "An overview of the transform tools"
 msgstr "Generalidades de las herramientas de transformaciÃ³n"
 
-#: src/toolbox/tool-transform.xml:31(para)
+#: src/toolbox/tool-transform.xml:33(para)
 msgid ""
 "Inside the Transformation tool dialog, you will find eight tools to modify "
 "the presentation of the image or the presentation of an element of the "
@@ -767,12 +785,12 @@ msgstr ""
 "un diÃ¡logo de opciones y un diÃ¡logo de informaciÃ³n para configurar "
 "parÃ¡metros."
 
-#: src/toolbox/tool-transform.xml:39(phrase)
-#: src/toolbox/tool-rect-select.xml:259(phrase)
-#: src/toolbox/tool-eraser.xml:149(phrase)
-#: src/toolbox/tool-convolve.xml:113(phrase)
-#: src/toolbox/tool-clone.xml:134(phrase)
-#: src/toolbox/tool-brush.xml:221(phrase) src/toolbox/intro.xml:83(phrase)
+#: src/toolbox/tool-transform.xml:41(title)
+#: src/toolbox/tool-scale.xml:112(title)
+#: src/toolbox/tool-rect-select.xml:262(title)
+#: src/toolbox/tool-eraser.xml:171(title) src/toolbox/tool-crop.xml:146(title)
+#: src/toolbox/tool-brush.xml:224(title) src/toolbox/tool-align.xml:105(title)
+#: src/toolbox/intro.xml:87(title)
 #, fuzzy
 msgid "Tool Options"
 msgstr ""
@@ -791,7 +809,7 @@ msgstr ""
 "#-#-#-#-#  tool-transform.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Opciones de herramientas"
 
-#: src/toolbox/tool-transform.xml:43(phrase)
+#: src/toolbox/tool-transform.xml:43(title)
 msgid "Common options of transform tools"
 msgstr "Opciones comunes de las herramientas de transformaciÃ³n"
 
@@ -817,14 +835,22 @@ msgstr ""
 "trabajarÃ¡."
 
 #: src/toolbox/tool-transform.xml:64(para)
-msgid "Remind that the Transform option persists when you quit the tool."
+#, fuzzy
+#| msgid "Remind that the Transform option persists when you quit the tool."
+msgid "Remember that the Transform option persists when you quit the tool."
 msgstr ""
 "Recuerde que la opciÃ³n de afectar se mantiene cuando se cierra la "
 "herramienta."
 
 #: src/toolbox/tool-transform.xml:71(para)
+#, fuzzy
+#| msgid ""
+#| "When you activate the first button <placeholder-1/> the tool works on the "
+#| "active layer. If no selection exists in this layer, the whole layer will "
+#| "be transformed."
 msgid ""
-"When you activate the first button <placeholder-1/> the tool works on the "
+"When you activate the first button <guiicon><inlinegraphic fileref=\"images/"
+"tool-options/rotate-affect-layer.png\"/></guiicon> the tool works on the "
 "active layer. If no selection exists in this layer, the whole layer will be "
 "transformed."
 msgstr ""
@@ -832,67 +858,147 @@ msgstr ""
 "la capa activa. Si no hay selecciones en esta capa, se transformarÃ¡ toda la "
 "capa."
 
-#: src/toolbox/tool-transform.xml:79(para)
+#: src/toolbox/tool-transform.xml:82(para)
+#, fuzzy
+#| msgid ""
+#| "When you activate the second button <placeholder-1/> the tool works on "
+#| "the selection contour only (the whole layer contour if no selection)."
 msgid ""
-"When you activate the second button <placeholder-1/> the tool works on the "
+"When you activate the second button <guiicon><inlinegraphic fileref=\"images/"
+"tool-options/rotate-affect-selection.png\"/></guiicon> the tool works on the "
 "selection contour only (the whole layer contour if no selection)."
 msgstr ""
 "Cuando activa el segundo botÃ³n <placeholder-1/> La herramienta solo trabaja "
 "sobre la selecciÃ³n, si no hay selecciÃ³n trabaja sobre toda la imagen."
 
-#: src/toolbox/tool-transform.xml:87(para)
+#: src/toolbox/tool-transform.xml:93(para)
+#, fuzzy
+#| msgid ""
+#| "When you activate the third button, <placeholder-1/> the tool works on "
+#| "the path only."
 msgid ""
-"When you activate the third button, <placeholder-1/> the tool works on the "
-"path only."
+"When you activate the third button, <guiicon><inlinegraphic fileref=\"images/"
+"tool-options/rotate-affect-path.png\"/></guiicon> the tool works on the path "
+"only."
 msgstr ""
 "Cuando activa el tercer botÃ³n, <placeholder-1/> La herramiena solo trabaja "
 "sobre la ruta."
 
-#: src/toolbox/tool-transform.xml:97(term)
+#: src/toolbox/tool-transform.xml:106(term)
 msgid "Direction"
 msgstr "DirecciÃ³n de la transformaciÃ³n"
 
-#: src/toolbox/tool-transform.xml:99(para)
+#: src/toolbox/tool-transform.xml:108(para)
 msgid ""
-"<quote>Direction</quote> sets which way or direction a layer is transformed. "
-"The Traditional mode will transform the image or layer as one might expect. "
-"You just use the handles to do the transformation that want to see happen on "
-"the image or layer on the grid. When you then execute the transformation the "
-"image or layer is transformed to the shape and position you put the grid "
-"into."
+"<guilabel>Direction</guilabel> sets which way or direction a layer is "
+"transformed:"
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:112(para)
+#, fuzzy
+#| msgid ""
+#| "<quote>Direction</quote> sets which way or direction a layer is "
+#| "transformed. The Traditional mode will transform the image or layer as "
+#| "one might expect. You just use the handles to do the transformation that "
+#| "want to see happen on the image or layer on the grid. When you then "
+#| "execute the transformation the image or layer is transformed to the shape "
+#| "and position you put the grid into."
+msgid ""
+"The <quote>Normal (Forward)</quote> mode will transform the image or layer "
+"as one might expect. You just use the handles to perform the transformation "
+"you want. If you use a grid (see below), the image or layer is transformed "
+"according to the shape and position you put the grid into."
 msgstr "Mirar <xref linkend=\"gimp-tool-rotate\"/>."
 
-#: src/toolbox/tool-transform.xml:107(para)
+#: src/toolbox/tool-transform.xml:119(para)
 msgid ""
-"Corrective Rotation is primarily used to repair digital images that have "
-"some geometric errors. To do so, you just have to align the grid to show the "
-"same error as the image or layer. If you then execute the transformation the "
-"grid and the image or layer wit it are transformed <quote>backwards</quote> "
-"until the grid is again in the rectangular and straight shape it was when "
-"you started."
+"<quote>Corrective (Backward)</quote> inverts the direction. Primarily used "
+"with the Rotation tool to repair digital images that have some geometric "
+"errors (a horizon not horizontal, a wall not vertical...). See <xref linkend="
+"\"gimp-tool-rotate\"/>."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:118(term)
+#: src/toolbox/tool-transform.xml:128(term)
 msgid "Interpolation"
 msgstr "InterpolacÃ³n"
 
-#: src/toolbox/tool-transform.xml:120(para)
+#: src/toolbox/tool-transform.xml:130(para)
 msgid ""
-"The <guilabel>Interpolation</guilabel> drop-down list lets you choose the "
-"quality of the transformation. For more information about the different "
-"methods that can be employed, see the glossary entry <link linkend="
-"\"glossary-interpolation\">Interpolation</link>."
+"This drop-down list lets you choose the method and thus the quality of the "
+"transformation:"
+msgstr ""
+"Esta lista desplegable le permite seleccionar el mÃ©todo y, por lo tanto, la "
+"calidad de la transformaciÃ³n:"
+
+#: src/toolbox/tool-transform.xml:136(term)
+#: src/toolbox/tool-clone.xml:265(term) src/toolbox/tool-brush.xml:563(para)
+#, fuzzy
+msgid "None"
 msgstr ""
-"La lista desplegable de <guilabel>InterpolaciÃ³n</guilabel> permite elegir la "
-"calidad de la transformaciÃ³n. Para mÃ¡s informaciÃ³n sobre los diferentes "
-"mÃ©todos que se pueden emplear, mirar la entrada del glosario <link linkend="
-"\"glossary-interpolation\">InterpolaciÃ³n</link>."
+"#-#-#-#-#  tool-brush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Ninguno\n"
+"#-#-#-#-#  tool-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"No alineado"
 
-#: src/toolbox/tool-transform.xml:129(term)
+#: src/toolbox/tool-transform.xml:138(para)
+msgid ""
+"The color of each pixel is copied from its closest neighboring pixel in the "
+"original image. This often results in aliasing (the <quote>stair-step</"
+"quote> effect) and a coarse image, but it is the fastest method. Sometimes "
+"this method is called <quote>Nearest Neighbor</quote>."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:148(term)
+#: src/toolbox/tool-blend.xml:210(para) src/toolbox/tool-blend.xml:232(term)
+msgid "Linear"
+msgstr "Lineal"
+
+#: src/toolbox/tool-transform.xml:150(para)
+msgid ""
+"The color of each pixel is computed as the average color of the four closest "
+"pixels in the original image. This gives a satisfactory result for most "
+"images and is a good compromise between speed and quality. Sometimes this "
+"method is called <quote>Bilinear</quote>."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:160(term)
+msgid "Cubic"
+msgstr "CuÌ?bica"
+
+#: src/toolbox/tool-transform.xml:162(para)
+msgid ""
+"The color of each pixel is computed as the average color of the eight "
+"closest pixels in the original image. This usually gives the best result, "
+"but it naturally takes more time. Sometimes this method is called "
+"<quote>Bicubic</quote>."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:171(term)
+msgid "Sinc (Lanczos3)"
+msgstr "Sinc (Lanczos3)"
+
+#: src/toolbox/tool-transform.xml:173(para)
+msgid ""
+"The Lanczos3 method uses the Sinc mathematical function and performs a high "
+"quality interpolation."
+msgstr ""
+"El mÃ©todo Lanczos3 usa la funciÃ³n matemÃ¡tica Sinc y realiza una "
+"interpolaciÃ³n de alta calidad."
+
+#: src/toolbox/tool-transform.xml:180(para)
+msgid ""
+"You can set the default interpolation method in the <link linkend=\"gimp-"
+"prefs-tool-options\">Tools Options Preferences</link> dialog."
+msgstr ""
+"Puede seleccionar el mÃ©todo predeterminado de interpolaciÃ³n en el diÃ¡logo "
+"<link linkend=\"gimp-prefs-tool-options\">Preferencias de las opciones de "
+"herramientas</link>."
+
+#: src/toolbox/tool-transform.xml:188(term)
 msgid "Clipping"
 msgstr "Resultado del recorte"
 
-#: src/toolbox/tool-transform.xml:131(para)
+#: src/toolbox/tool-transform.xml:190(para)
 msgid ""
 "After transformation, the image can be bigger. This option will clip the "
 "transformed image to the original image size."
@@ -900,114 +1006,132 @@ msgstr ""
 "DespuÃ©s de la transformaciÃ³n, la imagen puede ser mÃ¡s grande. Esta opciÃ³n la "
 "recortarÃ¡ a la imagen original."
 
-#: src/toolbox/tool-transform.xml:135(para)
+#: src/toolbox/tool-transform.xml:194(para)
 msgid "You can choose between several ways to clip:"
-msgstr ""
+msgstr "Puede seleccionar entre varias maneras de recortar: "
 
-#: src/toolbox/tool-transform.xml:139(phrase)
+#: src/toolbox/tool-transform.xml:197(term)
 msgid "Adjust"
-msgstr ""
+msgstr "Ajustar"
 
-#: src/toolbox/tool-transform.xml:144(phrase)
+#: src/toolbox/tool-transform.xml:200(title)
 msgid "Original image for examples"
-msgstr ""
+msgstr "Imagen original para los ejemplos"
 
-#: src/toolbox/tool-transform.xml:151(para)
-#: src/toolbox/tool-levels.xml:405(para)
-#: src/toolbox/tool-bucket-fill.xml:324(para)
-#: src/toolbox/tool-bucket-fill.xml:378(para)
+#: src/toolbox/tool-transform.xml:207(para)
+#: src/toolbox/tool-levels.xml:265(para) src/toolbox/tool-levels.xml:545(para)
+#: src/toolbox/tool-desaturate.xml:139(para)
+#: src/toolbox/tool-bucket-fill.xml:314(para)
+#: src/toolbox/tool-bucket-fill.xml:363(para)
 msgid "Original image"
-msgstr ""
+msgstr "Imagen original"
 
-#: src/toolbox/tool-transform.xml:159(para)
+#: src/toolbox/tool-transform.xml:216(para)
 msgid "Rotation applied with <quote>Adjust</quote>"
-msgstr ""
+msgstr "La rotaciÃ³n aplicada con <quote>Ajustar</quote>"
 
-#: src/toolbox/tool-transform.xml:169(para)
+#: src/toolbox/tool-transform.xml:227(para)
 msgid ""
 "Rotation applied with <quote>Adjust</quote> and canvas enlarged to layer size"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:176(para)
+#: src/toolbox/tool-transform.xml:234(para)
 msgid ""
 "With Adjust: the layer is enlarged to contain all the rotated layer. The new "
 "layer border is visible; the whole layer becomes visible by using the "
-"<menuchoice><guimenu>Image</guimenu><guimenuitem>Adjust Canvas to Layers</"
-"guimenuitem></menuchoice> command (on the right)."
+"<menuchoice><guimenu>Image</guimenu><guimenuitem>Fit Canvas to Layers</"
+"guimenuitem></menuchoice> command."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:187(phrase)
-#: src/toolbox/tool-transform.xml:199(para)
+#: src/toolbox/tool-transform.xml:247(term)
+#: src/toolbox/tool-transform.xml:257(para)
 msgid "Clip"
-msgstr ""
+msgstr "Recortar"
 
-#: src/toolbox/tool-transform.xml:192(phrase)
+#: src/toolbox/tool-transform.xml:250(title)
 msgid "Example for Clip"
-msgstr ""
+msgstr "Ejemplo de recortar"
 
-#: src/toolbox/tool-transform.xml:203(para)
+#: src/toolbox/tool-transform.xml:261(para)
 msgid "With Clip: all what exceeds image limits is deleted."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:210(phrase)
-#: src/toolbox/tool-transform.xml:222(para)
+#: src/toolbox/tool-transform.xml:267(term)
 msgid "Crop to result"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:215(phrase)
+#: src/toolbox/tool-transform.xml:270(title)
 msgid "Example for Crop to result"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:226(para)
-msgid ""
-"If this option is selected, any border with no content that might occur "
-"after applying a transform operation to a layer will be removed."
+#: src/toolbox/tool-transform.xml:277(para)
+msgid "Rotation 45Â° with Crop to result"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:235(phrase)
-#: src/toolbox/tool-transform.xml:247(para)
-msgid "Crop with aspect"
+#: src/toolbox/tool-transform.xml:286(para)
+msgid "The crop limit is marked with red. No transparent area is included."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:293(para)
+msgid ""
+"If this option is selected, the image is cropped so that the transparent "
+"area, created by the transform operation in corners, will not be included in "
+"the resulting image."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:240(phrase)
-msgid "Example for Crop with aspect"
+#: src/toolbox/tool-transform.xml:301(term)
+msgid "Crop with aspect"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:251(para)
+#. <figure>
+#.                   <title>Example for Crop with aspect</title>
+#.                   <mediaobject>
+#.                     <imageobject>
+#.                       <imagedata fileref="images/toolbox/clip-4.png" format="PNG"/>
+#.                     </imageobject>
+#.                     <caption>
+#.                       <para>Crop with aspect</para>
+#.                     </caption>
+#.                   </mediaobject>
+#.                 </figure>
+#. Commented until somebody finds a valid example
+#: src/toolbox/tool-transform.xml:315(para)
 msgid ""
 "This option works like the one described before, but makes sure, that the "
 "aspect ratio is maintained."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:261(term)
-#: src/toolbox/tool-transform.xml:264(primary)
-#: src/toolbox/tool-threshold.xml:101(term)
-#: src/toolbox/tool-posterize.xml:78(term)
-#: src/toolbox/tool-levels.xml:340(term)
-#: src/toolbox/tool-hue-saturation.xml:186(term)
-#: src/toolbox/tool-curves.xml:258(term)
-#: src/toolbox/tool-colorize.xml:110(term)
-#: src/toolbox/tool-color-balance.xml:125(term)
-#: src/toolbox/tool-brightness-contrast.xml:106(term)
+#: src/toolbox/tool-transform.xml:325(term)
+#: src/toolbox/tool-transform.xml:328(primary)
+#: src/toolbox/tool-threshold.xml:153(term)
+#: src/toolbox/tool-posterize.xml:73(term)
+#: src/toolbox/tool-levels.xml:484(term)
+#: src/toolbox/tool-hue-saturation.xml:235(term)
+#: src/toolbox/tool-curves.xml:288(term)
+#: src/toolbox/tool-colorize.xml:147(term)
+#: src/toolbox/tool-color-balance.xml:162(term)
+#: src/toolbox/tool-brightness-contrast.xml:156(term)
 msgid "Preview"
 msgstr "Vista previa"
 
-#: src/toolbox/tool-transform.xml:265(secondary)
-msgid "Option of the transformation tools"
-msgstr ""
+#: src/toolbox/tool-transform.xml:329(secondary)
+#, fuzzy
+#| msgid "Transform Tools"
+msgid "Transformation tools"
+msgstr "Herramientas de transformaciÃ³n"
 
-#: src/toolbox/tool-transform.xml:267(para)
+#: src/toolbox/tool-transform.xml:332(para)
 msgid ""
 "<acronym>GIMP</acronym> lets you select among four Preview possibilities:"
 msgstr ""
 "El <acronym>GIMP</acronym> le deja seleccionar hasta cuatro posibilidades de "
 "vista previa:"
 
-#: src/toolbox/tool-transform.xml:272(term)
+#: src/toolbox/tool-transform.xml:337(term)
 msgid "Outline"
 msgstr "Esquema"
 
-#: src/toolbox/tool-transform.xml:274(para)
+#: src/toolbox/tool-transform.xml:339(para)
 msgid ""
 "Puts a frame to mark the image outline, with a handle on each corner. "
 "Movements will affect this frame only on the Preview, but the result of the "
@@ -1020,11 +1144,11 @@ msgstr ""
 "los lÃmites de la selecciÃ³n, en concordancia con el modo seleccionado en "
 "afectar."
 
-#: src/toolbox/tool-transform.xml:284(term)
+#: src/toolbox/tool-transform.xml:349(term)
 msgid "Grid"
 msgstr "Rejilla"
 
-#: src/toolbox/tool-transform.xml:286(para)
+#: src/toolbox/tool-transform.xml:351(para)
 msgid ""
 "Puts a grid on the image, with four handles. Movements will affect this grid "
 "only on the Preview, but the result of the transformation will concern "
@@ -1036,12 +1160,12 @@ msgstr ""
 "transformaciÃ³n afectarÃ¡ tanto al contenido como a los lÃmites de la "
 "selecciÃ³n, en concordancia con el modo seleccionado en afectar."
 
-#: src/toolbox/tool-transform.xml:296(term)
-#: src/toolbox/tool-crop.xml:36(primary) src/toolbox/tool-clone.xml:170(term)
+#: src/toolbox/tool-transform.xml:361(term)
+#: src/toolbox/tool-crop.xml:28(primary) src/toolbox/tool-clone.xml:191(term)
 msgid "Image"
 msgstr "Imagen"
 
-#: src/toolbox/tool-transform.xml:298(para)
+#: src/toolbox/tool-transform.xml:363(para)
 msgid ""
 "Here, the preview is a copy of the image superimposed on the image, with an "
 "outline. Movements affect this copy and the underlying image appears."
@@ -1050,24 +1174,15 @@ msgstr ""
 "un contorno. Los movimientos afectan a esta copia y aparece la capa "
 "subyacente."
 
-#: src/toolbox/tool-transform.xml:306(term)
+#: src/toolbox/tool-transform.xml:371(term)
 msgid "Grid+Image"
 msgstr "Rejilla+imagen"
 
-#: src/toolbox/tool-transform.xml:308(para)
+#: src/toolbox/tool-transform.xml:373(para)
 msgid "Both turn at the same time."
 msgstr "ambos a la vez."
 
-#: src/toolbox/tool-transform.xml:312(para)
-msgid ""
-"Preview is only for greater convenience. Whatever your choice, result will "
-"be the same when you validate the transformation."
-msgstr ""
-"La vista previa estÃ¡ para mayor comodidad. Independientemente de su "
-"elecciÃ³n, el resultado serÃ¡ el mismo que si pulsa sobre el botÃ³n "
-"<emphasis>Rotar</emphasis> en el diÃ¡logo de informaciÃ³n de rotar."
-
-#: src/toolbox/tool-transform.xml:316(para)
+#: src/toolbox/tool-transform.xml:377(para)
 msgid ""
 "Options with grid activate a drop-list with two options: <guilabel>Number of "
 "Grid Lines</guilabel> will allow control over the total number of displayed "
@@ -1082,87 +1197,33 @@ msgstr ""
 "rejilla</guilabel> permiten controlar la distancia entre las lineas. Use el "
 "deslizador para determinar la distancia."
 
-#: src/toolbox/tool-transform.xml:326(para)
-msgid ""
-"When rotating a path, Preview options are not valid: only Outline is active."
-msgstr ""
-"Cuando rotamos una ruta, las opciones de la vista previa no son vÃ¡lidas: "
-"solo estÃ¡ activa esquema."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:65(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-threshold-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:80(None)
-msgid ""
-"@@image: 'images/toolbox/tools-threshold.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:146(None)
-msgid "@@image: 'images/using/threshold-orig.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:151(None)
-msgid ""
-"@@image: 'images/using/threshold-decomp.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:156(None)
-msgid ""
-"@@image: 'images/using/threshold-layers.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:181(None)
-msgid "@@image: 'images/using/threshold-fit.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:218(None)
-msgid "@@image: 'images/using/threshold-mask.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
+#: src/toolbox/tool-transform.xml:389(term)
+#: src/toolbox/tool-eraser.xml:194(term) src/toolbox/tool-brush.xml:267(term)
+#: src/toolbox/tool-brush.xml:274(primary)
+#: src/toolbox/tool-brush.xml:368(term)
+msgid "Opacity"
+msgstr "Opacidad"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:236(None)
-msgid ""
-"@@image: 'images/using/threshold-result.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-transform.xml:391(para)
+msgid "This slider lets you set the preview opacity."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-threshold.xml:241(None)
+#: src/toolbox/tool-transform.xml:398(para)
 msgid ""
-"@@image: 'images/using/threshold-selection.png'; md5=THIS FILE DOESN'T EXIST"
+"When rotating a path, Preview options are not valid: only Outline is active."
 msgstr ""
+"Cuando rotamos una ruta, las opciones de la vista previa no son vÃ¡lidas: "
+"solo estÃ¡ activa esquema."
 
-#: src/toolbox/tool-threshold.xml:19(date) src/toolbox/tool-text.xml:17(date)
-msgid "2008-01-05"
-msgstr "2007-04-15"
-
-#: src/toolbox/tool-threshold.xml:25(phrase)
-#: src/toolbox/tool-threshold.xml:29(secondary)
-#: src/toolbox/tool-threshold.xml:32(primary)
-#: src/toolbox/tool-fuzzy-select.xml:199(term)
-#: src/toolbox/tool-bucket-fill.xml:251(term)
+#: src/toolbox/tool-threshold.xml:16(title)
+#: src/toolbox/tool-threshold.xml:19(secondary)
+#: src/toolbox/tool-threshold.xml:22(primary)
+#: src/toolbox/tool-fuzzy-select.xml:220(term)
+#: src/toolbox/tool-bucket-fill.xml:241(term)
 msgid "Threshold"
 msgstr "Umbral"
 
-#: src/toolbox/tool-threshold.xml:34(para)
+#: src/toolbox/tool-threshold.xml:24(para)
 msgid ""
 "The Threshold tool transforms the current layer or the selection into a "
 "black and white image, where white pixels represent the pixels of the image "
@@ -1174,7 +1235,7 @@ msgstr ""
 "cuyo valor estÃ¡ en el rango del umbral, y los negros el valor que estÃ¡ fuera "
 "de este rango."
 
-#: src/toolbox/tool-threshold.xml:40(para)
+#: src/toolbox/tool-threshold.xml:30(para)
 msgid ""
 "You can use it to enhance a black and white image (a scanned text for "
 "example) or to create selection masks."
@@ -1182,7 +1243,7 @@ msgstr ""
 "Se puede utilizar para realzar una imagen blanca y negra ( por ejemplo, un "
 "texto escaneado) o para crear mÃ¡scaras de selecciÃ³n."
 
-#: src/toolbox/tool-threshold.xml:45(para)
+#: src/toolbox/tool-threshold.xml:35(para)
 msgid ""
 "As this tool creates a black and white image, the anti-aliasing of the "
 "original image disappears. If this poses a problem, rather use the <link "
@@ -1192,16 +1253,27 @@ msgstr ""
 "imagen original desaparece. Si esto es un problema, use la herramienta <link "
 "linkend=\"gimp-tool-levels\">Niveles</link>."
 
-#: src/toolbox/tool-threshold.xml:55(para)
+#: src/toolbox/tool-threshold.xml:45(para)
+#: src/toolbox/tool-perspective-clone.xml:41(para)
+#: src/toolbox/tool-heal.xml:52(para) src/toolbox/tool-dodge-burn.xml:38(para)
+#: src/toolbox/tool-convolve.xml:77(para) src/toolbox/tool-blend.xml:84(para)
+msgid "There are different possibilities to activate the tool:"
+msgstr ""
+
+#: src/toolbox/tool-threshold.xml:49(para)
+#, fuzzy
+#| msgid ""
+#| "You can access this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
+#| "guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
 msgid ""
 "You can access this tool from the image menu through "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</"
-"accel>olor Tools</guisubmenu><guimenuitem><accel>T</accel>hreshold,</"
-"guimenuitem></menuchoice>,"
+"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</"
+"guisubmenu><guimenuitem>Threshold,</guimenuitem></menuchoice>,"
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
-"guisubmenu><guimenuitem><accel>U</accel>mbral</guimenuitem></menuchoice>"
+"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
+"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
 
 #: src/toolbox/tool-threshold.xml:59(para)
 msgid ""
@@ -1212,22 +1284,98 @@ msgstr ""
 "herramientas, si ya la ha instalado. Para esto, ir a <link linkend=\"gimp-"
 "tools-dialog\">DiÃ¡logo de herramientas</link>."
 
-#: src/toolbox/tool-threshold.xml:63(para)
+#: src/toolbox/tool-threshold.xml:68(para)
+#, fuzzy
+#| msgid ""
+#| "or by clicking the <placeholder-1/> icon in Toolbox if this tool has been "
+#| "installed there. For this, go to <link linkend=\"gimp-tools-dialog"
+#| "\">Tools Dialog</link>."
 msgid ""
-"or by clicking on the <placeholder-1/> icon in Toolbox if this tool has been "
+"or by clicking on the <guiicon><inlinegraphic fileref=\"images/toolbox/stock-"
+"tool-threshold-22.png\"/></guiicon> icon in Toolbox if this tool has been "
 "installed in it. You can do that through the <link linkend=\"gimp-tools-"
 "dialog\">Tool dialog</link>."
 msgstr ""
+"Pulsando sobre el icono de la herramienta <placeholder-1/> en la caja de "
+"herramientas, si ya estÃ¡ instalado allÃ. Para esto, ir a <link linkend="
+"\"gimp-tools-dialog\">DiÃ¡logo de herramientas</link>."
 
-#: src/toolbox/tool-threshold.xml:76(phrase)
+#: src/toolbox/tool-threshold.xml:84(title)
 msgid "Threshold tool options"
 msgstr "Opciones de la herramienta umbral"
 
-#: src/toolbox/tool-threshold.xml:86(term)
+#: src/toolbox/tool-threshold.xml:94(term)
+#: src/toolbox/tool-levels.xml:97(term)
+#: src/toolbox/tool-hue-saturation.xml:75(term)
+#: src/toolbox/tool-curves.xml:78(term) src/toolbox/tool-colorize.xml:80(term)
+#: src/toolbox/tool-color-balance.xml:78(term)
+#: src/toolbox/tool-brightness-contrast.xml:86(term)
+#, fuzzy
+#| msgid "Pressure"
+msgid "Presets"
+msgstr "PresiÃ³n"
+
+#: src/toolbox/tool-threshold.xml:96(para)
+#: src/toolbox/tool-levels.xml:99(para)
+#: src/toolbox/tool-hue-saturation.xml:77(para)
+#: src/toolbox/tool-curves.xml:80(para) src/toolbox/tool-colorize.xml:82(para)
+#: src/toolbox/tool-color-balance.xml:80(para)
+#: src/toolbox/tool-brightness-contrast.xml:88(para)
+msgid ""
+"You can save the color settings of your image by clicking the <guibutton>Add "
+"settings to favourites</guibutton> button <guiicon><inlinegraphic fileref="
+"\"images/toolbox/save-color-settings.png\"/></guiicon>"
+msgstr ""
+
+#: src/toolbox/tool-threshold.xml:104(para)
+#: src/toolbox/tool-levels.xml:106(para)
+#: src/toolbox/tool-hue-saturation.xml:84(para)
+#: src/toolbox/tool-curves.xml:87(para) src/toolbox/tool-colorize.xml:89(para)
+#: src/toolbox/tool-color-balance.xml:87(para)
+#: src/toolbox/tool-brightness-contrast.xml:95(para)
+msgid ""
+"The <guiicon><inlinegraphic fileref=\"images/toolbox/presets-menu-icon.png\"/"
+"></guiicon> button opens a menu:"
+msgstr ""
+
+#: src/toolbox/tool-threshold.xml:113(title)
+#: src/toolbox/tool-levels.xml:114(title)
+#: src/toolbox/tool-hue-saturation.xml:92(title)
+#: src/toolbox/tool-curves.xml:95(title)
+#: src/toolbox/tool-colorize.xml:97(title)
+#: src/toolbox/tool-color-balance.xml:95(title)
+#: src/toolbox/tool-brightness-contrast.xml:103(title)
+msgid "Preset Menu"
+msgstr ""
+
+#: src/toolbox/tool-threshold.xml:121(para)
+#: src/toolbox/tool-levels.xml:122(para)
+#: src/toolbox/tool-hue-saturation.xml:100(para)
+#: src/toolbox/tool-curves.xml:103(para)
+#: src/toolbox/tool-colorize.xml:105(para)
+#: src/toolbox/tool-color-balance.xml:103(para)
+#: src/toolbox/tool-brightness-contrast.xml:111(para)
+msgid ""
+"which lets you <guilabel>Import Settings from File</guilabel> or "
+"<guilabel>Export Settings to File</guilabel>, and gives you access to the "
+"Manage Save Settings dialog:"
+msgstr ""
+
+#: src/toolbox/tool-threshold.xml:127(title)
+#: src/toolbox/tool-levels.xml:128(title)
+#: src/toolbox/tool-hue-saturation.xml:106(title)
+#: src/toolbox/tool-curves.xml:109(title)
+#: src/toolbox/tool-colorize.xml:111(title)
+#: src/toolbox/tool-color-balance.xml:109(title)
+#: src/toolbox/tool-brightness-contrast.xml:117(title)
+msgid "Manage saved Settings Dialog"
+msgstr ""
+
+#: src/toolbox/tool-threshold.xml:138(term)
 msgid "Threshold range"
 msgstr "Rango de umbral"
 
-#: src/toolbox/tool-threshold.xml:88(para)
+#: src/toolbox/tool-threshold.xml:140(para)
 msgid ""
 "The Threshold tool provides a visual graph, a histogram, of the intensity "
 "value of the active layer or selection. You can set the threshold range "
@@ -1245,7 +1393,7 @@ msgstr ""
 "otros serÃ¡n negros. Ajuste el rango para obtener la selecciÃ³n que quiere en "
 "blanco sobre negro."
 
-#: src/toolbox/tool-threshold.xml:103(para)
+#: src/toolbox/tool-threshold.xml:155(para)
 msgid ""
 "The Preview toggle allows dynamic updating of the active layer or selection "
 "while changes are made to the intensity level."
@@ -1253,11 +1401,11 @@ msgstr ""
 "La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
 "Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
 
-#: src/toolbox/tool-threshold.xml:113(phrase)
+#: src/toolbox/tool-threshold.xml:165(title)
 msgid "Using Threshold and Quick Mask to create a selection mask"
 msgstr "Usando umbral y mÃ¡scara rÃ¡pida para crear un mÃ¡scara de selecciÃ³n"
 
-#: src/toolbox/tool-threshold.xml:117(para)
+#: src/toolbox/tool-threshold.xml:166(para)
 msgid ""
 "That's not always the case, but an element you want to extract from an image "
 "can stand out well against the background. In this case, you can use the "
@@ -1271,7 +1419,7 @@ msgstr ""
 "pero ahora usando la <link linkend=\"gimp-image-window-qmask-button"
 "\">MÃ¡scara rÃ¡pida</link> es mÃ¡s fÃ¡cil."
 
-#: src/toolbox/tool-threshold.xml:127(para)
+#: src/toolbox/tool-threshold.xml:176(para)
 msgid ""
 "First start decomposing you image into its RGB and HSV components by using "
 "the <link linkend=\"plug-in-decompose-registered\">Decompose</link> filter. "
@@ -1291,11 +1439,11 @@ msgstr ""
 "para ver la capa deseada de la imagen descompuesta. Seleccione la capa que "
 "aisla mejor el elemento a extraer."
 
-#: src/toolbox/tool-threshold.xml:140(phrase)
+#: src/toolbox/tool-threshold.xml:188(title)
 msgid "The original image, the decompose image and its Layer Dialog"
 msgstr "La imagen original, la imagen descompuesta y su diÃ¡logo de Capas"
 
-#: src/toolbox/tool-threshold.xml:162(para)
+#: src/toolbox/tool-threshold.xml:209(para)
 msgid ""
 "Call the Threshold tool from the decompose image. By moving the black "
 "cursor, fit threshold to isolate the best the element you want to extract. "
@@ -1307,7 +1455,7 @@ msgstr ""
 "serÃ¡ perfecto: realzaremos el resultado con la mÃ¡scara de selecciÃ³n que "
 "crearemos."
 
-#: src/toolbox/tool-threshold.xml:169(para)
+#: src/toolbox/tool-threshold.xml:216(para)
 msgid ""
 "Make sure you have selected the right layer when you call the Threshold "
 "tool: when it is opened, you can't change to another layer."
@@ -1315,11 +1463,11 @@ msgstr ""
 "Seleccione la capa correcta antes de activar la herramienta umbral: cuando "
 "esta estÃ© activada, no se puede cambiar a otra capa."
 
-#: src/toolbox/tool-threshold.xml:177(phrase)
+#: src/toolbox/tool-threshold.xml:223(title)
 msgid "The selected layer after threshold fit"
 msgstr "La capa seleccionada despuÃ©s de llenar el umbral"
 
-#: src/toolbox/tool-threshold.xml:184(para)
+#: src/toolbox/tool-threshold.xml:229(para)
 msgid ""
 "We got the best outline for our flower. There are several red objects which "
 "we must remove."
@@ -1327,7 +1475,7 @@ msgstr ""
 "Obtenemos el mejor contorno para nuestra flor. Hay muchos objetos rojos que "
 "debemos quitar."
 
-#: src/toolbox/tool-threshold.xml:193(para)
+#: src/toolbox/tool-threshold.xml:238(para)
 msgid ""
 "Make sure the image displaying the selected layer is active and copy it to "
 "the clipboard with <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></"
@@ -1337,7 +1485,7 @@ msgstr ""
 "copiela en el portapapeles con <keycombo><keycap>Ctrl</keycap><keycap>C</"
 "keycap></keycombo>."
 
-#: src/toolbox/tool-threshold.xml:200(para)
+#: src/toolbox/tool-threshold.xml:245(para)
 msgid ""
 "Now, make the original image active. Click on the <guibutton>Quick Mask</"
 "guibutton> button at the bottom-left corner of the image window: the image "
@@ -1357,11 +1505,11 @@ msgstr ""
 "Vuelva a la imagen original. Pulse <keycombo><keycap>Ctrl</keycap><keycap>V</"
 "keycap></keycombo> para pegar la capa copiada, previamente."
 
-#: src/toolbox/tool-threshold.xml:214(phrase)
+#: src/toolbox/tool-threshold.xml:258(title)
 msgid "The mask"
 msgstr "La mÃ¡scara"
 
-#: src/toolbox/tool-threshold.xml:224(para)
+#: src/toolbox/tool-threshold.xml:268(para)
 msgid ""
 "VoilÃ . Your selection mask is ready: you can improve the selection as "
 "usually. When the selection is ready, disable the Quick mask by clicking "
@@ -1372,11 +1520,11 @@ msgstr ""
 "rÃ¡pida, presionando otra vez su botÃ³n: verÃ¡ las hormigas marchantes marcando "
 "la selecciÃ³n."
 
-#: src/toolbox/tool-threshold.xml:232(phrase)
+#: src/toolbox/tool-threshold.xml:275(title)
 msgid "The result"
 msgstr "El resultado"
 
-#: src/toolbox/tool-threshold.xml:245(para)
+#: src/toolbox/tool-threshold.xml:287(para)
 msgid ""
 "We used the Zoom to work at a pixel level, the Lasso to remove large "
 "unwanted areas, the pencil (to get hard limits), black paint to remove "
@@ -1387,171 +1535,186 @@ msgstr ""
 "quitar areas y blanca para aÃ±adir areas seleccionadas, en particular para el "
 "tallo."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:37(None)
-msgid "@@image: 'images/toolbox/toolbox-text.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-text.xml:17(title) src/toolbox/tool-text.xml:21(secondary)
+#: src/toolbox/tool-text.xml:24(primary)
+#: src/toolbox/tool-text.xml:364(primary)
+#: src/toolbox/tool-text.xml:472(primary)
+#: src/toolbox/tool-move.xml:272(primary)
+msgid "Text"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:70(None) src/toolbox/tool-text.xml:101(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-text-22.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-text.xml:25(secondary)
+#: src/toolbox/tool-path.xml:25(secondary)
+#: src/toolbox/tool-crop.xml:30(tertiary)
+#: src/toolbox/tool-blend.xml:27(secondary)
+msgid "Tool"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:91(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-text.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-text.xml:29(title)
+msgid "The Text tool in Toolbox"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:252(None)
+#: src/toolbox/tool-text.xml:37(para)
 msgid ""
-"@@image: 'images/menus/layer-text-commands.png'; md5=THIS FILE DOESN'T EXIST"
+"The Text tool places text into an image. When you click on an image with "
+"this tool the <emphasis>Text Editor dialog</emphasis> is opened where you "
+"can type your text, and a text layer is added in the Layer Dialog. In the "
+"<emphasis>Text Option dialog</emphasis>, you can change the font, color and "
+"size of your text, and justify it, interactively."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:280(None)
+#: src/toolbox/tool-text.xml:44(para)
 msgid ""
-"@@image: 'images/toolbox/text-along-path.png'; md5=THIS FILE DOESN'T EXIST"
+"A new possibility appeared with <acronym>GIMP</acronym>-2.6: click-dragging "
+"the mouse pointer on the canvas draws a rectangular frame that you can "
+"enlarge and move as you do with rectangular selections. The text you type in "
+"the Text Editor is displayed in this frame and automatically adapted to the "
+"frame size. You can adjust this frame whenever you like."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:285(None)
-msgid "@@image: 'images/toolbox/text-path.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
+#: src/toolbox/tool-text.xml:53(title)
+#, fuzzy
+#| msgid "The Rotate tool in Toolbox"
+msgid "Text tool bounding box"
+msgstr "La herramienta rotar en la caja de herramientas"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:320(None)
+#: src/toolbox/tool-text.xml:60(para)
 msgid ""
-"@@image: 'images/toolbox/tool-dialog-text.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-text.xml:22(title) src/toolbox/tool-text.xml:25(secondary)
-#: src/toolbox/tool-text.xml:28(primary)
-#: src/toolbox/tool-text.xml:311(primary)
-#: src/toolbox/tool-text.xml:326(primary)
-#: src/toolbox/tool-move.xml:244(primary)
-msgid "Text"
+"When the mouse pointer is around the center of the frame, it comes with a "
+"small crosshair <guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-"
+"move-16.png\"/></guiicon>. Click-and-drag to move the frame and its contents "
+"(the text shows up when you release the mouse button). The text remains at "
+"the same place in the frame."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:29(secondary)
-#: src/toolbox/tool-path.xml:35(secondary)
-#: src/toolbox/tool-blend.xml:37(secondary)
-msgid "Tool"
+#: src/toolbox/tool-text.xml:73(para)
+msgid "You can access this tool in several ways:"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:33(phrase)
-msgid "The Text tool in Toolbox"
+#: src/toolbox/tool-text.xml:78(para)
+#, fuzzy
+#| msgid ""
+#| "In the image menu through <menuchoice><guimenu><accel>T</accel>ools</"
+#| "guimenu><guisubmenu><accel>P</accel>aths</guisubmenu></menuchoice>,"
+msgid ""
+"In the image menu through <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Text</guisubmenu></menuchoice>,"
 msgstr ""
+"desde el menÃº de la imagen siguiendo, <menuchoice><guimenu><accel>H</"
+"accel>erramientas</guimenu><guisubmenu><accel>R</accel>utas</guisubmenu></"
+"menuchoice>"
 
-#: src/toolbox/tool-text.xml:41(para)
+#: src/toolbox/tool-text.xml:87(para)
 msgid ""
-"The Text tool places text into an image. When you click on an image with "
-"this tool the <emphasis>Text Editor dialog</emphasis> is opened where you "
-"can type your text, and a text layer is added in the Layer Dialog. In the "
-"<emphasis>Text Option dialog</emphasis>, you can change the font, color and "
-"size of your text, and justify it, interactively."
+"by clicking the tool icon <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-text-22.png\"/></guiicon> in Toolbox,"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:48(para)
-msgid ""
-"With the Move tool, you can move the text layer. But you must click on a "
-"letter, and this is not always easy when letters are fine."
+#: src/toolbox/tool-text.xml:96(para)
+msgid "or by using the <keycap>T</keycap> keyboard shortcut."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:57(para)
-msgid "You can access this tool in several ways:"
+#: src/toolbox/tool-text.xml:106(title)
+msgid "Text tool options"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:62(para)
+#: src/toolbox/tool-text.xml:114(para) src/toolbox/tool-path.xml:124(para)
+#: src/toolbox/tool-clone.xml:156(para)
+#: src/toolbox/about-common-options-display.xml:5(para)
 msgid ""
-"In the image menu through <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu>Te<accel>x</accel>t</guisubmenu></menuchoice>,"
+"Normally, tool options are displayed in a window attached under the Toolbox "
+"as soon as you activate a tool. If they are not, you can access them from "
+"the image menu bar through <menuchoice><guimenu>Windows</"
+"guimenu><guisubmenu>Dockable Windows</guisubmenu><guimenuitem>Tool Options</"
+"guimenuitem></menuchoice> which opens the option window of the selected tool."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:68(para)
-#: src/toolbox/tool-color-picker.xml:74(para)
-msgid "by clicking the tool icon <placeholder-1/> in Toolbox,"
+#: src/toolbox/tool-text.xml:127(term)
+msgid "Font"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:75(para)
-msgid "or by using the <keycap>T</keycap> keyboard shortcut."
+#: src/toolbox/tool-text.xml:129(para)
+msgid ""
+"Click on the fonts button <guibutton>A&alpha;</guibutton> to open the font "
+"selector of this tool, which offers you a list of installed X fonts."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:87(phrase)
-msgid "Text tool options"
+#: src/toolbox/tool-text.xml:135(para)
+msgid ""
+"At the bottom of the font selector you find some icons which act as buttoms "
+"for:"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:99(para)
+#: src/toolbox/tool-text.xml:140(para)
+msgid "resizing the font previews,"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:143(para)
 msgid ""
-"The available tool options for the Text tool can be accessed by double "
-"clicking the text tool icon:<placeholder-1/>"
+"selecting <emphasis>list view</emphasis> or <emphasis>grid view</emphasis>,"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:106(term)
-msgid "Font"
+#: src/toolbox/tool-text.xml:149(para)
+#, fuzzy
+#| msgid ""
+#| "See the <link linkend=\"gimp-concepts-paths\"><quote>Path</quote></"
+#| "link>concept."
+msgid "opening the <link linkend=\"gimp-font-dialog\">font dialog</link>."
 msgstr ""
+"Vea el <link linkend=\"gimp-concepts-paths\"><quote>concepto de ruta</"
+"quote></link>."
 
-#: src/toolbox/tool-text.xml:108(para)
+#: src/toolbox/tool-text.xml:155(para)
 msgid ""
-"There are two ways of selecting fonts in GIMP. The first is from the image "
-"Dialogs/Fonts menu. The second is with the Font selector in this tool. Both "
-"methods select from the installed X fonts. When you select a font it is "
+"Choose a font from the installed fonts. When you select a font it is "
 "interactively applied to your text."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:115(para)
+#. cf. bug #585823 (2009-06-15)
+#: src/toolbox/tool-text.xml:161(para)
 msgid ""
-"You can get special characters in the same way as you get them in other text "
-"editors: <keycap>AltGr</keycap> + key in Linux, <keycap>Alt</keycap> + "
-"number key pad in Windows."
+"You can use the scroll wheel of your pointing device (usually your mouse) on "
+"the fonts button in order to quickly change the font of your text (move the "
+"pointer on the fonts button, and don't click, just use the wheel button)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:124(term)
-#: src/toolbox/tool-rect-select.xml:337(term)
-#: src/toolbox/tool-ink.xml:113(term) src/toolbox/tool-ink.xml:138(term)
-#: src/toolbox/tool-crop.xml:286(term) src/toolbox/tool-brush.xml:562(term)
+#: src/toolbox/tool-text.xml:172(term)
+#: src/toolbox/tool-rect-select.xml:343(term)
+#: src/toolbox/tool-ink.xml:99(term) src/toolbox/tool-ink.xml:124(term)
+#: src/toolbox/tool-crop.xml:273(term) src/toolbox/tool-brush.xml:396(term)
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: src/toolbox/tool-text.xml:126(para)
+#: src/toolbox/tool-text.xml:174(para)
 msgid ""
 "This control sets the size of the font in any of several selectable units."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:133(term)
+#: src/toolbox/tool-text.xml:182(term)
 msgid "Hinting"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:135(para)
+#: src/toolbox/tool-text.xml:184(para)
 msgid ""
 "Uses the indices of adjustment to modify the characters in order to produce "
 "clear letters in small font sizes."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:142(term)
+#: src/toolbox/tool-text.xml:191(term)
 msgid "Force Auto-Hinter"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:144(para)
+#: src/toolbox/tool-text.xml:193(para)
 msgid ""
 "<guilabel>Auto Hinter</guilabel> tries to automatically compute information "
 "for better representation of the character font."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:151(term) src/toolbox/tool-select.xml:353(term)
+#: src/toolbox/tool-text.xml:201(term) src/toolbox/tool-select.xml:352(term)
 msgid "Antialiasing"
 msgstr "Alisado"
 
-#: src/toolbox/tool-text.xml:153(para)
+#: src/toolbox/tool-text.xml:203(para)
 msgid ""
 "Antialiasing will render the text with much smoother edges and curves. This "
 "is achieved by slight blurring and merging of the edges. This option can "
@@ -1560,55 +1723,55 @@ msgid ""
 "color space."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:163(term) src/toolbox/tool-levels.xml:30(primary)
-#: src/toolbox/tool-color-picker.xml:38(primary)
-#: src/toolbox/tool-colorize.xml:30(primary)
-#: src/toolbox/tool-color-balance.xml:30(primary)
-#: src/toolbox/tool-by-color-select.xml:36(primary)
-#: src/toolbox/tool-brush.xml:572(term)
+#: src/toolbox/tool-text.xml:214(term) src/toolbox/tool-levels.xml:22(primary)
+#: src/toolbox/tool-colorize.xml:20(primary)
+#: src/toolbox/tool-color-picker.xml:28(primary)
+#: src/toolbox/tool-color-balance.xml:20(primary)
+#: src/toolbox/tool-by-color-select.xml:25(primary)
+#: src/toolbox/tool-brush.xml:406(term)
 msgid "Color"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:165(para)
+#: src/toolbox/tool-text.xml:216(para)
 msgid ""
 "Color of the text that will be drawn next. Defaults to black. Selectable "
 "from the color picker dialog box that opens when the current color sample is "
 "clicked."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:171(para)
+#: src/toolbox/tool-text.xml:222(para)
 msgid ""
 "You can also click-and-drag the color from the Toolbox color area onto the "
 "text."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:179(term) src/toolbox/tool-text.xml:182(primary)
+#: src/toolbox/tool-text.xml:231(term) src/toolbox/tool-text.xml:234(primary)
 msgid "Justify"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:184(para)
+#: src/toolbox/tool-text.xml:236(para)
 msgid ""
 "Causes the text to be justified according to any of four rules selectable "
 "from the associated icons."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:191(term) src/toolbox/tool-text.xml:194(primary)
+#: src/toolbox/tool-text.xml:244(term) src/toolbox/tool-text.xml:247(primary)
 msgid "Indent"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:196(para)
+#: src/toolbox/tool-text.xml:249(para)
 msgid "Controls the indent spacing from the left margin, for the fist line."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:203(term)
+#: src/toolbox/tool-text.xml:257(term)
 msgid "Line Spacing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:206(primary)
+#: src/toolbox/tool-text.xml:260(primary)
 msgid "Line spacing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:208(para)
+#: src/toolbox/tool-text.xml:262(para)
 msgid ""
 "Controls the spacing between successive lines of text. This setting is "
 "interactive: it appears at the same time in image text. The number is not "
@@ -1616,22 +1779,22 @@ msgid ""
 "subtracted from this space (the value can be negative)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:218(term)
+#: src/toolbox/tool-text.xml:273(term)
 msgid "Letter Spacing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:220(para)
+#: src/toolbox/tool-text.xml:275(para)
 msgid ""
 "Controls the spacing between letters. Also in this case the number is not "
 "the space itself between letters, but how many pixels must be added to or "
 "substracted from this space (the value can be negative)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:229(term) src/toolbox/tool-text.xml:232(primary)
+#: src/toolbox/tool-text.xml:285(term) src/toolbox/tool-text.xml:288(primary)
 msgid "Text along Path"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:234(para)
+#: src/toolbox/tool-text.xml:290(para)
 msgid ""
 "This option is enabled only if a <link linkend=\"gimp-using-paths\">path</"
 "link> exists. When your text is created, then create or import a path and "
@@ -1639,26 +1802,26 @@ msgid ""
 "invisible and you have to make it visible in the Path Dialog."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:241(para)
+#: src/toolbox/tool-text.xml:297(para)
 msgid "This command is also available from the <quote>Layer</quote> menu:"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:246(phrase)
+#: src/toolbox/tool-text.xml:301(title)
 msgid "The Text to Path command among text commands in the Layer menu"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:255(para)
+#: src/toolbox/tool-text.xml:310(para)
 msgid "This group of options appears only if a layer text exists."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:261(para)
+#: src/toolbox/tool-text.xml:316(para)
 msgid ""
 "If you want to use a text which already exists, make it active in the <link "
 "linkend=\"gimp-layer-dialog\">Layer dialog</link>, select the Text tool and "
 "click on the text in the image window."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:266(para)
+#: src/toolbox/tool-text.xml:321(para)
 msgid ""
 "Click on the <guibutton>Text along Path</guibutton> button. The text is bent "
 "along the path. Letters are represented with their outline. Each of them is "
@@ -1666,81 +1829,61 @@ msgid ""
 "dialog\">Path dialog</link>. All path options should apply to this new path."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:275(phrase)
+#: src/toolbox/tool-text.xml:329(title)
 msgid "<quote>Text along Path</quote> example"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:292(term)
-msgid "Create Path from Text"
+#: src/toolbox/tool-text.xml:345(term)
+msgid "Path from Text"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:295(primary)
+#: src/toolbox/tool-text.xml:348(primary)
 msgid "Text to Path"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:297(para)
+#: src/toolbox/tool-text.xml:350(para)
 msgid ""
 "This tool creates a selection path from the selected text. Every letter is "
 "surrounded with a path component. So you can modify the shape of letters by "
 "moving path control points."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:308(phrase)
+#: src/toolbox/tool-text.xml:361(title)
 msgid "Text Editor"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:312(secondary)
+#: src/toolbox/tool-text.xml:365(secondary)
 msgid "Editor"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:316(phrase)
-msgid "The Text Editor options"
-msgstr ""
-
-#: src/toolbox/tool-text.xml:327(secondary)
-msgid "Load text from file"
+#: src/toolbox/tool-text.xml:369(title)
+msgid "The Text Editor"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:332(para)
+#: src/toolbox/tool-text.xml:378(para)
 msgid ""
 "This dialog window is opened when you click on the image with the Text Tool. "
-"It's a still basic text editor that nevertheless allows you to write on "
-"several lines. Word wrap is not possible - the text layer lengthens "
-"gradually - and you have to press the <keycap>Enter</keycap> key to move to "
-"the next line."
+"There, you can enter the text which shows up in real time in the frame on "
+"top of the canvas."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:339(para)
-msgid ""
-"The text you type appears interactively in the image. If the option "
-"<quote>Show Layer Boundary</quote> is checked in the View menu, this text "
-"will be surrounded with black and yellow dashes that mark the layer "
-"boundary. Now look, it's not a selection: if you want to move the text, you "
-"must click on the text itself and not inside this frame only."
-msgstr ""
-
-#: src/toolbox/tool-text.xml:347(para)
+#: src/toolbox/tool-text.xml:383(para)
 msgid ""
 "You can correct the text you are writing and you can change the text font "
 "with the Font Editor."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:351(para)
-msgid ""
-"You can move the text by using the Move Tool, but you lose the Editor then. "
-"You can re-edit this text as you will see now."
-msgstr ""
-
-#: src/toolbox/tool-text.xml:355(para)
+#: src/toolbox/tool-text.xml:387(para)
 msgid ""
 "As soon as you start writing, a Text layer is created in the Layer Dialog. "
-"On an image with such a layer (the image you are working on, or a .xcf "
-"image), you can resume text editing by activating this text layer then "
-"clicking on it (double click). Of course, you can apply to this text layer "
-"the same functions you use with other layers."
+"On an image with such a layer (the image you are working on, or a <filename "
+"class=\"extension\">.xcf</filename> image), you can resume text editing by "
+"activating this text layer then clicking on it (double click). Of course, "
+"you can apply to this text layer the same functions you use with other "
+"layers."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:363(para)
+#: src/toolbox/tool-text.xml:395(para)
 msgid ""
 "To add another text to your image click on a non-text layer: a new Text "
 "Editor will appear and a new text layer will be created. To pass from a text "
@@ -1748,228 +1891,142 @@ msgid ""
 "activate the editor."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:372(term)
-msgid "Load Text from File"
-msgstr ""
-
-#: src/toolbox/tool-text.xml:374(para)
+#. cf. bug #580532 (2009-06-15)
+#: src/toolbox/tool-text.xml:402(para)
 msgid ""
-"Text can be loaded from a text file by clicking the folder icon in the text "
-"editor."
+"You can get Unicode characters with <keycombo><keycap>Ctrl</"
+"keycap><keycap>Shift</keycap><keycap>U</keycap></keycombo> plus hexadecimal "
+"Unicode code of the desired char, for example:"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:381(term)
-msgid "Clear all Text"
+#: src/toolbox/tool-text.xml:410(title)
+msgid "Entering Unicode characters"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:383(para)
-msgid ""
-"Clicking this icon clears the editor and the associated text on the image."
+#: src/toolbox/tool-text.xml:420(keycap)
+#: src/toolbox/tool-smudge.xml:77(keycap)
+#: src/toolbox/tool-select.xml:157(keycap)
+#: src/toolbox/tool-select.xml:190(keycap)
+#: src/toolbox/tool-rect-select.xml:109(keycap)
+#: src/toolbox/tool-rect-select.xml:136(keycap)
+#: src/toolbox/tool-perspective-clone.xml:83(keycap)
+#: src/toolbox/tool-pencil.xml:100(keycap) src/toolbox/tool-path.xml:88(term)
+#: src/toolbox/tool-paintbrush.xml:79(keycap)
+#: src/toolbox/tool-measure.xml:107(term)
+#: src/toolbox/tool-iscissors.xml:111(keycap)
+#: src/toolbox/tool-heal.xml:106(keycap)
+#: src/toolbox/tool-ellipse-select.xml:123(keycap)
+#: src/toolbox/tool-ellipse-select.xml:139(keycap)
+#: src/toolbox/tool-dodge-burn.xml:87(keycap)
+#: src/toolbox/tool-color-picker.xml:107(term)
+#: src/toolbox/tool-brush.xml:181(keycap)
+#: src/toolbox/tool-brush.xml:206(keycap)
+#: src/toolbox/tool-align.xml:79(keycap)
+#: src/toolbox/tool-airbrush.xml:83(keycap)
+msgid "Shift"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:390(term)
-msgid "From Left to Right"
+#: src/toolbox/tool-text.xml:421(keycap)
+msgid "U"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:392(para)
-msgid ""
-"This option causes text to be entered from left to right, as is the case "
-"with most Western languages and may Eastern languages."
+#: src/toolbox/tool-text.xml:434(keycap)
+msgid "4"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:400(term)
-msgid "From Right to Left"
+#: src/toolbox/tool-text.xml:434(keycap)
+msgid "7"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:402(para)
+#: src/toolbox/tool-text.xml:446(keycap)
+#, fuzzy
+#| msgid "Other"
+msgid "Enter"
+msgstr "Otras herramientas"
+
+#: src/toolbox/tool-text.xml:451(para)
 msgid ""
-"This option allows text to be entered from right to left, as is the case "
-"with some Eastern languages, such as Arabic (illustrated in the icon)."
+"Of course this feature is more useful for entering special (even exotic) "
+"characters, provided that the required glyphs for these characters are "
+"supplied by the selected font &mdash; only few fonts support Klingon. ;-)"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:410(term)
-msgid "Use Selected Font"
+#: src/toolbox/tool-text.xml:463(para)
+msgid "Unicode 0x47 (<quote>G</quote>), 0x2665, 0x0271, 0x03C0"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:412(para)
-msgid ""
-"Default doesn't use the font you have selected in the Options dialog. If you "
-"want to use it, check this option."
+#: src/toolbox/tool-text.xml:470(title)
+msgid "The Text Editor options"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:417(para)
-msgid "See also <xref linkend=\"gimp-using-text\"/>."
+#: src/toolbox/tool-text.xml:473(secondary)
+msgid "Load from file"
 msgstr ""
 
-#: src/toolbox/tools-selection.xml:4(title)
-msgid "Selection Tools"
-msgstr "Herramientas de selecciÃ³n"
-
-#: src/toolbox/tools-paint.xml:11(phrase)
-#: src/toolbox/tool-brush.xml:26(secondary)
-msgid "Brush Tools"
-msgstr "Herramientas de brocha"
+#: src/toolbox/tool-text.xml:476(term)
+msgid "Load Text from file"
+msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tools-painting.xml:34(None)
+#: src/toolbox/tool-text.xml:478(para)
 msgid ""
-"@@image: 'images/toolbox/painting-examples.png'; md5=THIS FILE DOESN'T EXIST"
+"Text can be loaded from a text file by clicking the folder icon in the text "
+"editor. All the text in the file is loaded."
 msgstr ""
 
-#: src/toolbox/tools-painting.xml:16(date) src/toolbox/tool-scale.xml:18(date)
-#, fuzzy
-msgid "2006-02-18"
+#: src/toolbox/tool-text.xml:485(term)
+msgid "Clear all text"
 msgstr ""
-"#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-21\n"
-"#-#-#-#-#  tools-painting.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2006-08-06"
-
-#: src/toolbox/tools-painting.xml:22(phrase)
-msgid "Painting Tools (Pencil, Paintbrush, Airbrush)"
-msgstr "Herramientas de pintura (lÃ¡piz, pincel, aerÃ³grafo)"
-
-#: src/toolbox/tools-painting.xml:26(secondary)
-msgid "Painting Tools"
-msgstr "Herramientas de pintura"
-
-#: src/toolbox/tools-painting.xml:30(phrase)
-msgid "Painting example"
-msgstr "Ejemplos de trazos"
 
-#: src/toolbox/tools-painting.xml:37(para)
+#: src/toolbox/tool-text.xml:487(para)
 msgid ""
-"Three strokes painted with the same round fuzzy brush (outline shown in "
-"upper left), using the Pencil (left), Paintbrush (middle), and Airbrush "
-"(right)."
+"Clicking this icon clears the editor and the associated text on the image."
 msgstr ""
-"Tres trazos ejecutados con la misma brocha circular difusa (mostrada en la "
-"esquina superior izquierda), usando el lÃ¡piz (izquierda), el pincel "
-"(centro), y el aerÃ³grafo (derecha)."
 
-#: src/toolbox/tools-painting.xml:45(para)
-msgid ""
-"The tools in this group are GIMP's basic painting tools, and they have "
-"enough features in common to be worth discussing together in this section. "
-"Features common to all brush tools are described in the <link linkend=\"gimp-"
-"tool-brush\">Common Features</link> section. Features specific to an "
-"individual tool are described in the section devoted to that tool."
+#: src/toolbox/tool-text.xml:494(term)
+msgid "From left to right"
 msgstr ""
-"Las herramientas de este grupo son las mÃ¡s bÃ¡sicas para pintar en el GIMP, y "
-"tienen sufientes caracterÃsticas en comÃºn como para ser discutidas en "
-"conjunto en esta secciÃ³n. Las caracterÃsticas comunes a todas las "
-"herramientas de brocha fueron descriptas en la secciÃ³n sobre <link linkend="
-"\"gimp-tool-brush\">CaracterÃsticas en comÃºn</link>. Las caracterÃsticas "
-"especÃficas a cada herramienta en particular son descriptas en las secciones "
-"dedicadas a cada una."
 
-#: src/toolbox/tools-painting.xml:53(para)
+#: src/toolbox/tool-text.xml:496(para)
 msgid ""
-"The Pencil is the crudest of the tools in this group: it makes hard, non-"
-"anti-aliased brushstrokes. The Paintbrush is intermediate: it is probably "
-"the most commonly used of the group. The Airbrush is the most flexible and "
-"controllable: it is the only one for which the amount of paint applied "
-"depends on the speed of brush movement. This flexibility also makes it a bit "
-"more difficult to use than the Paintbrush, however."
-msgstr ""
-"El lÃ¡piz es la mÃ¡s ruda de las herramientas de este grupo: hace trazos "
-"duros, sin antidentado. El pincel es intermedio: es probablemente la "
-"herramienta mÃ¡s usada de este grupo. El aerÃ³grafo es la mÃ¡s flexible y "
-"controlable: es la Ãºnica para la que la cantidad de pintura aplicada depende "
-"de la velocidad de la brocha en movimiento. Esta flexibilidad tambiÃ©n la "
-"hace mÃ¡s difÃcil de usar que el pincel."
-
-#: src/toolbox/tools-painting.xml:61(para)
-msgid ""
-"All of these tools share the same brushes, and the same options for choosing "
-"colors, either from the basic palette or from a gradient. All are capable of "
-"painting in a wide variety of modes."
+"This option causes text to be entered from left to right, as is the case "
+"with most Western languages and may Eastern languages."
 msgstr ""
-"Todas estas herramientas comparten las mismas brochas, y las mismas opciones "
-"para seleccionar colores, tanto desde una paleta bÃ¡sica o desde un "
-"degradado. Todas son capaces de pintar en una amplia variedad de modos."
 
-#: src/toolbox/tools-painting.xml:68(phrase)
-#: src/toolbox/tool-rect-select.xml:99(phrase)
-#: src/toolbox/tool-measure.xml:100(phrase)
-#: src/toolbox/tool-free-select.xml:85(phrase)
-#: src/toolbox/tool-eraser.xml:106(phrase)
-#: src/toolbox/tool-ellipse-select.xml:85(phrase)
-#: src/toolbox/tool-crop.xml:127(term)
-#: src/toolbox/tool-convolve.xml:95(phrase)
-#: src/toolbox/tool-clone.xml:101(phrase)
-#: src/toolbox/tool-brush.xml:153(phrase)
-#, fuzzy
-msgid "Key modifiers"
+#: src/toolbox/tool-text.xml:504(term)
+msgid "From right to left"
 msgstr ""
-"#-#-#-#-#  tool-brush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras\n"
-"#-#-#-#-#  tool-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras (por omisiÃ³n)\n"
-"#-#-#-#-#  tool-convolve.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras (por omisiÃ³n)\n"
-"#-#-#-#-#  tool-ellipse-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras (por defecto)\n"
-"#-#-#-#-#  tool-eraser.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras (por omisiÃ³n)\n"
-"#-#-#-#-#  tool-free-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras\n"
-"#-#-#-#-#  tool-rect-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras (por defecto)\n"
-"#-#-#-#-#  tools-painting.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Teclas modificadoras (por omisiÃ³n)"
 
-#: src/toolbox/tools-painting.xml:76(para)
+#: src/toolbox/tool-text.xml:506(para)
 msgid ""
-"Holding down the <keycap>Ctrl</keycap> key changes each of these tools to a "
-"<link linkend=\"gimp-tool-color-picker\">Color Picker</link>: clicking on "
-"any pixel of any layer sets the foreground color (as displayed in the "
-"Toolbox Color Area) to the color of the pixel."
+"This option allows text to be entered from right to left, as is the case "
+"with some Eastern languages, such as Arabic (illustrated in the icon)."
 msgstr ""
-"Manteniendo presionada la tecla <keycap>Ctrl</keycap> se cambia de estas "
-"herramientas a la herramienta Recoge color: clicando en cualquier pÃxel de "
-"cualquier capa asigna el color del mismo al color de frente (que se muestra "
-"en el Ã¡rea de color de la caja de herramientas)."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-smudge.xml:38(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-smudge.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-text.xml:514(term)
+msgid "Use selected font"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-smudge.xml:65(None) src/toolbox/tool-smudge.xml:130(None)
+#: src/toolbox/tool-text.xml:516(para)
 msgid ""
-"@@image: 'images/toolbox/stock-tool-smudge-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+"Default doesn't use the font you have selected in the Options dialog. If you "
+"want to use it, check this option."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-smudge.xml:119(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-smudge.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+#: src/toolbox/tool-text.xml:521(para)
+msgid "See also <xref linkend=\"gimp-using-text\"/>."
 msgstr ""
 
-#: src/toolbox/tool-smudge.xml:17(date)
-msgid "2008-01-06"
-msgstr "2006-08-06"
-
-#: src/toolbox/tool-smudge.xml:23(phrase)
-#: src/toolbox/tool-smudge.xml:27(secondary)
-#: src/toolbox/tool-smudge.xml:30(primary)
+#: src/toolbox/tool-smudge.xml:14(title)
+#: src/toolbox/tool-smudge.xml:17(secondary)
+#: src/toolbox/tool-smudge.xml:20(primary)
 msgid "Smudge"
 msgstr "Herramienta para borronear"
 
-#: src/toolbox/tool-smudge.xml:34(phrase)
+#: src/toolbox/tool-smudge.xml:24(title)
 msgid "Smudge tool"
 msgstr "La herramienta para borronear"
 
-#: src/toolbox/tool-smudge.xml:42(para)
+#: src/toolbox/tool-smudge.xml:31(para)
 msgid ""
 "The Smudge tool uses the current brush to smudge colors on the active layer "
 "or a selection. It takes color in passing and uses it to mix it to the next "
@@ -1980,58 +2037,36 @@ msgstr ""
 "con los prÃ³ximos colores que encuentra en su camino, a una distancia que se "
 "puede determinar."
 
-#: src/toolbox/tool-smudge.xml:51(para)
+#: src/toolbox/tool-smudge.xml:39(para)
 msgid "You can find the Smudge tool in various ways :"
 msgstr ""
 
-#: src/toolbox/tool-smudge.xml:56(para)
+#: src/toolbox/tool-smudge.xml:44(para)
+#, fuzzy
+#| msgid ""
+#| "Through <menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#| "guisubmenu><guimenuitem>Foreground Select</guimenuitem></menuchoice> in "
+#| "the image menu."
 msgid ""
-"Through <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint Tools</"
-"guisubmenu><guimenuitem><accel>S</accel>mudge.</guimenuitem></menuchoice> in "
-"the image menu."
+"through <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</"
+"guisubmenu><guimenuitem>Smudge.</guimenuitem></menuchoice> in the image menu,"
 msgstr ""
-"La herramienta para borronear puede activarse desde el menÃº de la imagen: "
-"<menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>p</accel>intura</"
-"guisubmenu><guimenuitem><accel>E</accel>mborronar.</guimenuitem></menuchoice>"
+"TambiÃ©n, desde <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de selecciÃ³n</"
+"guisubmenu><guimenuitem>SelecciÃ³n del frente</guimenuitem></menuchoice> en "
+"el menÃº de la imagen."
 
-#: src/toolbox/tool-smudge.xml:63(para) src/toolbox/tool-ink.xml:63(para)
-#, fuzzy
-msgid "By clicking on the tool icon: <placeholder-1/> in Toolbox."
+#: src/toolbox/tool-smudge.xml:55(para)
+msgid ""
+"by clicking on the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-smudge-22.png\"/></guiicon> in Toolbox,"
 msgstr ""
-"#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/"
-">\n"
-"#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"TambiÃ©n puede activarse clicando en el icono: <placeholder-1/>"
 
-#: src/toolbox/tool-smudge.xml:70(para)
+#: src/toolbox/tool-smudge.xml:65(para)
 msgid "or by pressing the <keycap>S</keycap> key on keyboard."
 msgstr "O presionando la tecla <keycap>S</keycap> del teclado."
 
-#: src/toolbox/tool-smudge.xml:83(keycap)
-#: src/toolbox/tool-select.xml:168(keycap)
-#: src/toolbox/tool-select.xml:201(keycap)
-#: src/toolbox/tool-rect-select.xml:122(keycap)
-#: src/toolbox/tool-rect-select.xml:147(keycap)
-#: src/toolbox/tool-perspective-clone.xml:96(keycap)
-#: src/toolbox/tool-pencil.xml:105(keycap) src/toolbox/tool-path.xml:96(term)
-#: src/toolbox/tool-paintbrush.xml:86(keycap)
-#: src/toolbox/tool-measure.xml:106(keycap)
-#: src/toolbox/tool-heal.xml:112(keycap)
-#: src/toolbox/tool-ellipse-select.xml:107(keycap)
-#: src/toolbox/tool-ellipse-select.xml:124(keycap)
-#: src/toolbox/tool-dodge-burn.xml:93(keycap)
-#: src/toolbox/tool-color-picker.xml:125(term)
-#: src/toolbox/tool-brush.xml:179(keycap)
-#: src/toolbox/tool-brush.xml:203(keycap)
-#: src/toolbox/tool-align.xml:87(keycap)
-#: src/toolbox/tool-airbrush.xml:90(keycap)
-msgid "Shift"
-msgstr ""
-
-#: src/toolbox/tool-smudge.xml:86(para)
+#: src/toolbox/tool-smudge.xml:80(para)
 msgid ""
 "The <keycap>Shift</keycap> key places the smudge tool into straight line "
 "mode. Holding Shift while clicking <mousebutton>Button1</mousebutton> will "
@@ -2044,81 +2079,37 @@ msgstr ""
 "imagen en lÃnea recta. Clics consecutivos continÃºan emborronando en lÃneas "
 "rectas que parten de la anterior."
 
-#: src/toolbox/tool-smudge.xml:100(para)
+#: src/toolbox/tool-smudge.xml:94(para)
 msgid ""
 "Using <keycap>Ctrl</keycap> with <keycap>Shift</keycap>, you can constrain "
 "the angle between two successive lines to vary by steps of 15Â°."
 msgstr ""
 
-#: src/toolbox/tool-smudge.xml:115(phrase)
+#: src/toolbox/tool-smudge.xml:107(title)
 msgid "The Smudge tool in Toolbox"
 msgstr "La herramienta para borronear en la caja de herramientas"
 
-#: src/toolbox/tool-smudge.xml:127(para)
-msgid ""
-"The available tool options for the Smudge Tool can be accessed by double "
-"clicking the Smudge Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para la herramienta para borronear pueden "
-"accederese haciendo doble clic en su Ãcono. <placeholder-1/>"
-
-#: src/toolbox/tool-smudge.xml:135(term)
+#: src/toolbox/tool-smudge.xml:120(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Pressure sensibility; Fade out; Apply Jitter; Hard edges; "
+#| "Rate"
 msgid ""
-"Opacity; Brush; Pressure sensibility; Fade out; Apply Jitter; Hard edges; "
+"Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply Jitter; Hard edges; "
 "Rate"
 msgstr "Opacidad"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-shear.xml:38(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-shear.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-shear.xml:60(None)
-msgid ""
-"@@image: 'images/toolbox/shear-example.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-shear.xml:85(None) src/toolbox/tool-shear.xml:119(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-shear-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-shear.xml:108(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-shear.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-shear.xml:143(None)
-msgid ""
-"@@image: 'images/toolbox/tool-dialog-shear.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-shear.xml:17(date)
-msgid "2008-03-02"
-msgstr "2007-04-22"
-
-#: src/toolbox/tool-shear.xml:23(phrase)
-#: src/toolbox/tool-shear.xml:27(secondary)
-#: src/toolbox/tool-shear.xml:30(primary)
+#: src/toolbox/tool-shear.xml:14(title)
+#: src/toolbox/tool-shear.xml:17(secondary)
+#: src/toolbox/tool-shear.xml:20(primary)
 msgid "Shear"
 msgstr "Inclinar"
 
-#: src/toolbox/tool-shear.xml:34(phrase)
+#: src/toolbox/tool-shear.xml:24(title)
 msgid "The Shear tool in Toolbox"
 msgstr "La herramienta <quote>Inclinar</quote> en la caja de herramientas"
 
-#: src/toolbox/tool-shear.xml:42(para)
+#: src/toolbox/tool-shear.xml:31(para)
 msgid ""
 "Shear tool is used to shift one part of an image, a layer, a selection or a "
 "path to a direction and the other part to the opposite direction. For "
@@ -2144,23 +2135,30 @@ msgstr ""
 "botÃ³n <guilabel>Cizallar</guilabel> en el diÃ¡logo de informaciÃ³n para "
 "realizar la operaciÃ³n."
 
-#: src/toolbox/tool-shear.xml:56(phrase)
+#: src/toolbox/tool-shear.xml:45(title)
 msgid "Shear example"
 msgstr ""
 
-#: src/toolbox/tool-shear.xml:65(para)
+#: src/toolbox/tool-shear.xml:54(para)
 msgid ""
 "You can't shear both ways at the same time, you have to use the shear tool "
 "twice on end."
 msgstr ""
 
-#: src/toolbox/tool-shear.xml:74(para)
-msgid "You can get to Shear tool in several ways :"
-msgstr "Puede seleccionar la herramienta de varias maneras:"
+#: src/toolbox/tool-shear.xml:61(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Shear Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
 
-#: src/toolbox/tool-shear.xml:77(para)
+#: src/toolbox/tool-shear.xml:66(para)
+#, fuzzy
+#| msgid ""
+#| "In the the image-menu through: <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Shear</"
+#| "guimenuitem></menuchoice>,"
 msgid ""
-"In the the image-menu through: <menuchoice><guimenu>Tools</"
+"from the image menu bar <menuchoice><guimenu>Tools</"
 "guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Shear</"
 "guimenuitem></menuchoice>,"
 msgstr ""
@@ -2168,64 +2166,48 @@ msgstr ""
 "guimenu><guisubmenu>Herramientas de <accel>T</accel>ransformaciÃ³n</"
 "guisubmenu><guimenuitem><accel>I</accel>nclinar</guimenuitem></menuchoice>,"
 
-#: src/toolbox/tool-shear.xml:83(para)
-#: src/toolbox/tool-perspective.xml:79(para)
-#: src/toolbox/tool-path.xml:71(para) src/toolbox/tool-flip.xml:65(para)
-#, fuzzy
-msgid "By clicking the tool icon: <placeholder-1/> in Toolbox,"
+#: src/toolbox/tool-shear.xml:76(para)
+msgid ""
+"by clicking on the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-shear-22.png\"/></guiicon> in Toolbox,"
 msgstr ""
-"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
-"herramientas,\n"
-"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"haciendo clic en el icono <placeholder-1/> de la caja de herramientas,\n"
-"#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
-"herramientas,\n"
-"#-#-#-#-#  tool-shear.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Pulsando sobre el icono de la heramienta: <placeholder-1/> en la caja de "
-"herramientas,"
 
-#: src/toolbox/tool-shear.xml:90(para)
+#: src/toolbox/tool-shear.xml:86(para)
+#, fuzzy
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>S</keycap></"
+#| "keycombo> key combination."
 msgid ""
-"or by using the <keycombo><keycap>Shift</keycap><keycap>S</keycap></"
-"keycombo> key combination."
+"by using the <keycombo><keycap>Shift</keycap><keycap>S</keycap></keycombo> "
+"key combination."
 msgstr ""
 "o usando la combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>S</"
 "keycap></keycombo>."
 
-#: src/toolbox/tool-shear.xml:104(phrase)
+#: src/toolbox/tool-shear.xml:98(title)
 msgid "Shear tool options"
 msgstr "Opciones de la herramienta inclinar"
 
-#: src/toolbox/tool-shear.xml:116(para)
-msgid ""
-"The available tool options for the Shear Tool can be accessed by double "
-"clicking the Shear Tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede acceder a las opciones disponibles de la herramienta inclinar "
-"mediante una doble pulsaciÃ³n sobre el icono de la herramienta. <placeholder-"
-"1/>"
-
-#: src/toolbox/tool-shear.xml:124(term)
-msgid "Affect; Interpolation; Transform Direction; Clip Result; Preview"
+#: src/toolbox/tool-shear.xml:111(term)
+#, fuzzy
+#| msgid "Transform; Direction, Interpolation; Clipping; Preview"
+msgid "Transform Direction; Interpolation; Clippping; Preview"
 msgstr ""
-"Afectar; interpolaciÃ³n; direcciÃ³n de la transformaciÃ³n; supermuestreo; "
-"resultado del recorte; vista previa"
+"Afectar; interpolaciÃ³n; supermuestreo; resultado del recorte; vista previa"
 
-#: src/toolbox/tool-shear.xml:135(phrase)
+#: src/toolbox/tool-shear.xml:122(title)
 msgid "Shearing Information"
 msgstr "InformaciÃ³n de la inclinaciÃ³n"
 
-#: src/toolbox/tool-shear.xml:139(phrase)
+#: src/toolbox/tool-shear.xml:125(phrase)
 msgid "Shearing Information window"
 msgstr "Ventana de la informaciÃ³n de la inclinaciÃ³n"
 
-#: src/toolbox/tool-shear.xml:149(term)
+#: src/toolbox/tool-shear.xml:135(term)
 msgid "Shear magnitude X"
 msgstr "Magnitud X de la inclinaciÃ³n"
 
-#: src/toolbox/tool-shear.xml:151(para)
+#: src/toolbox/tool-shear.xml:137(para)
 msgid ""
 "Here, you can set the horizontal shearing amplitude. A positive value "
 "produces a clock-wise tilt. A negative value gives a counter-clock-wise "
@@ -2235,77 +2217,36 @@ msgstr ""
 "positivo produce una inclinaciÃ³n en el sentido de las agujas del reloj, un "
 "valor negativo al contrario."
 
-#: src/toolbox/tool-shear.xml:160(term)
+#: src/toolbox/tool-shear.xml:146(term)
 msgid "Shear magnitude Y"
 msgstr "Magnitud Y de la inclinaciÃ³n"
 
-#: src/toolbox/tool-shear.xml:162(para)
+#: src/toolbox/tool-shear.xml:148(para)
 msgid "As above, in the vertical direction."
 msgstr ""
 "Igual que para la magnitud X, descrita arriba, pero en sentido vertical."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-select.xml:38(None)
-msgid ""
-"@@image: 'images/toolbox/selection-tools.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-select.xml:268(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-selection.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-select.xml:292(None)
-msgid ""
-"@@image: 'images/tool-options/rectsel-mode-replace.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-select.xml:307(None)
-msgid ""
-"@@image: 'images/tool-options/rectsel-mode-add.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-select.xml:322(None)
-msgid ""
-"@@image: 'images/tool-options/rectsel-mode-subtract.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-select.xml:337(None)
-msgid ""
-"@@image: 'images/tool-options/rectsel-mode-intersect.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-select.xml:20(date)
-msgid "2006-06-15"
-msgstr ""
-
-#: src/toolbox/tool-select.xml:29(primary)
+#: src/toolbox/tool-select.xml:20(primary)
 msgid "Selections"
 msgstr "Selecciones"
 
-#: src/toolbox/tool-select.xml:34(phrase)
+#: src/toolbox/tool-select.xml:25(title)
 msgid "The Selection tools"
 msgstr ""
 
-#: src/toolbox/tool-select.xml:42(para)
-msgid ""
-"Selection tools are designed to select regions from images or layers so you "
+#: src/toolbox/tool-select.xml:32(para)
+#, fuzzy
+#| msgid ""
+#| "Selection tools are designed to select regions from images or layers so "
+#| "you can work on them without affecting the unselected areas. Each tool "
+#| "has its own individual properties, but the selection tools also share a "
+#| "number of options and features in common. These common features are "
+#| "described here; the variations are explained in the following sections "
+#| "for each tool specifically. If you need help with what a "
+#| "<quote>selection</quote> is in GIMP, and how it works, see <link linkend="
+#| "\"gimp-concepts-selection\">Selection</link>."
+msgid ""
+"Selection tools are designed to select regions from the active layer so you "
 "can work on them without affecting the unselected areas. Each tool has its "
 "own individual properties, but the selection tools also share a number of "
 "options and features in common. These common features are described here; "
@@ -2324,45 +2265,45 @@ msgstr ""
 "<quote>selecciÃ³n</quote> en el GIMP, y cÃ³mo funciona, dirÃjase a la secciÃ³n "
 "sobre <link linkend=\"gimp-concepts-selection\">selecciÃ³n</link>."
 
-#: src/toolbox/tool-select.xml:52(para)
+#: src/toolbox/tool-select.xml:42(para)
 msgid "There are seven selection tools:"
 msgstr "Hay seis herramientas de selecciÃ³n:"
 
-#: src/toolbox/tool-select.xml:55(para)
+#: src/toolbox/tool-select.xml:45(para)
 msgid "the <link linkend=\"gimp-tool-rect-select\">Rectangle Select</link>;"
 msgstr "SelecciÃ³n rectangular"
 
-#: src/toolbox/tool-select.xml:60(para)
+#: src/toolbox/tool-select.xml:50(para)
 msgid "the <link linkend=\"gimp-tool-ellipse-select\">Ellipse Select</link>;"
 msgstr "SelecciÃ³n elÃptica"
 
-#: src/toolbox/tool-select.xml:65(para)
+#: src/toolbox/tool-select.xml:55(para)
 msgid ""
 "the <link linkend=\"gimp-tool-free-select\">Free Select (the Lasso)</link>;"
 msgstr "SelecciÃ³n libre (el lazo)"
 
-#: src/toolbox/tool-select.xml:71(para)
+#: src/toolbox/tool-select.xml:61(para)
 msgid ""
 "the <link linkend=\"gimp-tool-fuzzy-select\"> Select Contiguous Regions (the "
 "Magic Wand) </link>;"
 msgstr "Seleccionar regiones continuas (la varita mÃ¡gica)"
 
-#: src/toolbox/tool-select.xml:78(para)
+#: src/toolbox/tool-select.xml:68(para)
 msgid "the <link linkend=\"gimp-tool-by-color-select\">Select by Color</link>;"
 msgstr "Seleccionar por colores"
 
-#: src/toolbox/tool-select.xml:83(para)
+#: src/toolbox/tool-select.xml:73(para)
 msgid ""
 "the <link linkend=\"gimp-tool-iscissors\"> Select Shapes from Image "
 "(Intelligent Scissors) </link> and"
 msgstr "Seleccionar figuras de la imagen (tijeras inteligentes)"
 
-#: src/toolbox/tool-select.xml:90(para)
+#: src/toolbox/tool-select.xml:80(para)
 msgid ""
 "the <link linkend=\"gimp-tool-foreground-select\">Foreground Select</link>."
 msgstr ""
 
-#: src/toolbox/tool-select.xml:96(para)
+#: src/toolbox/tool-select.xml:86(para)
 msgid ""
 "In some ways the Path tool can also be thought of as a selection tool: any "
 "closed path can be converted into a selection. It also can do a great deal "
@@ -2374,7 +2315,7 @@ msgstr ""
 "esto, usarlas puede llevar un gran trabajo, y no comparten el mismo conjunto "
 "de opciones con las otras herramientas de selecciÃ³n."
 
-#: src/toolbox/tool-select.xml:106(para)
+#: src/toolbox/tool-select.xml:95(para)
 msgid ""
 "The behavior of selection tools is modified if you hold down the "
 "<keycap>Ctrl</keycap>, <keycap>Shift</keycap>, and/or <keycap>Alt</keycap> "
@@ -2384,7 +2325,7 @@ msgstr ""
 "las teclas <keycap>Ctrl</keycap>, <keycap>Shift</keycap>, y/o <keycap>Alt</"
 "keycap> mientras las utiliza."
 
-#: src/toolbox/tool-select.xml:112(para)
+#: src/toolbox/tool-select.xml:101(para)
 msgid ""
 "Advanced users find the modifier keys very valuable, but novice users often "
 "find them confusing. Fortunately, it is possible for most purposes to use "
@@ -2395,7 +2336,7 @@ msgstr ""
 "posible utilizar los botones de modo (que se describen debajo) en lugar de "
 "las teclas modificadoras, en la mayorÃa de los casos."
 
-#: src/toolbox/tool-select.xml:125(para)
+#: src/toolbox/tool-select.xml:114(para)
 msgid ""
 "When creating a selection, holding down the <keycap>Ctrl</keycap> key can "
 "have two different actions according to the way you use it:"
@@ -2404,7 +2345,7 @@ msgstr ""
 "puede resultar en dos acciones diferentes, de acuerdo a la forma en que la "
 "utilice:"
 
-#: src/toolbox/tool-select.xml:132(para)
+#: src/toolbox/tool-select.xml:121(para)
 msgid ""
 "Holding down the key <emphasis>while drawing</emphasis> the selection "
 "toggles the <quote>Expand from center</quote> option."
@@ -2413,7 +2354,7 @@ msgstr ""
 "para comenzar a seleccionar, esta selecciÃ³n se realizarÃ¡ en el modo de "
 "<emphasis>extracciÃ³n</emphasis>."
 
-#: src/toolbox/tool-select.xml:139(para)
+#: src/toolbox/tool-select.xml:128(para)
 msgid ""
 "If you hold down the <keycap>Ctrl</keycap> key <emphasis>before drawing a "
 "selection</emphasis>, this new selection switches to the Subtract mode. So, "
@@ -2424,14 +2365,14 @@ msgstr ""
 "para comenzar a seleccionar, el efecto dependerÃ¡ de la herramienta que estÃ© "
 "en uso."
 
-#: src/toolbox/tool-select.xml:152(keycap)
-#: src/toolbox/tool-measure.xml:142(keycap)
-#: src/toolbox/tool-measure.xml:158(keycap)
-#: src/toolbox/tool-eraser.xml:131(keycap)
+#: src/toolbox/tool-select.xml:141(keycap)
+#: src/toolbox/tool-measure.xml:137(term)
+#: src/toolbox/tool-measure.xml:153(keycap)
+#: src/toolbox/tool-eraser.xml:153(keycap)
 msgid "Alt"
 msgstr ""
 
-#: src/toolbox/tool-select.xml:155(para)
+#: src/toolbox/tool-select.xml:144(para)
 msgid ""
 "Holding <keycap>Alt</keycap> will allow movement of the current selection "
 "(only its frame, not its content). If the whole image is moved instead of "
@@ -2448,7 +2389,7 @@ msgstr ""
 "nunca se entera de que fue presionada), asÃ que la tecla <keycap>Alt</"
 "keycap> sin <keycap>Shift</keycap> no funciona para todos los usuarios."
 
-#: src/toolbox/tool-select.xml:171(para)
+#: src/toolbox/tool-select.xml:160(para)
 msgid ""
 "When creating a selection, holding down the <keycap>Shift</keycap> key can "
 "have two different actions according to the way you use it:"
@@ -2457,7 +2398,7 @@ msgstr ""
 "puede resultar en dos acciones diferentes, de acuerdo a la forma en que la "
 "utilice:"
 
-#: src/toolbox/tool-select.xml:178(para)
+#: src/toolbox/tool-select.xml:167(para)
 msgid ""
 "If you hold down the key <emphasis>before clicking</emphasis> to start the "
 "selection, this selection will be in <emphasis>Addition</emphasis> mode as "
@@ -2467,7 +2408,7 @@ msgstr ""
 "para comenzar a seleccionar, esta selecciÃ³n se realizarÃ¡ en el modo de "
 "<emphasis>adiciÃ³n</emphasis>."
 
-#: src/toolbox/tool-select.xml:186(para)
+#: src/toolbox/tool-select.xml:175(para)
 msgid ""
 "If you hold down the <keycap>Shift</keycap> key <emphasis>after clicking</"
 "emphasis> to start the selection, the effect will depend on the tool you are "
@@ -2479,7 +2420,7 @@ msgstr ""
 "en uso: por ejemplo, la forma de la selecciÃ³n se restringe a un cuadrado "
 "para la herramienta de selecciÃ³n rectangular."
 
-#: src/toolbox/tool-select.xml:205(para)
+#: src/toolbox/tool-select.xml:194(para)
 msgid ""
 "Using <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo> "
 "together can do a variety of things, depending on which tool is used. Common "
@@ -2502,24 +2443,24 @@ msgstr ""
 "<keycap>Ctrl</keycap><keycap>Shift</keycap> y liberÃ¡ndolas tanto antes como "
 "despuÃ©s de soltar el <mousebutton>botÃ³n del mouse</mousebutton>."
 
-#: src/toolbox/tool-select.xml:222(term)
+#: src/toolbox/tool-select.xml:211(term)
 msgid "Key modifiers to move selections"
 msgstr ""
 
-#: src/toolbox/tool-select.xml:224(para)
+#: src/toolbox/tool-select.xml:213(para)
 msgid ""
-"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Click-and-drag</"
-"keycap></keycombo> and <keycombo><keycap>Shift</keycap><keycap>Alt</"
-"keycap><keycap>Click-and-drag</keycap></keycombo> are used to move "
-"selections. See <link linkend=\"gimp-using-selections-moving\">Moving "
-"selections</link>"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><mousebutton>Click-and-"
+"drag</mousebutton></keycombo> and <keycombo><keycap>Shift</"
+"keycap><keycap>Alt</keycap><mousebutton>Click-and-drag</mousebutton></"
+"keycombo> are used to move selections. See <xref linkend=\"gimp-using-"
+"selections-moving\"/>."
 msgstr ""
 
-#: src/toolbox/tool-select.xml:233(term) src/toolbox/tool-move.xml:77(primary)
+#: src/toolbox/tool-select.xml:230(term) src/toolbox/tool-move.xml:79(primary)
 msgid "Space bar"
 msgstr "Barra espaciadora"
 
-#: src/toolbox/tool-select.xml:235(para)
+#: src/toolbox/tool-select.xml:232(para)
 msgid ""
 "Pressing the <keycap>Space Bar</keycap> while using a selection tool "
 "transforms this tool into the Navigation cross as long as you press the bar, "
@@ -2531,7 +2472,7 @@ msgstr ""
 "cualquier herramienta de selecciÃ³n, se cambia momentÃ¡neamente a la "
 "herramienta para mover, hasta que la tecla se libere."
 
-#: src/toolbox/tool-select.xml:251(para)
+#: src/toolbox/tool-select.xml:247(para)
 msgid ""
 "Here we describe the tool options that apply to all selection tools: options "
 "that apply only to some tools, or that affect each tool differently, are "
@@ -2552,33 +2493,34 @@ msgstr ""
 "presentes para todas las herramientas, inclusive cuando algunas de ellas no "
 "tienen efecto en la herramienta."
 
-#: src/toolbox/tool-select.xml:264(phrase)
+#: src/toolbox/tool-select.xml:259(title)
 msgid "Common options of selection tools"
 msgstr ""
 
-#: src/toolbox/tool-select.xml:274(term)
-#: src/toolbox/tool-dodge-burn.xml:150(term)
-#: src/toolbox/tool-bucket-fill.xml:139(term)
-#: src/toolbox/tool-brush.xml:243(term)
+#: src/toolbox/tool-select.xml:269(term) src/toolbox/tool-brush.xml:243(term)
 msgid "Mode"
 msgstr "Modo"
 
-#: src/toolbox/tool-select.xml:277(primary)
-#: src/toolbox/tool-rect-select.xml:32(primary)
-#: src/toolbox/tool-fuzzy-select.xml:31(primary)
-#: src/toolbox/tool-free-select.xml:31(primary)
-#: src/toolbox/tool-foreground-select.xml:30(primary)
-#: src/toolbox/tool-eraser.xml:215(primary)
-#: src/toolbox/tool-ellipse-select.xml:32(primary)
-#: src/toolbox/tool-by-color-select.xml:32(primary)
+#: src/toolbox/tool-select.xml:272(primary)
+#: src/toolbox/tool-scale.xml:24(primary)
+#: src/toolbox/tool-rect-select.xml:21(primary)
+#: src/toolbox/tool-fuzzy-select.xml:22(primary)
+#: src/toolbox/tool-free-select.xml:22(primary)
+#: src/toolbox/tool-free-select.xml:26(primary)
+#: src/toolbox/tool-foreground-select.xml:21(primary)
+#: src/toolbox/tool-eraser.xml:249(primary)
+#: src/toolbox/tool-ellipse-select.xml:23(primary)
+#: src/toolbox/tool-by-color-select.xml:21(primary)
 msgid "Selection"
 msgstr ""
 
-#: src/toolbox/tool-select.xml:278(secondary)
-msgid "Selection modes"
-msgstr ""
+#: src/toolbox/tool-select.xml:273(secondary)
+#, fuzzy
+#| msgid "Mode"
+msgid "Modes"
+msgstr "Modo"
 
-#: src/toolbox/tool-select.xml:280(para)
+#: src/toolbox/tool-select.xml:275(para)
 msgid ""
 "This determines the way that the selection you create is combined with any "
 "pre-existing selection. Note that the functions performed by these buttons "
@@ -2593,7 +2535,7 @@ msgstr ""
 "modificadores, mientras que los usuarios novatos encuentran a los botones "
 "mÃ¡s fÃ¡ciles de usar."
 
-#: src/toolbox/tool-select.xml:297(para)
+#: src/toolbox/tool-select.xml:293(para)
 msgid ""
 "Replace mode will cause any existing selection to be destroyed or replaced "
 "when the new selection is created."
@@ -2601,7 +2543,7 @@ msgstr ""
 "El modo reemplazar hace que cualquier selecciÃ³n existente sea destruida o "
 "reemplazada cuando una selecciÃ³n nueva sea creada."
 
-#: src/toolbox/tool-select.xml:312(para)
+#: src/toolbox/tool-select.xml:309(para)
 msgid ""
 "Add mode will cause the new selection to be added to any existing selection "
 "regions."
@@ -2609,7 +2551,7 @@ msgstr ""
 "El modo aÃ±adir hace que la selecciÃ³n sea aÃ±adida a cualquier selecciÃ³n "
 "existente."
 
-#: src/toolbox/tool-select.xml:327(para)
+#: src/toolbox/tool-select.xml:325(para)
 msgid ""
 "Subtract mode will remove the new selection area from any existing selection "
 "regions."
@@ -2617,7 +2559,7 @@ msgstr ""
 "El modo de extracciÃ³n borra el Ã¡rea de selecciÃ³n nuevo de cualquier "
 "selecciÃ³n existente."
 
-#: src/toolbox/tool-select.xml:342(para)
+#: src/toolbox/tool-select.xml:341(para)
 msgid ""
 "Intersection mode will make a new selection from the area where the existing "
 "selection region and the new selection region overlap."
@@ -2625,7 +2567,7 @@ msgstr ""
 "El modo intersecciÃ³n hace una selecciÃ³n nueva del Ã¡rea en que la selecciÃ³n "
 "existente y la selecciÃ³n nueva se solapan."
 
-#: src/toolbox/tool-select.xml:355(para)
+#: src/toolbox/tool-select.xml:354(para)
 msgid ""
 "This option only affects a few of the selection tools: it causes the "
 "boundary of the selection to be drawn more smoothly."
@@ -2633,15 +2575,15 @@ msgstr ""
 "Esta opciÃ³n sÃ³lo afecta a unas pocas herramientas de selecciÃ³n: hace que los "
 "contornos de la selecciÃ³n se dibujen mÃ¡s suavemente."
 
-#: src/toolbox/tool-select.xml:362(term)
+#: src/toolbox/tool-select.xml:361(term)
 msgid "Feather Edges"
 msgstr "Difuminar bordes"
 
-#: src/toolbox/tool-select.xml:365(primary)
+#: src/toolbox/tool-select.xml:364(primary)
 msgid "Edge feathering (Selections)"
 msgstr ""
 
-#: src/toolbox/tool-select.xml:367(para)
+#: src/toolbox/tool-select.xml:366(para)
 msgid ""
 "This options allows the boundary of the selection to be blurred, so that "
 "points near the boundary are only partially selected. For further "
@@ -2653,79 +2595,45 @@ msgstr ""
 "mayor informaciÃ³n sobre difuminado, dirÃjase a la entrada del <link linkend="
 "\"glossary-feathering\">glosario</link>."
 
-#: src/toolbox/tool-select.xml:379(phrase)
-msgid "Additional information"
-msgstr "InformaciÃ³n adicional"
-
-#: src/toolbox/tool-select.xml:382(para)
-msgid ""
-"When moving a selection beyond the boundaries of the image canvas, the "
-"selection will be cropped to the image area. Selections can exist on the "
-"visible canvas only. Selection movements and changes are, however, kept in "
-"the undo buffer should you need to repair an error."
-msgstr ""
-"Al mover una selecciÃ³n mas allÃ¡ de los contornos de la imagen, la selecciÃ³n "
-"serÃ¡ recortada al Ã¡rea de la imagen. Las selecciones pueden existir "
-"solamente sobre el Ã¡rea visible. Sin embargo, los movimientos de la "
-"selecciÃ³n y sus cambios se conservan en el historial de deshacer, en caso de "
-"que se necesite revertir un error."
-
-#: src/toolbox/tools-color.xml:10(phrase)
-msgid "Color Tools"
-msgstr "Herramientas de color"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-scale.xml:39(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-scale.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-scale.xml:75(None) src/toolbox/tool-scale.xml:126(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-scale-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-scale.xml:115(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-scale.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-scale.xml:168(None)
-msgid ""
-"@@image: 'images/toolbox/tool-dialog-scale.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-scale.xml:24(phrase) src/toolbox/tool-brush.xml:505(term)
+#: src/toolbox/tool-scale.xml:15(title)
+#: src/toolbox/tool-scale.xml:18(secondary)
+#: src/toolbox/tool-scale.xml:21(secondary)
+#: src/toolbox/tool-scale.xml:24(secondary)
+#: src/toolbox/tool-scale.xml:27(secondary)
+#: src/toolbox/tool-brush.xml:312(term)
 msgid "Scale"
 msgstr "Escalar"
 
-#: src/toolbox/tool-scale.xml:28(secondary)
-msgid "Scale layer, selection contour or path"
+#: src/toolbox/tool-scale.xml:21(primary)
+#: src/toolbox/tool-move.xml:216(primary)
+msgid "Layer"
 msgstr ""
 
-#: src/toolbox/tool-scale.xml:31(primary)
+#: src/toolbox/tool-scale.xml:27(primary)
+#: src/toolbox/tool-path.xml:21(secondary)
+#: src/toolbox/tool-move.xml:256(primary)
+msgid "Path"
+msgstr "Rutas"
+
+#: src/toolbox/tool-scale.xml:30(primary)
 msgid "Scale Layer, selection contour or path"
 msgstr ""
 
-#: src/toolbox/tool-scale.xml:35(phrase)
+#: src/toolbox/tool-scale.xml:34(title)
 msgid "The Scale tool in Toolbox"
 msgstr "La herramienta escalar en la caja de herramientas"
 
-#: src/toolbox/tool-scale.xml:47(para)
+#: src/toolbox/tool-scale.xml:43(title) src/toolbox/tool-rotate.xml:35(title)
+msgid "Overview"
+msgstr "Generalidades"
+
+#: src/toolbox/tool-scale.xml:44(para)
 msgid ""
 "The Scale Tool is used to scale layers, selections or paths (the Object)."
 msgstr ""
 "La herramienta escalar se utiliza para escalar capas, selecciones o rutas"
 
-#: src/toolbox/tool-scale.xml:51(para)
+#: src/toolbox/tool-scale.xml:48(para)
 msgid ""
 "When you click on image with the tool the Scaling Information dialog box is "
 "opened, allowing to change separately <guilabel>Width</guilabel> and "
@@ -2742,51 +2650,64 @@ msgstr ""
 "para cambiar las dimensiones. Aparece un pequeÃ±o circulo en el centro de la "
 "vista previa que permite moverla."
 
-#: src/toolbox/tool-scale.xml:67(para)
+#: src/toolbox/tool-scale.xml:61(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Scale Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-scale.xml:66(para)
+#, fuzzy
+#| msgid ""
+#| "In the the image-menu through: <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Shear</"
+#| "guimenuitem></menuchoice>,"
 msgid ""
-"You can access the Scale tool from the image-menu through: "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</"
-"accel>ransform Tools</guisubmenu><guimenuitem><accel>S</accel>cale</"
+"from the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Scale</"
 "guimenuitem></menuchoice>,"
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>eramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>t</accel>ransformaciÃ³n</"
-"guisubmenu><guimenuitem>E<accel>s</accel>calar</guimenuitem></menuchoice>"
+"En el menÃº de imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
+"guimenu><guisubmenu>Herramientas de <accel>T</accel>ransformaciÃ³n</"
+"guisubmenu><guimenuitem><accel>I</accel>nclinar</guimenuitem></menuchoice>,"
 
-#: src/toolbox/tool-scale.xml:73(para)
-msgid "or by clicking the tool icon: <placeholder-1/> in the Toolbox,"
-msgstr "Pulsando sobre el icono de la herramienta: <placeholder-1/>"
+#: src/toolbox/tool-scale.xml:76(para)
+msgid ""
+"by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-scale-22.png\"/></guiicon> in the Toolbox,"
+msgstr ""
 
-#: src/toolbox/tool-scale.xml:79(para)
+#: src/toolbox/tool-scale.xml:85(para)
+#, fuzzy
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>T</keycap></"
+#| "keycombo> key combination."
 msgid ""
-"or by using the <keycombo><keycap>Shift</keycap><keycap>T</keycap></"
-"keycombo> key combination."
+"by using the <keycombo><keycap>Shift</keycap><keycap>T</keycap></keycombo> "
+"key combination."
 msgstr ""
 "o mediante la combinaciÃ³n de teclas <keycombo><keycap>Mayus</"
 "keycap><keycap>T</keycap></keycombo>."
 
-#: src/toolbox/tool-scale.xml:97(para)
+#: src/toolbox/tool-scale.xml:102(para)
+#, fuzzy
+#| msgid ""
+#| "When moving a corner, holding the <keycap>Ctrl</keycap> key down will "
+#| "toggle the <guilabel>Keep Aspect</guilabel> option."
 msgid ""
-"When moving a corner, holding the <keycap>Ctrl</keycap> key down will toggle "
-"the <guilabel>Keep Aspect</guilabel> option."
+"Holding the <keycap>Ctrl</keycap> key down will toggle the <guilabel>Keep "
+"Aspect</guilabel> option."
 msgstr ""
 "Manteniendo pulsado <keycap>Ctrl</keycap> se mantendrÃ¡ constante la altura."
 
-#: src/toolbox/tool-scale.xml:111(phrase)
-msgid "Scale tool options"
-msgstr "Opciones de la herramienta escalar"
-
-#: src/toolbox/tool-scale.xml:123(para)
-msgid ""
-"The available tool options for the Scale Tool can be accessed by double "
-"clicking the Scale Tool icon <placeholder-1/> in Toolbox."
-msgstr ""
-"Se puede acceder a las opciones disponibles para la herramienta escalar con "
-"una doble pulsaciÃ³n sobre el icono de la herramienta <placeholder-1/> en la "
-"caja de herramientas."
+#: src/toolbox/tool-scale.xml:115(phrase)
+#, fuzzy
+#| msgid "Tool Options for the Clone tool"
+msgid "Tool options for the Scale tool"
+msgstr "Opciones de la herramienta para clonar"
 
-#: src/toolbox/tool-scale.xml:132(term)
-#: src/toolbox/tool-perspective.xml:121(term)
+#: src/toolbox/tool-scale.xml:129(term)
+#: src/toolbox/tool-perspective.xml:99(term)
 #, fuzzy
 msgid "Transform; Interpolation; Direction; Clipping; Preview"
 msgstr ""
@@ -2797,17 +2718,19 @@ msgstr ""
 "Afectar; interpolaciÃ³n; direcciÃ³n de transformaciÃ³n; supermuestreo; "
 "resultado del recorte; vista previa"
 
-#: src/toolbox/tool-scale.xml:137(para)
+#: src/toolbox/tool-scale.xml:134(para)
 msgid ""
 "The Transform mode works on the active layer only. To work on all layers of "
 "the image, use <link linkend=\"gimp-image-scale\">Scale image</link>."
 msgstr ""
 
-#: src/toolbox/tool-scale.xml:146(term)
-msgid "Keep Aspect"
+#: src/toolbox/tool-scale.xml:144(term)
+#, fuzzy
+#| msgid "Keep Aspect"
+msgid "Keep Aspect (Ctrl)"
 msgstr "Mantener proporciÃ³n"
 
-#: src/toolbox/tool-scale.xml:148(para)
+#: src/toolbox/tool-scale.xml:146(para)
 msgid ""
 "<guilabel>Keep Aspect</guilabel>: when you move a corner of the selection "
 "frame, this option will constrain the scale such as the Height/Width ratio "
@@ -2817,16 +2740,15 @@ msgstr ""
 "<guilabel>Mantener proporciÃ³n</guilabel> mantendrÃ¡ el radio de la altura y "
 "la anchura constantes durante el escalado."
 
-#: src/toolbox/tool-scale.xml:160(phrase)
-#: src/toolbox/tool-scale.xml:164(phrase)
+#: src/toolbox/tool-scale.xml:159(title) src/toolbox/tool-scale.xml:161(title)
 msgid "The Scaling Information dialog window"
 msgstr "La ventana del diÃ¡logo de informaciÃ³n de escalado"
 
-#: src/toolbox/tool-scale.xml:174(term)
+#: src/toolbox/tool-scale.xml:171(term)
 msgid "Width/Height"
 msgstr "Anchura y altura"
 
-#: src/toolbox/tool-scale.xml:176(para)
+#: src/toolbox/tool-scale.xml:173(para)
 msgid ""
 "Here, you can set Width and Height you want to give to the object. The "
 "default unit of measurement is pixel. You can change it by using the drop-"
@@ -2835,60 +2757,17 @@ msgid ""
 "Width and Height separately."
 msgstr "AquÃ, se muestra la anchura y altura original."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rotate.xml:40(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-rotate.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rotate.xml:71(None) src/toolbox/tool-rotate.xml:122(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-rotate-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rotate.xml:111(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-rotate.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rotate.xml:175(None)
-msgid ""
-"@@image: 'images/toolbox/tool-dialog-rotate.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-rotate.xml:19(date)
-#: src/toolbox/tool-perspective.xml:18(date)
-#: src/toolbox/tool-color-balance.xml:17(date)
-#, fuzzy
-msgid "2008-01-13"
-msgstr ""
-"#-#-#-#-#  tool-color-balance.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-14\n"
-"#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-22\n"
-"#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-19"
-
-#: src/toolbox/tool-rotate.xml:25(phrase)
-#: src/toolbox/tool-rotate.xml:29(secondary)
-#: src/toolbox/tool-rotate.xml:32(primary)
+#: src/toolbox/tool-rotate.xml:16(title)
+#: src/toolbox/tool-rotate.xml:19(secondary)
+#: src/toolbox/tool-rotate.xml:22(primary)
 msgid "Rotate"
 msgstr "Rotar"
 
-#: src/toolbox/tool-rotate.xml:36(phrase)
+#: src/toolbox/tool-rotate.xml:26(title)
 msgid "The Rotate tool in Toolbox"
 msgstr "La herramienta rotar en la caja de herramientas"
 
-#: src/toolbox/tool-rotate.xml:48(para)
+#: src/toolbox/tool-rotate.xml:36(para)
 msgid ""
 "This tool is used to rotate the active layer, a selection or a path. When "
 "you click on the image or the selection with this tool a <emphasis>Rotation "
@@ -2904,61 +2783,72 @@ msgstr ""
 "lo mismo arrastrando el puntero del ratÃ³n sobre la imagen o el punto de "
 "rotaciÃ³n."
 
-#: src/toolbox/tool-rotate.xml:63(para)
+#: src/toolbox/tool-rotate.xml:48(para)
+#: src/toolbox/tool-rect-select.xml:52(para)
+msgid "You can access to the Selection Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-rotate.xml:53(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"You can can access the Rotate tool from the image-menu through: "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</"
-"accel>ransform Tools</guisubmenu><guimenuitem><accel>R</accel>otate</"
+"from the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Rotate</"
 "guimenuitem></menuchoice>,"
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>t</accel>ransformaciÃ³n</"
-"guisubmenu><guimenuitem><accel>R</accel>otar</guimenuitem></menuchoice>"
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-rotate.xml:69(para)
-msgid "or by clicking the tool icon: <placeholder-1/> in the Toolbox."
+#: src/toolbox/tool-rotate.xml:63(para)
+msgid ""
+"by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-rotate-22.png\"/></guiicon> in the Toolbox,"
 msgstr ""
-"Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
-"herramientas."
 
-#: src/toolbox/tool-rotate.xml:75(para)
+#: src/toolbox/tool-rotate.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>R</keycap></"
+#| "keycombo> key combination."
 msgid ""
-"or by using the <keycombo><keycap>Shift</keycap><keycap>R</keycap></"
-"keycombo> key combination."
+"by using the <keycombo><keycap>Shift</keycap><keycap>R</keycap></keycombo> "
+"key combination."
 msgstr ""
 "o usando la combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>R</"
 "keycap></keycombo>."
 
-#: src/toolbox/tool-rotate.xml:93(para)
+#: src/toolbox/tool-rotate.xml:89(para)
+#, fuzzy
+#| msgid ""
+#| "Holding <keycap>Ctrl</keycap> will constrain the rotation angles to those "
+#| "only evenly divisible by 15 degrees."
 msgid ""
-"Holding <keycap>Ctrl</keycap> will constrain the rotation angles to those "
-"only evenly divisible by 15 degrees."
+"Holding <keycap>Ctrl</keycap> will constrain the rotation angle to 15 "
+"degrees increments."
 msgstr ""
 "Mantener pulsado <keycap>Ctrl</keycap> limitarÃ¡ los Ã¡ngulos de rotaciÃ³n a "
 "aquellos, a los divisibles por 15 grados."
 
-#: src/toolbox/tool-rotate.xml:107(phrase)
+#: src/toolbox/tool-rotate.xml:101(title)
 msgid "Rotation tool options"
 msgstr "Opciones de la herramienta rotaciÃ³n"
 
-#: src/toolbox/tool-rotate.xml:119(para)
-msgid ""
-"The available tool options for the Rotate Tool can be accessed by double "
-"clicking the Rotate Tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede acceder a las opciones de la herramienta rotar mediante una doble "
-"pulsaciÃ³n sobre el icono de la herramienta. <placeholder-1/>"
-
-#: src/toolbox/tool-rotate.xml:127(term)
+#: src/toolbox/tool-rotate.xml:114(term)
 msgid "Transform; Direction, Interpolation; Clipping; Preview"
 msgstr ""
 "Afectar; interpolaciÃ³n; supermuestreo; resultado del recorte; vista previa"
 
-#: src/toolbox/tool-rotate.xml:135(term)
+#: src/toolbox/tool-rotate.xml:122(term)
 msgid "Transform Direction"
 msgstr "DirecciÃ³n de transformaciÃ³n"
 
-#: src/toolbox/tool-rotate.xml:137(para)
+#: src/toolbox/tool-rotate.xml:124(para)
 msgid ""
 "The Transform Direction sets which way or direction a layer is rotated. The "
 "Normal mode will rotate the layer as one might expect. If a layer is rotated "
@@ -2970,7 +2860,7 @@ msgstr ""
 "esperar. Si se rota la capa 10 grados, la capa se representarÃ¡ asÃ. Este "
 "comportamiento es contrario a la rotaciÃ³n correctiva."
 
-#: src/toolbox/tool-rotate.xml:144(para)
+#: src/toolbox/tool-rotate.xml:131(para)
 msgid ""
 "Corrective Rotation is primarily used to repair digital images that are not "
 "straight. If the image is 13 degrees askew then you need not try to rotate "
@@ -2986,27 +2876,31 @@ msgstr ""
 "realiza a la inversa la imagen se rotarÃ¡ con el Ã¡ngulo suficiente para "
 "corregir el errror."
 
-#: src/toolbox/tool-rotate.xml:156(term)
+#: src/toolbox/tool-rotate.xml:143(term)
 msgid "Constraints"
 msgstr "Restricciones"
 
-#: src/toolbox/tool-rotate.xml:158(para)
+#: src/toolbox/tool-rotate.xml:145(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>15 Degrees</guilabel> will constrain the rotation to angles "
+#| "divisible by 15 degrees."
 msgid ""
-"<guilabel>15 Degrees</guilabel> will constrain the rotation to angles "
+"<guilabel>15 Degrees (Ctrl)</guilabel> will constrain the rotation to angles "
 "divisible by 15 degrees."
 msgstr ""
 "<guilabel>15 grados</guilabel> limitarÃ¡ el Ã¡ngulo de rotaciÃ³n a los "
 "divisibles por 15."
 
-#: src/toolbox/tool-rotate.xml:167(phrase)
+#: src/toolbox/tool-rotate.xml:154(title)
 msgid "The Rotation Information window"
 msgstr "La ventana de informaciÃ³n de rotar"
 
-#: src/toolbox/tool-rotate.xml:171(phrase)
+#: src/toolbox/tool-rotate.xml:156(title)
 msgid "The Rotation Information dialog window"
 msgstr "La ventana del diÃ¡logo de la informaciÃ³n de Rotar"
 
-#: src/toolbox/tool-rotate.xml:181(term) src/toolbox/tool-ink.xml:122(term)
+#: src/toolbox/tool-rotate.xml:166(term) src/toolbox/tool-ink.xml:108(term)
 #, fuzzy
 msgid "Angle"
 msgstr ""
@@ -3015,17 +2909,17 @@ msgstr ""
 "#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Angulo"
 
-#: src/toolbox/tool-rotate.xml:183(para)
+#: src/toolbox/tool-rotate.xml:168(para)
 msgid "Here you can set the rotation angle, from -180Â° to +180Â°, i.e 360Â°."
 msgstr ""
 "AquÃ puede seleccionar el Ã¡ngulo de rotaciÃ³n, desde -180Â° to +180Â°, p.e. "
 "360Â°."
 
-#: src/toolbox/tool-rotate.xml:190(term)
+#: src/toolbox/tool-rotate.xml:175(term)
 msgid "Center X/Y"
 msgstr "Centro X/Y"
 
-#: src/toolbox/tool-rotate.xml:192(para)
+#: src/toolbox/tool-rotate.xml:177(para)
 msgid ""
 "This option allows you to set the position of the rotation center, "
 "represented by a large point in the image. A click-and-drag on this point "
@@ -3037,127 +2931,50 @@ msgstr ""
 "punto permite mover este centro. La unidad de medida predeterminada es el "
 "pÃxel pero se puede cambiar usando la lista desplegable."
 
-#: src/toolbox/tool-rotate.xml:203(para)
+#: src/toolbox/tool-rotate.xml:188(para)
+#, fuzzy
+#| msgid ""
+#| "You can access this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
+#| "guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
 msgid ""
 "You can also rotate layers with <menuchoice><guimenu>Layer</"
-"guimenu><guisubmenu>Transform</guisubmenu><guimenuitem>Rotate 90Â°, 180Â°, "
-"Arbitrary</guimenuitem></menuchoice>"
+"guimenu><guisubmenu>Transform</guisubmenu><guimenuitem>Arbitrary Rotation..."
+"</guimenuitem></menuchoice>"
 msgstr ""
+"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
+"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:41(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-rectsel.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:86(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-rect-select-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:116(None)
-msgid ""
-"@@image: 'images/toolbox/cursor-select-rect-minus.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:130(None)
-msgid ""
-"@@image: 'images/toolbox/cursor-select-rect-plus.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:157(None)
-msgid ""
-"@@image: 'images/toolbox/cursor-select-rect-intersect.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:174(None)
-msgid ""
-"@@image: 'images/toolbox/rectangle-selection.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:180(None)
-msgid "@@image: 'images/toolbox/cross-pt.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:204(None)
-msgid "@@image: 'images/toolbox/corner-pt.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:210(None)
-msgid "@@image: 'images/toolbox/side-pt.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:217(None)
-msgid "@@image: 'images/toolbox/pointer.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:239(None)
-msgid "@@image: 'images/toolbox/select-area.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-rect-select.xml:267(None) src/toolbox/intro.xml:93(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-rectsel.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-rect-select.xml:19(date)
-msgid "2008-03-19"
-msgstr "2006-10-13"
-
-#: src/toolbox/tool-rect-select.xml:20(authorinitials)
-msgid "JPL"
-msgstr "manuelq"
-
-#: src/toolbox/tool-rect-select.xml:25(phrase)
-#: src/toolbox/tool-rect-select.xml:29(secondary)
+#: src/toolbox/tool-rect-select.xml:15(title)
+#: src/toolbox/tool-rect-select.xml:18(secondary)
 msgid "Rectangle Selection"
 msgstr "Herramienta de selecciÃ³n rectangular"
 
-#: src/toolbox/tool-rect-select.xml:33(secondary)
+#: src/toolbox/tool-rect-select.xml:22(secondary)
 msgid "Rectangle selection"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:37(phrase)
+#: src/toolbox/tool-rect-select.xml:26(title)
 msgid "Rectangle Select icon in the Toolbox"
 msgstr "El icono de la herramienta de selecciÃ³n rectangular en la caja."
 
-#: src/toolbox/tool-rect-select.xml:45(para)
-msgid ""
-"The Rectangle Selection tool is designed to select rectangular regions of an "
-"image: it is the most basic of the selection tools, but very commonly used. "
-"For information on selections and how they are used in GIMP see <link "
-"linkend=\"gimp-concepts-selection\">Selections</link>; for information on "
-"features common to all selection tools see <link linkend=\"gimp-tool-select"
-"\">Selection Tools</link>."
+#: src/toolbox/tool-rect-select.xml:33(para)
+#, fuzzy
+#| msgid ""
+#| "The Rectangle Selection tool is designed to select rectangular regions of "
+#| "an image: it is the most basic of the selection tools, but very commonly "
+#| "used. For information on selections and how they are used in GIMP see "
+#| "<link linkend=\"gimp-concepts-selection\">Selections</link>; for "
+#| "information on features common to all selection tools see <link linkend="
+#| "\"gimp-tool-select\">Selection Tools</link>."
+msgid ""
+"The Rectangle Selection tool is designed to select rectangular regions of "
+"the active layer: it is the most basic of the selection tools, but very "
+"commonly used. For information on selections and how they are used in GIMP "
+"see <link linkend=\"gimp-concepts-selection\">Selections</link>; for "
+"information on features common to all selection tools see <link linkend="
+"\"gimp-tool-select\">Selection Tools</link>."
 msgstr ""
 "La herramienta de selecciÃ³n rectangular estÃ¡ diseÃ±ada para seleccionar "
 "regiones rectangulares de una imagen: es la mÃ¡s bÃ¡sica de las herramientas "
@@ -3167,7 +2984,7 @@ msgstr ""
 "las herramientas de selecciÃ³n tienen en comÃºn se describe en la secciÃ³n "
 "<link linkend=\"gimp-tool-select\">Herramientas de selecciÃ³n</link>."
 
-#: src/toolbox/tool-rect-select.xml:53(para)
+#: src/toolbox/tool-rect-select.xml:41(para)
 msgid ""
 "This tool is also used for rendering a rectangle on an image. To render a "
 "filled rectangle, create a rectangular selection, and then fill it using the "
@@ -3183,81 +3000,73 @@ msgstr ""
 "flexible es crear una selecciÃ³n rectangular y luego <link linkend=\"gimp-"
 "selection-stroke\">trazarla</link>."
 
-#: src/toolbox/tool-rect-select.xml:61(para)
-msgid ""
-"If you want a rectangular selection with convex rounded corners, check the "
-"option <guilabel>Rounded Corners</guilabel> ; you can choose radius of "
-"rounded corners with the cursor. If you want concave rounded corners, use "
-"<menuchoice><guimenu>Select</guimenu><guimenuitem>Rounded Rectangle</"
-"guimenuitem></menuchoice> from the image menu, <guilabel>Concave</guilabel> "
-"and choose radius of rounded corners with the cursor."
-msgstr ""
-"Si desea redondear las esquinas de una selecciÃ³n rectangular, el mÃ©todo mÃ¡s "
-"fÃ¡cil es emplear <menuchoice><guimenu>Seleccionar</"
-"guimenu><guimenuitem>RectÃ¡ngulo redondeado</guimenuitem></menuchoice> del "
-"menÃº de la imagen."
-
-#: src/toolbox/tool-rect-select.xml:71(phrase)
-#: src/toolbox/tool-iscissors.xml:83(phrase)
-#: src/toolbox/tool-fuzzy-select.xml:82(phrase)
-#: src/toolbox/tool-free-select.xml:72(phrase)
-#: src/toolbox/tool-eraser.xml:80(phrase)
-#: src/toolbox/tool-ellipse-select.xml:72(phrase)
-#: src/toolbox/tool-convolve.xml:82(phrase)
-#: src/toolbox/tool-clone.xml:76(phrase)
-#: src/toolbox/tool-by-color-select.xml:61(phrase)
+#: src/toolbox/tool-rect-select.xml:51(title)
+#: src/toolbox/tool-iscissors.xml:64(title)
+#: src/toolbox/tool-fuzzy-select.xml:76(phrase)
+#: src/toolbox/tool-free-select.xml:91(title)
+#: src/toolbox/tool-eraser.xml:98(title)
+#: src/toolbox/tool-ellipse-select.xml:66(title)
+#: src/toolbox/tool-clone.xml:79(title)
+#: src/toolbox/tool-by-color-select.xml:50(title)
+#: src/toolbox/tool-bucket-fill.xml:64(title)
 #, fuzzy
-msgid "How to Activate"
+msgid "Activating the tool"
 msgstr ""
-"#-#-#-#-#  tool-by-color-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de herramienta\n"
-"#-#-#-#-#  tool-convolve.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-ellipse-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-eraser.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-free-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-fuzzy-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Activar herramienta\n"
+"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Activar la herramienta\n"
+"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-iscissors.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-rect-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "ActivaciÃ³n de la herramienta"
 
-#: src/toolbox/tool-rect-select.xml:73(para)
-msgid "You can access to the Selection Tool in different ways:"
-msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
-
-#: src/toolbox/tool-rect-select.xml:78(para)
+#: src/toolbox/tool-rect-select.xml:57(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu bar <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
+#| "guimenuitem></menuchoice>;"
 msgid ""
-"From the image menu bar <menuchoice><guimenu>Tools</"
-"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
-"guimenuitem></menuchoice>;"
+"from the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rectangle "
+"Select</guimenuitem></menuchoice>,"
 msgstr ""
 "Desde el menÃº de la imagen <menuchoice><guimenu>Herramientas</"
 "guimenu><guisubmenu>Herramientas de selecciÃ³n</"
 "guisubmenu><guimenuitem>SelecciÃ³n rectangular</guimenuitem></menuchoice>."
 
-#: src/toolbox/tool-rect-select.xml:84(para)
-msgid "By clicking on the tool icon <placeholder-1/> in the ToolBox,"
-msgstr "Clicando en el icono <placeholder-1/> de la caja de herramientas."
+#: src/toolbox/tool-rect-select.xml:67(para)
+msgid ""
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-rect-select-22.png\"/></guiicon> in the ToolBox,"
+msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:91(para)
-msgid "By using the keyboard shortcut <keycap>R</keycap>."
+#: src/toolbox/tool-rect-select.xml:76(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid "by using the keyboard shortcut <keycap>R</keycap>."
 msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
 
-#: src/toolbox/tool-rect-select.xml:108(para)
+#: src/toolbox/tool-rect-select.xml:92(para)
+#, fuzzy
+#| msgid ""
+#| "Pressing the Ctrl key after starting your selection, and holding it down "
+#| "until you are finished, causes your starting point to be used as the "
+#| "center of the selected rectangle, instead of a corner. Note that if you "
+#| "press the Ctrl key <emphasis>before</emphasis> starting to make the "
+#| "selection, the resulting selection will be subtracted from the existing "
+#| "selection. The cursor becomes <placeholder-1/>"
 msgid ""
 "Pressing the Ctrl key after starting your selection, and holding it down "
 "until you are finished, causes your starting point to be used as the center "
 "of the selected rectangle, instead of a corner. Note that if you press the "
 "Ctrl key <emphasis>before</emphasis> starting to make the selection, the "
 "resulting selection will be subtracted from the existing selection. The "
-"cursor becomes <placeholder-1/>"
+"cursor becomes <guiicon><inlinegraphic fileref=\"images/toolbox/cursor-"
+"select-rect-minus.png\"/></guiicon>"
 msgstr ""
 "presionar la tecla Ctrl luego de haber comenzado la selecciÃ³n, y mantenerla "
 "presionada hasta que se haya terminado la selecciÃ³n, hace que el punto de "
@@ -3265,11 +3074,17 @@ msgstr ""
 "Note que si presiona la tecla Ctrl <emphasis>antes</emphasis> de haber "
 "comenzado la selecciÃ³n, Ã©sta se sustraerÃ¡ a la selecciÃ³n existente."
 
-#: src/toolbox/tool-rect-select.xml:125(para)
+#: src/toolbox/tool-rect-select.xml:112(para)
+#, fuzzy
+#| msgid ""
+#| "If you press the <keycap>Shift</keycap> key <emphasis>before</emphasis> "
+#| "starting the selection, the resulting selection will be added to the "
+#| "existing one. The cursor becomes <placeholder-1/>"
 msgid ""
 "If you press the <keycap>Shift</keycap> key <emphasis>before</emphasis> "
 "starting the selection, the resulting selection will be added to the "
-"existing one. The cursor becomes <placeholder-1/>"
+"existing one. The cursor becomes <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/cursor-select-rect-plus.png\"/></guiicon>"
 msgstr ""
 "presionar la tecla Shift luego de haber comenzado la selecciÃ³n, y mantenerla "
 "presionada hasta finalizar la selecciÃ³n, restringe los lados del rectÃ¡ngulo "
@@ -3277,7 +3092,7 @@ msgstr ""
 "<emphasis>antes</emphasis> de comenzar la selecciÃ³n, Ã©sta se aÃ±adirÃ¡ a la "
 "selecciÃ³n existente."
 
-#: src/toolbox/tool-rect-select.xml:132(para)
+#: src/toolbox/tool-rect-select.xml:121(para)
 msgid ""
 "Pressing the <keycap>Shift</keycap> key <emphasis>after </emphasis> starting "
 "your selection, toggles the <guilabel>Fixed </guilabel> option, and holding "
@@ -3287,13 +3102,21 @@ msgid ""
 "selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:151(para)
+#: src/toolbox/tool-rect-select.xml:140(para)
+#, fuzzy
+#| msgid ""
+#| "Pressing both keys after starting your selection combines the two "
+#| "effects, giving you a square selection centered on your starting point. "
+#| "Note that pressing these keys before starting your selection intersects "
+#| "the resulting selection with the existing one and the pointer change "
+#| "shape accordingly : <placeholder-1/>."
 msgid ""
 "Pressing both keys after starting your selection combines the two effects, "
 "giving you a square selection centered on your starting point. Note that "
 "pressing these keys before starting your selection intersects the resulting "
 "selection with the existing one and the pointer change shape accordingly : "
-"<placeholder-1/>."
+"<guiicon><inlinegraphic fileref=\"images/toolbox/cursor-select-rect-"
+"intersect.png\"/></guiicon>"
 msgstr ""
 "presionar ambas teclas luego de haber comenzado la selecciÃ³n produce la "
 "combinaciÃ³n de los dos efectos, y la selecciÃ³n es un cuadrado centrado en el "
@@ -3301,30 +3124,31 @@ msgstr ""
 "selecciÃ³n da como resultado la intersecciÃ³n de la selecciÃ³n actual con la "
 "existente."
 
-#: src/toolbox/tool-rect-select.xml:166(phrase)
+#: src/toolbox/tool-rect-select.xml:157(phrase)
 msgid "Tool manipulation"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:170(phrase)
+#: src/toolbox/tool-rect-select.xml:161(phrase)
 msgid "Example of Rectangle Selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:178(para)
+#: src/toolbox/tool-rect-select.xml:169(para)
 msgid ""
 "When this tool is selected the mouse pointer is displayed like this: "
-"<placeholder-1/> as soon as it is over the image. A drag and drop allows to "
-"get a rectangular (or square) shape. When the mouse button is relaxed, a "
-"dotted line (<quote>marching ants</quote>) outlines the selection. It's not "
-"necessary to adjust the selection with care; you can resize it easily later."
+"<guiicon><inlinegraphic fileref=\"images/toolbox/cross-pt.png\"/></guiicon> "
+"as soon as it is over the image. A drag and drop allows to get a rectangular "
+"(or square) shape. When the mouse button is relaxed, a dotted line "
+"(<quote>marching ants</quote>) outlines the selection. It's not necessary to "
+"adjust the selection with care; you can resize it easily later."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:187(para)
+#: src/toolbox/tool-rect-select.xml:181(para)
 msgid ""
 "When the pointer is moving on the canvas, the pointer and selection aspects "
 "change:"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:191(para)
+#: src/toolbox/tool-rect-select.xml:185(para)
 msgid ""
 "- outside the selection it looks like previously; this allows to design a "
 "new selection but will erase the existing one if this isn't combined with an "
@@ -3332,29 +3156,32 @@ msgid ""
 "in the previous paragraph."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:197(para)
+#: src/toolbox/tool-rect-select.xml:191(para)
 msgid ""
 "- within selection peripheral parts, the mouse pointer changes into various "
 "shapes when overflying rectangular sensitive and clearly marked areas. These "
 "<emphasis>handles</emphasis> allow you to resize the selection. In selection "
 "corners the pointer changes into a shape according to the context; for "
-"instance in the low right corner it becomes: <placeholder-1/>. So, by click-"
-"and-dragging these areas, you can magnify or shrink the selection size. Over "
-"median selection parts, lateral, low or up, pointer is changed into "
-"appropriate shapes according to the context. For instance, when the mouse "
-"pointer is over the median right side, the pointer looks like: <placeholder-"
-"2/>. So you can click-and-drag to magnify or to shrink the selection size by "
-"moving the chosen boundary."
+"instance in the low right corner it becomes: <guiicon><inlinegraphic fileref="
+"\"images/toolbox/corner-pt.png\"/></guiicon>. So, by click-and-dragging "
+"these areas, you can magnify or shrink the selection size. Over median "
+"selection parts, lateral, low or up, pointer is changed into appropriate "
+"shapes according to the context. For instance, when the mouse pointer is "
+"over the median right side, the pointer looks like: <guiicon><inlinegraphic "
+"fileref=\"images/toolbox/side-pt.png\"/></guiicon>. So you can click-and-"
+"drag to magnify or to shrink the selection size by moving the chosen "
+"boundary."
 msgstr ""
 
 #: src/toolbox/tool-rect-select.xml:214(para)
 msgid ""
 "- inside selection central area the mouse pointer looks like usual for "
-"object manipulation, i.e.: <placeholder-1/>. So you can move the whole "
-"selection by a click-and-drag."
+"object manipulation, i.e.: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"pointer.png\"/></guiicon>. So you can move the whole selection by a click-"
+"and-drag."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:220(para)
+#: src/toolbox/tool-rect-select.xml:223(para)
 msgid ""
 "Moreover, if you have not unchecked the <guilabel>Highlight</guilabel> "
 "option, your work will be easier because what is out the selection will be "
@@ -3362,24 +3189,24 @@ msgid ""
 "highlighted."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:227(para)
+#: src/toolbox/tool-rect-select.xml:230(para)
 msgid ""
 "If you use moving keys you can move the selection or modify its size by one "
 "pixel step. If you use it in combination with <keycap>Shift</keycap> you can "
 "move it by a 25 pixel step."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:235(phrase)
+#: src/toolbox/tool-rect-select.xml:238(phrase)
 msgid "Sensitive selection areas"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:242(para)
+#: src/toolbox/tool-rect-select.xml:245(para)
 msgid ""
 "Display of all possible pointers in function of their localization with "
 "respect to the selection area."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:249(para)
+#: src/toolbox/tool-rect-select.xml:252(para)
 msgid ""
 "After creating and modifying the selection, you will have to exit this "
 "editing mode (and commit any changes). You can do this with a single click "
@@ -3388,45 +3215,46 @@ msgid ""
 "selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:263(phrase)
+#: src/toolbox/tool-rect-select.xml:264(title)
 msgid "Tool Options for the Rectangle Select tool"
 msgstr "Las opciones de la herramienta de selecciÃ³n rectangular."
 
-#: src/toolbox/tool-rect-select.xml:274(term)
-#: src/toolbox/tool-fuzzy-select.xml:152(term)
-#: src/toolbox/tool-foreground-select.xml:229(term)
-msgid "Mode; Antialias; Feather edges"
+#: src/toolbox/tool-rect-select.xml:277(term)
+#: src/toolbox/tool-fuzzy-select.xml:173(term)
+#: src/toolbox/tool-foreground-select.xml:222(term)
+#: src/toolbox/tool-by-color-select.xml:134(term)
+msgid "Mode; Antialiasing; Feather edges"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:278(para)
-#: src/toolbox/tool-fuzzy-select.xml:156(para)
-#: src/toolbox/tool-ellipse-select.xml:193(para)
+#: src/toolbox/tool-rect-select.xml:281(para)
+#: src/toolbox/tool-fuzzy-select.xml:177(para)
+#: src/toolbox/tool-ellipse-select.xml:199(para)
 #: src/toolbox/tool-by-color-select.xml:138(para)
 msgid "Common select options."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:282(term)
+#: src/toolbox/tool-rect-select.xml:286(term)
 msgid "Rounded corners"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:284(para)
+#: src/toolbox/tool-rect-select.xml:288(para)
 msgid ""
 "If you enable this option, a slider appears. You can use this to adjust the "
 "radius that is used to round the corners of the selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:292(term)
+#: src/toolbox/tool-rect-select.xml:297(term)
 msgid "Expand from center"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:294(para)
+#: src/toolbox/tool-rect-select.xml:299(para)
 msgid ""
 "If you enable this option, the point the selection is started by pressing "
 "the mouse button is used as center of the selected area."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:301(term)
-#: src/toolbox/tool-crop.xml:236(term) src/toolbox/tool-clone.xml:340(term)
+#: src/toolbox/tool-rect-select.xml:307(term)
+#: src/toolbox/tool-crop.xml:220(term) src/toolbox/tool-clone.xml:356(term)
 #, fuzzy
 msgid "Fixed"
 msgstr ""
@@ -3435,7 +3263,7 @@ msgstr ""
 "#-#-#-#-#  tool-rect-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Restricciones de tamaÃ±o"
 
-#: src/toolbox/tool-rect-select.xml:303(para)
+#: src/toolbox/tool-rect-select.xml:309(para)
 msgid ""
 "This menu allows you the option of constraining the shape of the rectangle "
 "in different ways."
@@ -3443,11 +3271,11 @@ msgstr ""
 "Este menÃº le permite restringir la forma del rectÃ¡ngulo de tres maneras "
 "diferentes."
 
-#: src/toolbox/tool-rect-select.xml:309(term)
+#: src/toolbox/tool-rect-select.xml:315(term)
 msgid "Aspect ratio"
 msgstr "SelecciÃ³n libre"
 
-#: src/toolbox/tool-rect-select.xml:311(para)
+#: src/toolbox/tool-rect-select.xml:317(para)
 msgid ""
 "This option allows you to design and resize the selection while keeping the "
 "aspect ratio fixed and written within the relevant box. By default the ratio "
@@ -3458,104 +3286,104 @@ msgstr ""
 "su proporciÃ³n, segÃºn los dos nÃºmeros ingresados en los controles de anchura "
 "y altura."
 
-#: src/toolbox/tool-rect-select.xml:321(term)
+#: src/toolbox/tool-rect-select.xml:327(term)
 msgid "Width"
 msgstr "TamaÃ±o fijo"
 
-#: src/toolbox/tool-rect-select.xml:323(para)
+#: src/toolbox/tool-rect-select.xml:329(para)
 msgid "With this choice you can fix the width of the selection."
 msgstr ""
 "Esta opciÃ³n le permite especificar manualmente un tamaÃ±o para la selecciÃ³n, "
 "empleando los controles de anchura, altura y unidad."
 
-#: src/toolbox/tool-rect-select.xml:329(term)
+#: src/toolbox/tool-rect-select.xml:335(term)
 msgid "Height"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:331(para)
+#: src/toolbox/tool-rect-select.xml:337(para)
 msgid "With this choice you can fix the height of the selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:339(para)
+#: src/toolbox/tool-rect-select.xml:345(para)
 msgid "With this choice you can fix the width and height of the selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:349(term)
+#: src/toolbox/tool-rect-select.xml:356(term)
 msgid "X; Y; Width; Height"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:351(para)
+#: src/toolbox/tool-rect-select.xml:358(para)
 msgid ""
 "These four text fields contain the current place and size of the selection. "
 "You can use these fields to adjust size and place of the selection by "
 "numbers."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:359(term)
-#: src/toolbox/tool-crop.xml:298(term)
+#: src/toolbox/tool-rect-select.xml:367(term)
+#: src/toolbox/tool-crop.xml:285(term)
 msgid "Highlight"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:361(para)
+#: src/toolbox/tool-rect-select.xml:369(para)
 msgid ""
 "If you enable this option, the selected area is emphasized by a surrounding "
 "mask to make visual selection much easier."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:368(term)
-#: src/toolbox/tool-rect-select.xml:371(primary)
-#: src/toolbox/tool-crop.xml:307(term)
+#: src/toolbox/tool-rect-select.xml:377(term)
+#: src/toolbox/tool-rect-select.xml:380(primary)
+#: src/toolbox/tool-crop.xml:294(term)
 msgid "Guides"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:372(secondary)
+#: src/toolbox/tool-rect-select.xml:381(secondary)
 msgid "Selection guides"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:374(para)
+#: src/toolbox/tool-rect-select.xml:383(para)
 msgid ""
 "With this menu you can select the type of guides that is shown within the "
 "selection to make the creation of a selection easier, respecting "
 "<emphasis>Photo composition rules</emphasis>."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:381(term)
+#: src/toolbox/tool-rect-select.xml:390(term)
 msgid "No Guides"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:383(para)
+#: src/toolbox/tool-rect-select.xml:392(para)
 msgid "No guides are shown at all."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:389(term)
+#: src/toolbox/tool-rect-select.xml:398(term)
 msgid "Center lines"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:391(para)
+#: src/toolbox/tool-rect-select.xml:400(para)
 msgid "Only center lines are shown as guides within the selected area."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:398(term)
+#: src/toolbox/tool-rect-select.xml:407(term)
 msgid "Rule of thirds"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:400(para)
+#: src/toolbox/tool-rect-select.xml:409(para)
 msgid "Guides are shown along the rule of thirds while creating the selection."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:407(term)
+#: src/toolbox/tool-rect-select.xml:416(term)
 msgid "Golden sections"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:409(para)
+#: src/toolbox/tool-rect-select.xml:418(para)
 msgid "With this option, guides show up to mark the golden sections."
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:419(term)
+#: src/toolbox/tool-rect-select.xml:429(term)
 msgid "Auto Shrink Selection"
 msgstr "Encoger selecciÃ³n automÃ¡ticamente"
 
-#: src/toolbox/tool-rect-select.xml:421(para)
+#: src/toolbox/tool-rect-select.xml:431(para)
 msgid ""
 "The <guilabel>Auto Shrink Selection</guilabel> check-box will make your next "
 "selection automatically shrink to the nearest rectangular shape available on "
@@ -3578,11 +3406,11 @@ msgstr ""
 "que la selecciÃ³n resultante no necesariamente tendrÃ¡ la misma forma que el "
 "rectÃ¡ngulo que Ud. trace."
 
-#: src/toolbox/tool-rect-select.xml:437(term)
+#: src/toolbox/tool-rect-select.xml:448(term)
 msgid "Shrink merged"
 msgstr ""
 
-#: src/toolbox/tool-rect-select.xml:439(para)
+#: src/toolbox/tool-rect-select.xml:450(para)
 msgid ""
 "If <guilabel>Sample Merged</guilabel> is also enabled, then Auto Shrink will "
 "use the pixel information from the visible display of the image, rather than "
@@ -3597,38 +3425,13 @@ msgstr ""
 "sobre la muestra combinada, dirÃjase a la entrada del glosario <link linkend="
 "\"glossary-samplemerge\">Muestra combinada</link>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-posterize.xml:46(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-posterize-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-posterize.xml:60(None)
-msgid ""
-"@@image: 'images/toolbox/tools-posterize.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-posterize.xml:100(None)
-msgid "@@image: 'images/toolbox/posterize-ex.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-posterize.xml:17(date)
-msgid "2008-01-28"
-msgstr "2007-04-15"
-
-#: src/toolbox/tool-posterize.xml:22(title)
-#: src/toolbox/tool-posterize.xml:25(secondary)
-#: src/toolbox/tool-posterize.xml:28(primary)
+#: src/toolbox/tool-posterize.xml:13(title)
+#: src/toolbox/tool-posterize.xml:16(secondary)
+#: src/toolbox/tool-posterize.xml:19(primary)
 msgid "Posterize"
 msgstr "Posterizar"
 
-#: src/toolbox/tool-posterize.xml:30(para)
+#: src/toolbox/tool-posterize.xml:21(para)
 msgid ""
 "This tool is designed to intelligently weigh the pixel colors of the "
 "selection or active layer and reduce the number of colors while maintaining "
@@ -3638,7 +3441,7 @@ msgstr ""
 "los pÃxeles de una selecciÃ³n o capa activa y reducir el nÃºmero de colores "
 "manteniendo el parecido con las caracteristicas de la imagen original."
 
-#: src/toolbox/tool-posterize.xml:39(para)
+#: src/toolbox/tool-posterize.xml:28(para)
 msgid ""
 "You can find this tool from the image-menu through: "
 "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</"
@@ -3650,23 +3453,28 @@ msgstr ""
 "guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
 "guisubmenu><guimenuitem><accel>P</accel>osterizar</guimenuitem></menuchoice>"
 
-#: src/toolbox/tool-posterize.xml:44(para)
+#: src/toolbox/tool-posterize.xml:40(para)
+#, fuzzy
+#| msgid ""
+#| "or by clicking the <placeholder-1/> icon in ToolBox, if Color Tools have "
+#| "been added to it."
 msgid ""
-"or by clicking the <placeholder-1/> icon in ToolBox, if Color Tools have "
+"or by clicking the <guiicon><inlinegraphic fileref=\"images/toolbox/stock-"
+"tool-posterize-22.png\"/></guiicon> icon in ToolBox, if Color Tools have "
 "been added to it."
 msgstr ""
 "Pulsando sobre el icono de la herramienta <placeholder-1/> en la caja de "
 "herramientas si se ha aÃ±adido en el."
 
-#: src/toolbox/tool-posterize.xml:56(phrase)
+#: src/toolbox/tool-posterize.xml:52(title)
 msgid "Posterize tool options"
 msgstr "Opciones de la herramienta posterizar"
 
-#: src/toolbox/tool-posterize.xml:66(term)
+#: src/toolbox/tool-posterize.xml:61(term)
 msgid "Posterize Levels"
 msgstr "Niveles de posterizaciÃ³n"
 
-#: src/toolbox/tool-posterize.xml:68(para)
+#: src/toolbox/tool-posterize.xml:63(para)
 msgid ""
 "This slider and the input boxes with arrow-heads allow you to set the number "
 "of levels (2-256) in each RGB channel that the tool will use to describe the "
@@ -3678,7 +3486,7 @@ msgstr ""
 "activa. El nÃºmero de colores es la combinaciÃ³n de estos niveles. Un nivel 3 "
 "darÃ¡ 2 <superscript>3</superscript> = 8 colores."
 
-#: src/toolbox/tool-posterize.xml:80(para)
+#: src/toolbox/tool-posterize.xml:75(para)
 msgid ""
 "The Preview check-box makes all changes dynamically so that they can be "
 "viewed straight away."
@@ -3686,65 +3494,32 @@ msgstr ""
 "La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
 "Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
 
-#: src/toolbox/tool-posterize.xml:90(phrase)
-#: src/toolbox/tool-perspective-clone.xml:166(phrase)
+#: src/toolbox/tool-posterize.xml:85(phrase)
+#: src/toolbox/tool-perspective-clone.xml:147(title)
 msgid "Example"
 msgstr ""
 
-#: src/toolbox/tool-posterize.xml:94(phrase)
+#: src/toolbox/tool-posterize.xml:89(phrase)
 msgid "Example for the <quote>Posterize</quote> tool"
 msgstr ""
 
-#: src/toolbox/tool-posterize.xml:103(para)
+#: src/toolbox/tool-posterize.xml:98(para)
 msgid ""
 "Image posterized in 4 levels. The histogram shows the 4 levels and 10 "
 "colors, counting black and white also."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective.xml:39(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-perspective.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective.xml:81(None)
-#: src/toolbox/tool-perspective.xml:116(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-perspective-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective.xml:105(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-perspective.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective.xml:144(None)
-msgid ""
-"@@image: 'images/toolbox/tool-dialog-perspective.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-perspective.xml:24(phrase)
-#: src/toolbox/tool-perspective.xml:28(secondary)
-#: src/toolbox/tool-perspective.xml:31(primary)
+#: src/toolbox/tool-perspective.xml:14(title)
+#: src/toolbox/tool-perspective.xml:17(secondary)
+#: src/toolbox/tool-perspective.xml:20(primary)
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: src/toolbox/tool-perspective.xml:35(phrase)
+#: src/toolbox/tool-perspective.xml:24(title)
 msgid "Perspective tool"
 msgstr "La herramienta perspectiva en la caja de herramientas"
 
-#: src/toolbox/tool-perspective.xml:43(para)
+#: src/toolbox/tool-perspective.xml:31(para)
 msgid ""
 "The Perspective Tool is used to change the <quote>perspective</quote> of the "
 "active layer content, of a selection content or of a path. When you click on "
@@ -3767,60 +3542,68 @@ msgstr ""
 "transformaciÃ³n. En el centro del elemento, un punto permite mover mediante "
 "pulsar y arrastrar."
 
-#: src/toolbox/tool-perspective.xml:56(para)
+#: src/toolbox/tool-perspective.xml:45(para)
 msgid ""
 "This tool is not actually a perspective tool, as it doesn't impose "
 "perspective rules. It is better described as a distort tool."
 msgstr ""
 
-#: src/toolbox/tool-perspective.xml:65(para)
-msgid "You can get to the Perspective tool in several ways :"
-msgstr "Puede seleccionar la herramienta perspectiva de varias maneras:"
+#: src/toolbox/tool-perspective.xml:53(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Perspective tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
 
-#: src/toolbox/tool-perspective.xml:70(para)
+#: src/toolbox/tool-perspective.xml:58(para)
+#, fuzzy
+#| msgid ""
+#| "In the the image-menu through: <guimenuitem><accel>T</accel>ools</"
+#| "guimenuitem>/ <guimenuitem><accel>T</accel>ransform Tools</guimenuitem>/"
+#| "<guimenuitem><accel>P</accel>erspective </guimenuitem>,"
 msgid ""
-"In the the image-menu through: <guimenuitem><accel>T</accel>ools</"
-"guimenuitem>/ <guimenuitem><accel>T</accel>ransform Tools</guimenuitem>/"
-"<guimenuitem><accel>P</accel>erspective </guimenuitem>,"
+"From the image menu bar <guimenuitem>Tools</guimenuitem>/ "
+"<guimenuitem>Transform Tools</guimenuitem><guimenuitem>Perspective</"
+"guimenuitem>,"
 msgstr ""
 "En el menÃº de la imagen: <guimenuitem><accel>H</accel>erramientas</"
 "guimenuitem>/ <guimenuitem>Herramientas de <accel>t</accel>ransformaciÃ³n </"
 "guimenuitem>/<guimenuitem><accel>P</accel>erspectiva </guimenuitem>,"
 
-#: src/toolbox/tool-perspective.xml:86(para)
+#: src/toolbox/tool-perspective.xml:66(para)
 msgid ""
-"or by using the <keycombo><keycap>Shift</keycap><keycap>P</keycap></"
-"keycombo> key combination."
+"By clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-perspective-22.png\"/></guiicon> in Toolbox,"
+msgstr ""
+
+#: src/toolbox/tool-perspective.xml:75(para)
+#, fuzzy
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>P</keycap></"
+#| "keycombo> key combination."
+msgid ""
+"By using the <keycombo><keycap>Shift</keycap><keycap>P</keycap></keycombo> "
+"key combination."
 msgstr ""
 "o usando la combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>P</"
 "keycap></keycombo>."
 
-#: src/toolbox/tool-perspective.xml:100(phrase)
+#: src/toolbox/tool-perspective.xml:87(title)
 msgid "<quote>Perspective</quote> tool options"
 msgstr "Opciones de la herramienta <quote>Perspectiva</quote>"
 
-#: src/toolbox/tool-perspective.xml:113(para)
-msgid ""
-"The available tool options for the Perspective Tool can be accessed by "
-"double clicking the Perspective Tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede accedder a las opciones disponibles para la herramienta perspectiva "
-"mediante una doble pulsaciÃ³n sobre el icono de la herramienta. <placeholder-"
-"1/>"
-
-#: src/toolbox/tool-perspective.xml:132(phrase)
+#: src/toolbox/tool-perspective.xml:111(phrase)
 msgid "The Information window for perspective transformation"
 msgstr ""
 
-#: src/toolbox/tool-perspective.xml:138(phrase)
+#: src/toolbox/tool-perspective.xml:117(phrase)
 msgid "The dialog window of the <quote>Perspective</quote> tool"
 msgstr "La ventana de informaciÃ³n de la herramienta perspectiva"
 
-#: src/toolbox/tool-perspective.xml:150(term)
+#: src/toolbox/tool-perspective.xml:129(term)
 msgid "Matrix"
 msgstr "Matriz"
 
-#: src/toolbox/tool-perspective.xml:152(para)
+#: src/toolbox/tool-perspective.xml:131(para)
 msgid ""
 "You can get a small knowledge about matrices in the <xref linkend=\"plug-in-"
 "convmatrix\"/>."
@@ -3828,62 +3611,17 @@ msgstr ""
 "Puede aprender un poco mÃ¡s sobre matrices con el plugin \"Convolution Matrix"
 "\""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective-clone.xml:38(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-perspective-clone.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective-clone.xml:73(None)
-#: src/toolbox/tool-perspective-clone.xml:126(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-perspective-clone-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective-clone.xml:120(None)
-msgid ""
-"@@image: 'images/toolbox/perspective-clone-options.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective-clone.xml:174(None)
-msgid ""
-"@@image: 'images/toolbox/perspective-clone-ex1.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-perspective-clone.xml:185(None)
-msgid ""
-"@@image: 'images/toolbox/perspective-clone-ex2.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-perspective-clone.xml:15(date)
-msgid "2007-11-01"
-msgstr ""
-
-#: src/toolbox/tool-perspective-clone.xml:21(phrase)
-#: src/toolbox/tool-perspective-clone.xml:25(secondary)
-#: src/toolbox/tool-perspective-clone.xml:28(primary)
+#: src/toolbox/tool-perspective-clone.xml:12(title)
+#: src/toolbox/tool-perspective-clone.xml:15(secondary)
+#: src/toolbox/tool-perspective-clone.xml:18(primary)
 msgid "Perspective Clone"
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:32(phrase)
+#: src/toolbox/tool-perspective-clone.xml:22(title)
 msgid "The <quote>Perspective Clone</quote> tool in the Toolbox"
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:42(para)
+#: src/toolbox/tool-perspective-clone.xml:31(para)
 msgid ""
 "This tool allows you to clone according to the perspective you want. First, "
 "set the wanted vanishing lines in the same way as with the <link linkend="
@@ -3892,36 +3630,34 @@ msgid ""
 "tool."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:58(phrase)
-#: src/toolbox/tool-heal.xml:61(phrase)
-msgid "Activate Tool"
-msgstr "ActivaciÃ³n de la herramienta"
-
-#: src/toolbox/tool-perspective-clone.xml:60(para)
-#: src/toolbox/tool-heal.xml:63(para) src/toolbox/tool-dodge-burn.xml:50(para)
-#: src/toolbox/tool-blend.xml:95(para)
-msgid "There are different possibilities to activate the tool:"
-msgstr ""
-
-#: src/toolbox/tool-perspective-clone.xml:65(para)
+#: src/toolbox/tool-perspective-clone.xml:46(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"From the image-menu: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint tools</"
-"guisubmenu><guimenuitem><accel>P</accel>erspective Clone</guimenuitem></"
-"menuchoice>,"
+"From the image-menu: <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint "
+"tools</guisubmenu><guimenuitem>Perspective Clone</guimenuitem></menuchoice>."
 msgstr ""
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-perspective-clone.xml:71(para)
+#: src/toolbox/tool-perspective-clone.xml:56(para)
 msgid ""
-"The Tool can also be called by clicking the tool icon: <placeholder-1/> in "
-"the Toolbox."
+"The Tool can also be called by clicking the tool icon: "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-perspective-"
+"clone-22.png\"/></guiicon> in the Toolbox."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:89(para)
-msgid "Ctrl-click allows you to select a new clone source."
+#: src/toolbox/tool-perspective-clone.xml:76(para)
+msgid "<keycap>Ctrl</keycap>-click allows you to select a new clone source."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:99(para)
+#: src/toolbox/tool-perspective-clone.xml:86(para)
 msgid ""
 "When the source is set and you press this key, you will see a thin line "
 "connecting the previously clicked point with the current pointer location. "
@@ -3930,21 +3666,15 @@ msgid ""
 "from a pattern."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:116(phrase)
+#: src/toolbox/tool-perspective-clone.xml:101(title)
 msgid "Perspective Clone tool options"
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:124(para)
-msgid ""
-"The available tool options can be accessed by clicking on the tool icon "
-"<placeholder-1/> in the Toolbox."
-msgstr ""
-
-#: src/toolbox/tool-perspective-clone.xml:131(phrase)
+#: src/toolbox/tool-perspective-clone.xml:113(term)
 msgid "Operating mode"
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:134(para)
+#: src/toolbox/tool-perspective-clone.xml:115(para)
 msgid ""
 "When using this tool you first have to choose <guilabel>Modify Perspective</"
 "guilabel>. This works like the tool <link linkend=\"gimp-tool-perspective"
@@ -3953,76 +3683,53 @@ msgid ""
 "\">Clone</link> tool."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:144(term)
+#: src/toolbox/tool-perspective-clone.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
+#| "edges"
 msgid ""
-"Mode, Opacity, Brush, Pressure Sensitivity, Fade out, Apply Jitter, Hard "
-"Edges"
-msgstr ""
+"Mode, Opacity, Brush, Scale, Brush Dynamics, Fade out, Apply Jitter, Hard "
+"Edge"
+msgstr "Opacidad"
 
-#: src/toolbox/tool-perspective-clone.xml:154(phrase)
+#: src/toolbox/tool-perspective-clone.xml:135(term)
 msgid "Source, Alignment"
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:157(para)
+#: src/toolbox/tool-perspective-clone.xml:137(para)
 msgid ""
 "This are the same as in the tool <link linkend=\"gimp-tool-clone\">Clone</"
 "link>."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:170(phrase)
+#: src/toolbox/tool-perspective-clone.xml:149(title)
 msgid "<quote>Perspective Clone</quote> example"
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:177(para)
+#: src/toolbox/tool-perspective-clone.xml:156(para)
 msgid ""
 "The <quote>Modify Perspective Plane</quote> is checked. Vanishing lines have "
 "been placed."
 msgstr ""
 
-#: src/toolbox/tool-perspective-clone.xml:188(para)
+#: src/toolbox/tool-perspective-clone.xml:168(para)
 msgid ""
 "The <quote>Perspective Clone</quote> option is checked. The white rectangle "
 "has been cloned. You see it goes smaller going away."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-pencil.xml:37(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-pencil.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-pencil.xml:77(None) src/toolbox/tool-pencil.xml:136(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-pencil-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-pencil.xml:129(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-pencil.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-pencil.xml:16(date)
-msgid "2006-02-15"
-msgstr "2006-06-08"
-
-#: src/toolbox/tool-pencil.xml:22(phrase)
-#: src/toolbox/tool-pencil.xml:26(secondary)
-#: src/toolbox/tool-pencil.xml:29(primary)
+#: src/toolbox/tool-pencil.xml:14(title)
+#: src/toolbox/tool-pencil.xml:17(secondary)
+#: src/toolbox/tool-pencil.xml:20(primary)
 msgid "Pencil"
 msgstr "El lÃ¡piz"
 
-#: src/toolbox/tool-pencil.xml:33(phrase)
+#: src/toolbox/tool-pencil.xml:24(title)
 msgid "Pencil tool"
 msgstr "El lÃ¡piz en la caja de herramientas"
 
-#: src/toolbox/tool-pencil.xml:41(para)
+#: src/toolbox/tool-pencil.xml:32(para)
 msgid ""
 "The Pencil tool is used to draw free hand lines with a hard edge. The pencil "
 "and paintbrush are similar tools. The main difference between the two tools "
@@ -4035,7 +3742,7 @@ msgstr ""
 "ambas es que aunque utilicen las mismas brochas, el lÃ¡piz no produce bordes "
 "duros, incluso con una brocha muy difusa. Ni siquiera posee antidentado."
 
-#: src/toolbox/tool-pencil.xml:48(para)
+#: src/toolbox/tool-pencil.xml:39(para)
 msgid ""
 "Why would you want to work with such a crude tool? Perhaps the most "
 "important usage is when working with very small images, such as icons, where "
@@ -4050,7 +3757,7 @@ msgstr ""
 "certeza de que cada pÃxel que se encuentre dentro de los confines de la "
 "brocha serÃ¡n transformados exactamente como se espera."
 
-#: src/toolbox/tool-pencil.xml:56(para)
+#: src/toolbox/tool-pencil.xml:48(para)
 msgid ""
 "If you want to draw straight lines with the Pencil (or any of several other "
 "paint tools), click at the starting point, then hold down <keycap>Shift</"
@@ -4060,54 +3767,46 @@ msgstr ""
 "herramientas de pintura), haga clic en el punto inicial, luego mantenga "
 "presionada la tecla <keycap>Shift</keycap> y haga clic en el punto final."
 
-#: src/toolbox/tool-pencil.xml:64(phrase) src/toolbox/tool-path.xml:60(phrase)
-#: src/toolbox/tool-paintbrush.xml:45(phrase)
-#: src/toolbox/tool-foreground-select.xml:156(phrase)
-#: src/toolbox/tool-flip.xml:51(phrase)
+#: src/toolbox/tool-pencil.xml:59(para)
 #, fuzzy
-msgid "Activating the Tool"
-msgstr ""
-"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar herramienta\n"
-"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Activar la herramienta\n"
-"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta\n"
-"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"ActivaciÃ³n de la herramienta"
-
-#: src/toolbox/tool-pencil.xml:68(para)
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"The Pencil Tool can be called in the following order, from the image-menu: "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</"
-"accel>aint Tools</guisubmenu><guimenuitem>Pe<accel>n</accel>cil</"
-"guimenuitem></menuchoice>"
+"The Pencil Tool can be called from the image-menu: "
+"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</"
+"guisubmenu><guimenuitem>Pencil</guimenuitem></menuchoice>"
 msgstr ""
-"El lÃ¡piz puede ser activado siguiendo el menÃº de la imagen en el siguiente "
-"orden: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>p</accel>intura</"
-"guisubmenu><guimenuitem><accel>L</accel>Ã¡piz</guimenuitem></menuchoice>"
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-pencil.xml:75(para)
-#: src/toolbox/tool-paintbrush.xml:56(para)
-#: src/toolbox/tool-dodge-burn.xml:61(para)
-msgid "The Tool can also be called by clicking the tool icon: <placeholder-1/>"
+#: src/toolbox/tool-pencil.xml:69(para)
+#, fuzzy
+#| msgid ""
+#| "You can also call it by clicking the tool icon: <guiicon><placeholder-1/> "
+#| "in the Toolbox, </guiicon>"
+msgid ""
+"The Tool can also be called by clicking the tool icon: "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-pencil-22.png\"/"
+"></guiicon>"
 msgstr ""
 "La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/>"
 
-#: src/toolbox/tool-pencil.xml:81(para)
+#: src/toolbox/tool-pencil.xml:77(para)
 msgid "or by clicking on the <keycap>N</keycap> keyboard shortcut."
 msgstr "o presionando la tecla de atajo <keycap>N</keycap>."
 
-#: src/toolbox/tool-pencil.xml:97(para)
+#: src/toolbox/tool-pencil.xml:92(para)
 msgid ""
 "This key changes the pencil to a <link linkend=\"gimp-tool-color-picker"
 "\">Color Picker</link>."
 msgstr "Esta tecla cambia el lÃ¡piz a la herramienta Recoge color."
 
-#: src/toolbox/tool-pencil.xml:108(para)
+#: src/toolbox/tool-pencil.xml:103(para)
 msgid ""
 "This key places the pencil tool into straight line mode. Holding "
 "<keycap>Shift</keycap> while clicking <mousebutton>Button 1</mousebutton> "
@@ -4120,88 +3819,48 @@ msgstr ""
 "dibujando lÃneas rectas que se originan a partir del final de la lÃnea "
 "anterior."
 
-#: src/toolbox/tool-pencil.xml:125(phrase)
-msgid "Pencil Tool options"
-msgstr "Opciones del lÃ¡piz"
-
-#: src/toolbox/tool-pencil.xml:133(para)
-msgid ""
-"The available tool options can be accessed by double clicking the Pencil "
-"Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para esta herramienta pueden ser accedidas "
-"realizando doble clic sobre su icono. <placeholder-1/>"
-
-#: src/toolbox/tool-pencil.xml:140(term)
-msgid ""
-"Mode; Opacity; Brush; Scale, Pressure Sensibility; Fade Out; Apply Jitter, "
-"Use Color from Gradient"
-msgstr "Modo"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-path.xml:46(None)
-msgid "@@image: 'images/toolbox/toolbox-path.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-path.xml:73(None) src/toolbox/tool-path.xml:141(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-path-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-path.xml:130(None)
-msgid ""
-"@@image: 'images/toolbox/path-tool-options.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-path.xml:161(None)
-msgid ""
-"@@image: 'images/tool-options/path-stroke.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-path.xml:173(None)
-msgid ""
-"@@image: 'images/tool-options/path-curve.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-path.xml:21(date) src/toolbox/tool-crop.xml:20(date)
+#: src/toolbox/tool-pencil.xml:118(title)
 #, fuzzy
-msgid "2008-01-11"
-msgstr ""
-"#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-18\n"
-"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-03-27"
+#| msgid "<quote>Perspective</quote> tool options"
+msgid "<quote>Pencil</quote> Tool options"
+msgstr "Opciones de la herramienta <quote>Perspectiva</quote>"
 
-#: src/toolbox/tool-path.xml:27(phrase)
-#: src/toolbox/tool-path.xml:31(secondary)
-#: src/toolbox/tool-move.xml:228(primary)
-msgid "Path"
-msgstr "Rutas"
+#: src/toolbox/tool-pencil.xml:130(term)
+#: src/toolbox/tool-paintbrush.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "Mode; Opacity; Brush; Scale; Pressure Sensibility; Fade Out; Apply "
+#| "Jitter; use Color from Gradient"
+msgid ""
+"Mode; Opacity; Brush; Scale; Brush Dynamics; Fade Out; Apply Jitter; "
+"Incremental; Use Color from Gradient"
+msgstr "Opacidad"
 
-#: src/toolbox/tool-path.xml:34(primary)
+#: src/toolbox/tool-path.xml:18(title) src/toolbox/tool-path.xml:24(primary)
 msgid "Paths"
 msgstr ""
 
-#: src/toolbox/tool-path.xml:38(primary)
+#: src/toolbox/tool-path.xml:28(primary)
 msgid "BÃ©zier's curve"
 msgstr ""
 
-#: src/toolbox/tool-path.xml:42(phrase)
-msgid "Path tool"
+#: src/toolbox/tool-path.xml:31(title)
+#, fuzzy
+#| msgid "Path tool"
+msgid "Paths tool"
 msgstr "La herramienta rutas"
 
-#: src/toolbox/tool-path.xml:50(para)
-msgid ""
-"The Path tool allows to create complex selections called Bezier Curves, a "
+#: src/toolbox/tool-path.xml:38(para)
+#, fuzzy
+#| msgid ""
+#| "The Path tool allows to create complex selections called Bezier Curves, a "
+#| "bit like Lasso but with all the adaptability of vectorial curves. You can "
+#| "edit your curve, you can paint with your curve, or even save, import, and "
+#| "export the curve. You can also use paths to create geometrical figures. "
+#| "Paths have their own dialog box: <link linkend=\"gimp-path-dialog"
+#| "\">Dialog</link>."
+msgid ""
+"The Paths tool allows to create complex selections called BÃ©zier Curves, a "
 "bit like Lasso but with all the adaptability of vectorial curves. You can "
 "edit your curve, you can paint with your curve, or even save, import, and "
 "export the curve. You can also use paths to create geometrical figures. "
@@ -4215,24 +3874,36 @@ msgstr ""
 "curvas desde otras aplicaciones grÃ¡ficas. Puede utilizar las curvas para "
 "pintar figuras geomÃ©tricas. Las rutas tienen su propio diÃ¡logo."
 
-#: src/toolbox/tool-path.xml:62(para)
-msgid "You can get to Path tool in several ways :"
-msgstr "Puede activar esta herramienta de varias formas:"
+#: src/toolbox/tool-path.xml:49(para)
+#, fuzzy
+#| msgid "You can get to this tools in several ways :"
+msgid "You can get this tool in several ways:"
+msgstr "Puede obtener esta herramienta de dos maneras:"
 
-#: src/toolbox/tool-path.xml:65(para)
+#: src/toolbox/tool-path.xml:52(para)
+#, fuzzy
+#| msgid ""
+#| "In the image menu through <menuchoice><guimenu><accel>T</accel>ools</"
+#| "guimenu><guisubmenu><accel>P</accel>aths</guisubmenu></menuchoice>,"
 msgid ""
-"In the image menu through <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aths</guisubmenu></menuchoice>,"
+"In the image menu through <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Paths</guisubmenu></menuchoice>,"
 msgstr ""
 "desde el menÃº de la imagen siguiendo, <menuchoice><guimenu><accel>H</"
 "accel>erramientas</guimenu><guisubmenu><accel>R</accel>utas</guisubmenu></"
 "menuchoice>"
 
-#: src/toolbox/tool-path.xml:78(para)
+#: src/toolbox/tool-path.xml:61(para)
+msgid ""
+"By clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-path-22.png\"/></guiicon> in Toolbox,"
+msgstr ""
+
+#: src/toolbox/tool-path.xml:71(para)
 msgid "or by using the <keycap>B</keycap> keyboard shortcut."
 msgstr "o por medio del atajo de teclado <keycap>B</keycap>."
 
-#: src/toolbox/tool-path.xml:89(para)
+#: src/toolbox/tool-path.xml:81(para)
 msgid ""
 "Help messages pop up at the bottom of the image window to help you about all "
 "these keys."
@@ -4241,7 +3912,7 @@ msgstr ""
 "informaciÃ³n en la parte inferior de la ventana de la imagen, sobre las "
 "teclas que se describen a continuaciÃ³n."
 
-#: src/toolbox/tool-path.xml:98(para)
+#: src/toolbox/tool-path.xml:90(para)
 msgid ""
 "This key has several functions depending on context. See Options for more "
 "details."
@@ -4249,13 +3920,19 @@ msgstr ""
 "Esta tecla tiene distintas funciones dependiendo del contexto. Vea las "
 "opciones debajo para mÃ¡s detalles."
 
-#: src/toolbox/tool-path.xml:105(term)
-msgid "Ctrl/Alt"
+#: src/toolbox/tool-path.xml:97(term)
+msgid "Ctrl;Alt"
 msgstr ""
 
-#: src/toolbox/tool-path.xml:107(para)
+#: src/toolbox/tool-path.xml:99(para)
+#, fuzzy
+#| msgid ""
+#| "Three modes are available to work with the Path tool: <guilabel>Design</"
+#| "guilabel>,<guilabel>Edit</guilabel> and <guilabel>Move</guilabel>. "
+#| "<keycap>Ctrl</keycap> key toggles between Design and Edit. <keycap>Alt</"
+#| "keycap> (or Ctrl+Alt) key toggles between Design and Move."
 msgid ""
-"Three modes are available to work with the Path tool: <guilabel>Design</"
+"Three modes are available to work with the Paths tool: <guilabel>Design</"
 "guilabel>,<guilabel>Edit</guilabel> and <guilabel>Move</guilabel>. "
 "<keycap>Ctrl</keycap> key toggles between Design and Edit. <keycap>Alt</"
 "keycap> (or Ctrl+Alt) key toggles between Design and Move."
@@ -4265,30 +3942,15 @@ msgstr ""
 "guilabel>. La tecla <keycap>Ctrl</keycap> cambia entre DiseÃ±o y Editar. La "
 "tecla <keycap>Alt</keycap> (o Ctrl+Alt) cambia entre DiseÃ±o y Mover."
 
-#: src/toolbox/tool-path.xml:125(phrase)
+#: src/toolbox/tool-path.xml:115(title)
 msgid "<quote>Path</quote> tool options"
 msgstr "Opciones de la herramienta <quote>Rutas</quote>"
 
-#: src/toolbox/tool-path.xml:138(para)
-msgid ""
-"The available tool options for the Path Tool can be accessed by double "
-"clicking the Path Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para la herramienta Rutas pueden accederse haciendo "
-"doble clic sobre el icono <placeholder-1/>"
-
-#: src/toolbox/tool-path.xml:143(para)
-msgid ""
-"As with other tools, you can delete your changes by <keycap>Ctrl-Z</keycap>."
-msgstr ""
-"Como en las demÃ¡s herramientas, puede deshacer los cambios presionando "
-"<keycap>Ctrl-Z</keycap>."
-
-#: src/toolbox/tool-path.xml:150(term)
+#: src/toolbox/tool-path.xml:137(term)
 msgid "Design Mode"
 msgstr "Modo DiseÃ±o"
 
-#: src/toolbox/tool-path.xml:152(para)
+#: src/toolbox/tool-path.xml:139(para)
 msgid ""
 "By default, this tool is in <guilabel>Design</guilabel> mode. You draw the "
 "path by clicking successively. You can move control points by clicking on "
@@ -4299,13 +3961,13 @@ msgstr ""
 "Puede mover los puntos de control haciendo clic sobre ellos y arrastrÃ¡ndolos "
 "luego. Entre los puntos de control hay segmentos."
 
-#: src/toolbox/tool-path.xml:164(para)
+#: src/toolbox/tool-path.xml:152(para)
 msgid "Numbers are steps to draw a two segments straight path."
 msgstr ""
 "En esta ilustraciÃ³n se muestra cÃ³mo definir dos segmentos rectos. Los pasos "
 "realizados se representan con nÃºmeros."
 
-#: src/toolbox/tool-path.xml:176(para)
+#: src/toolbox/tool-path.xml:165(para)
 msgid ""
 "Curved segments are easily built by dragging a segment or a new node. Blue "
 "arrows indicate curve. Two little handles appear that you can drag to bend "
@@ -4315,7 +3977,7 @@ msgstr ""
 "nuevo nodo. Las flechas en azul indican la curva. Aparecen dos pequeÃ±as "
 "anclas para que pueda arrastrarlas y asÃ doblar el segmento."
 
-#: src/toolbox/tool-path.xml:185(para)
+#: src/toolbox/tool-path.xml:174(para)
 msgid ""
 "To quickly close the curve, press <keycap>Ctrl</keycap> key and click on the "
 "initial control point. In previous versions, clicking inside a closed path "
@@ -4329,7 +3991,7 @@ msgstr ""
 "usar el botÃ³n <emphasis>Crear una selecciÃ³n desde la ruta</emphasis>, o con "
 "el botÃ³n <emphasis>Ruta a selecciÃ³n</emphasis> del diÃ¡logo Rutas."
 
-#: src/toolbox/tool-path.xml:195(para)
+#: src/toolbox/tool-path.xml:184(para)
 msgid ""
 "When you have two handles, they work symmetrically by default. Release the "
 "pressure on the mouse button to move handles individually. The "
@@ -4339,13 +4001,23 @@ msgstr ""
 "botÃ³n del ratÃ³n para moverlas individualmente. La tecla <keycap>Shift</"
 "keycap> las fuerza a volver a trabajar simÃ©tricamente."
 
-#: src/toolbox/tool-path.xml:202(para)
+#: src/toolbox/tool-path.xml:191(para)
 msgid "Several functions are available with this mode:"
 msgstr "Hay varias funciones disponibles en este modo:"
 
-#: src/toolbox/tool-path.xml:203(para)
-msgid ""
-"<emphasis>Add a new node</emphasis> : if the active node (a small empty "
+#: src/toolbox/tool-path.xml:192(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Add a new node</emphasis> : if the active node (a small empty "
+#| "circle after clicking on a node) is at the end of the path, the mouse "
+#| "pointer is a '+' sign and a new node is created, linked to the previous "
+#| "one by a segment. If the active node is on the path, the pointer is a "
+#| "square and you can create a new component to the path. This new component "
+#| "is independent from the other, but belongs to the path as you can see on "
+#| "the Path dialog. Pressing <keycap>Shift</keycap> forces the creation of a "
+#| "new component."
+msgid ""
+"<emphasis>Add a new node</emphasis>: If the active node (a small empty "
 "circle after clicking on a node) is at the end of the path, the mouse "
 "pointer is a '+' sign and a new node is created, linked to the previous one "
 "by a segment. If the active node is on the path, the pointer is a square and "
@@ -4363,7 +4035,7 @@ msgstr ""
 "otro, pero pertenece a la misma ruta como puede ver en el diÃ¡logo Rutas. Si "
 "presiona <keycap>Shift</keycap> fuerza la creaciÃ³n de un nuevo componente."
 
-#: src/toolbox/tool-path.xml:213(para)
+#: src/toolbox/tool-path.xml:203(para)
 msgid ""
 "<emphasis>Move one or several nodes</emphasis>: On a node, the mouse pointer "
 "becomes a 4-arrows cross. You can click and drag it. You can select several "
@@ -4379,9 +4051,14 @@ msgstr ""
 "keycap><keycap>Alt</keycap></keycombo> se puede mover toda la ruta, como una "
 "selecciÃ³n."
 
-#: src/toolbox/tool-path.xml:222(para)
+#: src/toolbox/tool-path.xml:213(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Modify handles</emphasis>: you have to Edit a node before. A "
+#| "handle appears. Drag it to bend the curve. Pressing <keycap>Shift</"
+#| "keycap> toggles to symmetric handles."
 msgid ""
-"<emphasis>Modify handles</emphasis>: you have to Edit a node before. A "
+"<emphasis>Modify handles</emphasis>: You have to Edit a node before. A "
 "handle appears. Drag it to bend the curve. Pressing <keycap>Shift</keycap> "
 "toggles to symmetric handles."
 msgstr ""
@@ -4389,12 +4066,18 @@ msgstr ""
 "Aparecen las anclas. ArrÃ¡strelas para doblar el segmento. Presionando "
 "<keycap>Shift</keycap> se colocan simÃ©tricas."
 
-#: src/toolbox/tool-path.xml:226(para)
+#: src/toolbox/tool-path.xml:218(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Modify segment</emphasis>: When you click on a segment, the "
+#| "mouse pointer turns to a 4-arrows cross. Drag it to bend the segment. As "
+#| "soon as you move, handles appear at both ends of the segment. Pressing "
+#| "<keycap>Shift</keycap> key toggles to symmetric handles."
 msgid ""
-"<emphasis>Modify segment</emphasis>: When you click on a segment, the mouse "
-"pointer turns to a 4-arrows cross. Drag it to bend the segment. As soon as "
-"you move, handles appear at both ends of the segment. Pressing "
-"<keycap>Shift</keycap> key toggles to symmetric handles."
+"<emphasis>Modify segment</emphasis>: When the mouse pointer goes over a "
+"segment, it turns to a 4-arrows cross. Click-and-drag it to bend the "
+"segment. As soon as you move, handles appear at both ends of the segment. "
+"Pressing <keycap>Shift</keycap> key toggles to symmetric handles."
 msgstr ""
 "<emphasis>Modificar el segmento</emphasis>: cuando hace clic sobre un "
 "segmento, el puntero se transforma en una cruz de flechas. ArrÃ¡strelo para "
@@ -4402,11 +4085,11 @@ msgstr ""
 "segmento. Si se presiona la tecla <keycap>Shift</keycap> las anclas se "
 "disponen simÃ©tricas."
 
-#: src/toolbox/tool-path.xml:235(term)
+#: src/toolbox/tool-path.xml:228(term)
 msgid "Edit Mode"
 msgstr "Modo EdiciÃ³n"
 
-#: src/toolbox/tool-path.xml:237(para)
+#: src/toolbox/tool-path.xml:230(para)
 msgid ""
 "<guilabel>Edit</guilabel> performs functions which are not available in "
 "<guilabel>Design</guilabel> mode. With this mode, you can work only on the "
@@ -4418,19 +4101,25 @@ msgstr ""
 "ruta existente, fuera de Ã©sta el puntero es un sÃmbolo de \"prohibido\" (o "
 "en toda la imagen, si no hay ruta) y no se le permite hacer nada."
 
-#: src/toolbox/tool-path.xml:243(para)
+#: src/toolbox/tool-path.xml:237(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Add a segment between two nodes</emphasis>: Click on a node at "
+#| "one end of the path to activate it. Pointer is like a union symbol. Click "
+#| "on an other node to link both nodes. This is useful when you have to link "
+#| "unclosed components."
 msgid ""
 "<emphasis>Add a segment between two nodes</emphasis>: Click on a node at one "
-"end of the path to activate it. Pointer is like a union symbol. Click on an "
-"other node to link both nodes. This is useful when you have to link unclosed "
-"components."
+"end of the path to activate it. The pointer is like a union symbol. Click on "
+"an other node to link both nodes. This is useful when you have to link "
+"unclosed components."
 msgstr ""
 "<emphasis>AÃ±adir un segmento entre dos nodos</emphasis>: haga clic sobre el "
 "nodo de una punta para activarlo. DirÃjase hacia la otra punta, el puntero "
 "va a presentar el sÃmbolo uniÃ³n. Haga clic para vincular los nodos con un "
 "segmento. Esto es Ãºtil cuando tiene componentes abiertos."
 
-#: src/toolbox/tool-path.xml:249(para)
+#: src/toolbox/tool-path.xml:244(para)
 msgid ""
 "<emphasis>Remove a segment from a path</emphasis>: While pressing "
 "<keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo> key "
@@ -4441,7 +4130,7 @@ msgstr ""
 "presionados <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo> "
 "apunte un segmento. El puntero cambia a un signo -. Haga clic para borrarlo."
 
-#: src/toolbox/tool-path.xml:254(para)
+#: src/toolbox/tool-path.xml:250(para)
 msgid ""
 "<emphasis>Add a node to a path</emphasis>: point to a segment. Pointer turns "
 "to +. Click where you want to place the new control point."
@@ -4450,7 +4139,7 @@ msgstr ""
 "el puntero cambia a un signo +. Haga clic en donde desee ubicar el punto de "
 "control."
 
-#: src/toolbox/tool-path.xml:258(para)
+#: src/toolbox/tool-path.xml:255(para)
 msgid ""
 "<emphasis>Remove a node</emphasis>: While pressing <keycombo><keycap>Shift</"
 "keycap><keycap>Ctrl</keycap></keycombo> key combination, point to a node. "
@@ -4460,7 +4149,7 @@ msgstr ""
 "<keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo>, apunte un "
 "nodo. El puntero cambia a un signo -. Haga clic para borrarlo."
 
-#: src/toolbox/tool-path.xml:262(para)
+#: src/toolbox/tool-path.xml:260(para)
 msgid ""
 "<emphasis>Add a handle to a node</emphasis>: Point to a node. Pointer turns "
 "to small hand. Drag the node: handle appears. Pressing <keycap>Shift</"
@@ -4470,28 +4159,34 @@ msgstr ""
 "cambia a una pequeÃ±a mano. Arrastre el nodo para que aparezca el ancla. "
 "Presione <keycap>Shift</keycap> para aÃ±adir dos anclas simÃ©tricas."
 
-#: src/toolbox/tool-path.xml:268(para)
+#: src/toolbox/tool-path.xml:267(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Remove a handle from a node</emphasis>: While pressing "
+#| "<keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo> key "
+#| "combination, point to a handle. Pointer doesn't turn to the expected - "
+#| "and remains a hand. Click to delete the handle."
 msgid ""
 "<emphasis>Remove a handle from a node</emphasis>: While pressing "
 "<keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo> key "
-"combination, point to a handle. Pointer doesn't turn to the expected - and "
-"remains a hand. Click to delete the handle."
+"combination, point to a handle. The pointer doesn't turn to the expected - "
+"and remains a hand. Click to delete the handle."
 msgstr ""
 "<emphasis>Eliminar un ancla de un nodo</emphasis>: mientras mantiene "
 "presionados <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></"
 "keycombo>, apunte a una ancla. El puntero no cambia al sÃmbolo esperado, el "
 "signo -, y sigue siendo una mano. Haga clic para borrarla."
 
-#: src/toolbox/tool-path.xml:274(para)
+#: src/toolbox/tool-path.xml:275(para)
 msgid "No warning before removing a node, a segment or a handle."
 msgstr ""
 "No hay mensajes de advertencia al eliminar nodos, segmentos, ni anclas."
 
-#: src/toolbox/tool-path.xml:281(term)
+#: src/toolbox/tool-path.xml:282(term)
 msgid "Move Mode"
 msgstr "Modo Mover"
 
-#: src/toolbox/tool-path.xml:283(para)
+#: src/toolbox/tool-path.xml:284(para)
 msgid ""
 "<guilabel>Move</guilabel> mode allows to move one or all components of a "
 "path. Simply click on the path and drag it."
@@ -4499,7 +4194,7 @@ msgstr ""
 "El modo <guilabel>Mover</guilabel> le permite mover uno o todos los "
 "componentes de una ruta. Simplemente haga clic en la ruta y arrÃ¡strela."
 
-#: src/toolbox/tool-path.xml:287(para)
+#: src/toolbox/tool-path.xml:288(para)
 msgid ""
 "If you have several components, only the selected one is moved. If you click "
 "and drag outside the path, all components are moved. Pressing <keycap>Shift</"
@@ -4509,11 +4204,11 @@ msgstr ""
 "arrastra afuera de la ruta, todos los componentes son movidos. Presionar la "
 "tecla <keycap>Shift</keycap> tiene el mismo efecto."
 
-#: src/toolbox/tool-path.xml:296(term)
+#: src/toolbox/tool-path.xml:297(term)
 msgid "Polygonal"
 msgstr "Poligonal"
 
-#: src/toolbox/tool-path.xml:298(para)
+#: src/toolbox/tool-path.xml:299(para)
 msgid ""
 "With this option, segments are linear only. Handles are not available and "
 "segments are not bent when moving them."
@@ -4521,11 +4216,11 @@ msgstr ""
 "Con esta opciÃ³n, los segmentos son sÃ³lo rectos. No hay anclas y los "
 "segmentos no se doblan cuando se mueven."
 
-#: src/toolbox/tool-path.xml:305(term)
+#: src/toolbox/tool-path.xml:306(term)
 msgid "Create selection from path"
 msgstr "Crear una selecciÃ³n desde la ruta"
 
-#: src/toolbox/tool-path.xml:307(para)
+#: src/toolbox/tool-path.xml:308(para)
 msgid ""
 "This button allows creation of a selection that is based on the path in its "
 "present state. This selection is marked with the usual \"marching ants\". "
@@ -4541,12 +4236,12 @@ msgstr ""
 "independiente. Si cambia de herramienta, la ruta se vuelve invisible, pero "
 "persiste en el diÃ¡logo Rutas y puede volver a activarla."
 
-#: src/toolbox/tool-path.xml:316(para)
+#: src/toolbox/tool-path.xml:317(para)
 msgid "If the path is not closed, GIMP will close it with a straight line."
 msgstr ""
 "Si la ruta no es cerrada, el GIMP une la selecciÃ³n con una lÃnea recta."
 
-#: src/toolbox/tool-path.xml:319(para)
+#: src/toolbox/tool-path.xml:320(para)
 msgid ""
 "As the help pop-up tells, pressing <keycap>Shift</keycap> when clicking on "
 "the button will add the new selection to an eventually pre-existent. "
@@ -4560,11 +4255,11 @@ msgstr ""
 "sustrae, y la combinaciÃ³n<keycombo><keycap>Shift</keycap><keycap>Ctrl</"
 "keycap></keycombo> da la intersecciÃ³n de ambas selecciones."
 
-#: src/toolbox/tool-path.xml:330(term)
+#: src/toolbox/tool-path.xml:331(term)
 msgid "Stroke path"
 msgstr "Trazar ruta"
 
-#: src/toolbox/tool-path.xml:332(para)
+#: src/toolbox/tool-path.xml:333(para)
 msgid ""
 "In previous versions, you could access to this command only by the Edit sub-"
 "menu in the Image Menu. Now you can access to it also via this button. See "
@@ -4575,7 +4270,7 @@ msgstr ""
 "Editar del menÃº de la imagen. Ahora puede hacerlo tambiÃ©n por este botÃ³n. "
 "Vea la secciÃ³n <link linkend=\"gimp-using-paths\">Usando rutas</link>."
 
-#: src/toolbox/tool-path.xml:342(para)
+#: src/toolbox/tool-path.xml:343(para)
 msgid ""
 "See the <link linkend=\"gimp-concepts-paths\"><quote>Path</quote></"
 "link>concept."
@@ -4583,42 +4278,14 @@ msgstr ""
 "Vea el <link linkend=\"gimp-concepts-paths\"><quote>concepto de ruta</"
 "quote></link>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-paintbrush.xml:35(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-brush.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-paintbrush.xml:58(None)
-#: src/toolbox/tool-paintbrush.xml:117(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-paintbrush-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-paintbrush.xml:110(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-paintbrush.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-paintbrush.xml:14(date)
-msgid "2006-02-10"
-msgstr "2006-06-08"
-
-#: src/toolbox/tool-paintbrush.xml:20(phrase)
-#: src/toolbox/tool-paintbrush.xml:24(secondary)
-#: src/toolbox/tool-paintbrush.xml:27(primary)
-#: src/toolbox/tool-paintbrush.xml:31(phrase)
+#: src/toolbox/tool-paintbrush.xml:10(title)
+#: src/toolbox/tool-paintbrush.xml:13(secondary)
+#: src/toolbox/tool-paintbrush.xml:16(primary)
+#: src/toolbox/tool-paintbrush.xml:20(title)
 msgid "Paintbrush"
 msgstr "El pincel"
 
-#: src/toolbox/tool-paintbrush.xml:39(para)
+#: src/toolbox/tool-paintbrush.xml:28(para)
 msgid ""
 "The paintbrush tool paints fuzzy brush strokes. All strokes are rendered "
 "using the current brush."
@@ -4626,29 +4293,47 @@ msgstr ""
 "La herramienta pincel pinta trazos difusos. Todos los trazos son efectuados "
 "con la brocha actual."
 
-#: src/toolbox/tool-paintbrush.xml:49(para)
+#: src/toolbox/tool-paintbrush.xml:37(para)
+#, fuzzy
+#| msgid ""
+#| "You can call the Paintbrush Tool in the following order, from the image-"
+#| "menu: <menuchoice><guimenu><accel>T</accel>ools</"
+#| "guimenu><guisubmenu><accel>P</accel>aint Tools</"
+#| "guisubmenu><guimenuitem><accel>P</accel>aintbrush</guimenuitem></"
+#| "menuchoice>."
 msgid ""
 "You can call the Paintbrush Tool in the following order, from the image-"
-"menu: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint Tools</"
-"guisubmenu><guimenuitem><accel>P</accel>aintbrush</guimenuitem></menuchoice>."
+"menu: <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</"
+"guisubmenu><guimenuitem>Paintbrush</guimenuitem></menuchoice>."
 msgstr ""
 "La herramienta pincel puede ser activada siguiendo el menÃº de imagen en el "
 "siguiente orden: <guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
 "<guimenuitem>Herramientas de <accel>p</accel>intura</guimenuitem>/ "
 "<guimenuitem><accel>P</accel>incel</guimenuitem>."
 
-#: src/toolbox/tool-paintbrush.xml:62(para)
+#: src/toolbox/tool-paintbrush.xml:48(para)
+#, fuzzy
+#| msgid ""
+#| "You can also call it by clicking the tool icon: <guiicon><placeholder-1/> "
+#| "in the Toolbox, </guiicon>"
+msgid ""
+"The Tool can also be called by clicking the tool icon: "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-paintbrush-22.png"
+"\"/></guiicon>"
+msgstr ""
+"La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/>"
+
+#: src/toolbox/tool-paintbrush.xml:56(para)
 msgid "or by using the <keycap>P</keycap> keyboard shortcut."
 msgstr "o presionando la tecla de atajo <keycap>P</keycap>."
 
-#: src/toolbox/tool-paintbrush.xml:78(para)
+#: src/toolbox/tool-paintbrush.xml:71(para)
 msgid ""
 "This key changes the paintbrush to a <link linkend=\"gimp-tool-color-picker"
 "\">Color Picker</link>."
 msgstr "Esta tecla cambia del pincel a la herramienta recoge-color."
 
-#: src/toolbox/tool-paintbrush.xml:89(para)
+#: src/toolbox/tool-paintbrush.xml:82(para)
 msgid ""
 "This key places the paintbrush into straight line mode. Holding "
 "<keycap>Shift</keycap> while clicking <mousebutton>Button 1</mousebutton> "
@@ -4661,63 +4346,24 @@ msgstr ""
 "consecutivos continÃºan dibujando lÃneas rectas que se originan a partir del "
 "final de la lÃnea anterior."
 
-#: src/toolbox/tool-paintbrush.xml:106(phrase)
+#: src/toolbox/tool-paintbrush.xml:97(title)
 msgid "Paintbrush tool options"
 msgstr "Opciones de la herramienta pincel"
 
-#: src/toolbox/tool-paintbrush.xml:114(para)
-msgid ""
-"The available tool options can be accessed by double clicking the Paintbrush "
-"Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para esta herramienta pueden ser accedidas "
-"realizando doble clic sobre su icono. <placeholder-1/>"
-
-#: src/toolbox/tool-paintbrush.xml:121(term)
-msgid ""
-"Mode; Opacity; Brush; Scale; Pressure Sensibility; Fade Out; Apply Jitter; "
-"use Color from Gradient"
-msgstr "Opacidad"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-move.xml:40(None)
-msgid "@@image: 'images/toolbox/toolbox-move.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-move.xml:62(None) src/toolbox/tool-move.xml:112(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-move-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-move.xml:101(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-move.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-move.xml:19(date)
-msgid "2008-03-01"
-msgstr "2007-04-17"
-
-#: src/toolbox/tool-move.xml:25(phrase)
-#: src/toolbox/tool-move.xml:29(secondary)
-#: src/toolbox/tool-move.xml:32(primary) src/toolbox/tool-move.xml:117(term)
-#: src/toolbox/tool-move.xml:189(secondary)
-#: src/toolbox/tool-move.xml:213(secondary)
-#: src/toolbox/tool-move.xml:229(secondary)
-#: src/toolbox/tool-move.xml:245(secondary)
+#: src/toolbox/tool-move.xml:18(title) src/toolbox/tool-move.xml:21(secondary)
+#: src/toolbox/tool-move.xml:24(primary) src/toolbox/tool-move.xml:116(term)
+#: src/toolbox/tool-move.xml:217(secondary)
+#: src/toolbox/tool-move.xml:241(secondary)
+#: src/toolbox/tool-move.xml:257(secondary)
+#: src/toolbox/tool-move.xml:273(secondary)
 msgid "Move"
 msgstr "Mover"
 
-#: src/toolbox/tool-move.xml:36(phrase)
+#: src/toolbox/tool-move.xml:28(title)
 msgid "The Move tool in Toolbox"
 msgstr "La herramienta mover en la caja de herramientas"
 
-#: src/toolbox/tool-move.xml:44(para)
+#: src/toolbox/tool-move.xml:35(para)
 msgid ""
 "The Move Tool is used to move layers, selections, paths or guides. It works "
 "also on texts."
@@ -4725,73 +4371,105 @@ msgstr ""
 "La herramienta mover se usa para mover capas, selecciones o guÃas. TambiÃ©n, "
 "trabaja sobre textos."
 
-#: src/toolbox/tool-move.xml:54(para)
+#: src/toolbox/tool-move.xml:44(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Move Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-move.xml:49(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"You can find this tool from the image menu through: "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</"
-"accel>ransform Tools</guisubmenu><guimenuitem><accel>M</accel>ove</"
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Move</"
 "guimenuitem></menuchoice>,"
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>t</accel>ransformaciÃ³n</"
-"guisubmenu><guimenuitem><accel>M</accel>over</guimenuitem></menuchoice>"
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-move.xml:60(para)
-msgid "or by clicking the tool icon: <placeholder-1/>,"
-msgstr "Pulsando el icono de la herramienta: <placeholder-1/>"
+#: src/toolbox/tool-move.xml:59(para)
+msgid ""
+"By clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-move-22.png\"/></guiicon>."
+msgstr ""
 
-#: src/toolbox/tool-move.xml:66(para)
-msgid "or by the <keycap>M</keycap> keyboard shortcut."
-msgstr "o mediante el atajo de teclado <keycap>M</keycap>."
+#: src/toolbox/tool-move.xml:68(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid "By using the keyboard shortcut <keycap>M</keycap>."
+msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
 
-#: src/toolbox/tool-move.xml:71(para)
+#: src/toolbox/tool-move.xml:73(para)
 msgid "The Move tool is automatically activated when you create a guide."
 msgstr "La herramienta se activa, automaticamente cuando se crea una guÃa."
 
-#: src/toolbox/tool-move.xml:79(para)
+#: src/toolbox/tool-move.xml:81(para)
+#, fuzzy
+#| msgid ""
+#| "Holding down the <keycap>space</keycap> bar changes the active tool to "
+#| "Move temporarily. The Move tool remains active as long as the space bar "
+#| "is held down. The original tool is reactivated after releasing the space "
+#| "bar. In GIMP-2.4, this behaviour exists only if the <guilabel>Swith to "
+#| "Move Tool</guilabel> option is enabled in Preferences/Space bar."
 msgid ""
 "Holding down the <keycap>space</keycap> bar changes the active tool to Move "
 "temporarily. The Move tool remains active as long as the space bar is held "
-"down. The original tool is reactivated after releasing the space bar. In "
-"GIMP-2.4, this behaviour exists only if the <guilabel>Swith to Move Tool</"
-"guilabel> option is enabled in Preferences/Space bar."
+"down. The original tool is reactivated after releasing the space bar. This "
+"behaviour exists only if the <guilabel>Switch to Move tool</guilabel> option "
+"is enabled in <menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</"
+"guisubmenu><guisubmenu>ImageÂ Windows</guisubmenu><guimenuitem>SpaceÂ Bar</"
+"guimenuitem></menuchoice>."
 msgstr ""
 "Si se mantiene pulsada la barra <keycap>espaciadora</keycap> la herramienta "
 "activa cambia, temporalmente, a mover y se mantiene activa mientras la barra "
 "espaciadora este pulsada. La herramienta original se reactiva despuÃ©s de "
 "liberar la barra."
 
-#: src/toolbox/tool-move.xml:97(phrase)
+#: src/toolbox/tool-move.xml:103(title)
 msgid "Move Tool options"
 msgstr "Opciones de la herramienta mover"
 
-#: src/toolbox/tool-move.xml:109(para)
-msgid ""
-"The available tool options for Move can be found by double clicking the Move "
-"Tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede acceder a las opciones disponibles de la herramienta pulsando dos "
-"veces sobre el icono de la herramienta mover. <placeholder-1/>"
-
-#: src/toolbox/tool-move.xml:120(para)
+#: src/toolbox/tool-move.xml:119(para)
 msgid "Keep in mind that your Move choice persists after quitting the tool."
 msgstr ""
 "Tenga presente que la elecciÃ³n en afectar se mantiene despuÃ©s de cambiar de "
 "herramienta."
 
-#: src/toolbox/tool-move.xml:127(term)
-msgid "Tool toggle"
+#: src/toolbox/tool-move.xml:126(term)
+#, fuzzy
+#| msgid "Tool toggle"
+msgid "Tool toggle (Shift)"
 msgstr "Conmutar herramienta"
 
+#: src/toolbox/tool-move.xml:128(para)
+msgid "If Move is on <guiicon>Layer</guiicon>:"
+msgstr ""
+
 #: src/toolbox/tool-move.xml:131(para)
-msgid ""
-"<guilabel>Pick a layer or guide</guilabel> : On an image with several "
-"layers, the mouse pointer turns to a crosshair when it goes over an element "
-"belonging to the current layer. Then you can click-and-drag it. But, even if "
-"it has a small hand shape, you can also move a non-active layer by click-and-"
-"dragging a visible element of it (it becomes the active layer while moving). "
-"If a guide exists on your image, it will turn to red when the mouse pointer "
-"goes over. Then it is activated and you can move it."
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Pick a layer or guide</guilabel> : On an image with several "
+#| "layers, the mouse pointer turns to a crosshair when it goes over an "
+#| "element belonging to the current layer. Then you can click-and-drag it. "
+#| "But, even if it has a small hand shape, you can also move a non-active "
+#| "layer by click-and-dragging a visible element of it (it becomes the "
+#| "active layer while moving). If a guide exists on your image, it will turn "
+#| "to red when the mouse pointer goes over. Then it is activated and you can "
+#| "move it."
+msgid ""
+"<guilabel>Pick a layer or guide</guilabel>: On an image with several layers, "
+"the mouse pointer turns to a crosshair when it goes over an element "
+"belonging to the current layer. Then you can click-and-drag it. If the mouse "
+"pointer has a small hand shape (showing that you do <emphasis>not</emphasis> "
+"pick an element of the active layer), you will move a non-active layer "
+"instead (it becomes the active layer while moving)."
 msgstr ""
 "<guilabel>Escoger una capa o guÃa</guilabel> : Sobre una imagen con varias "
 "capas el puntero del ratÃ³n se vuelve una cruz cuando va sobre un elemento de "
@@ -4801,25 +4479,43 @@ msgstr ""
 "mueve). Si hay una guÃa en la imagen, se volverÃ¡ roja cuando el puntero pase "
 "sobre ella. Entonces estÃ¡ activa y se puede mover."
 
-#: src/toolbox/tool-move.xml:141(para)
+#: src/toolbox/tool-move.xml:140(para)
 msgid ""
-"<guilabel>Move the current layer</guilabel> : Only the current layer will be "
-"moved."
+"If a guide exists on your image, it will turn to red when the mouse pointer "
+"goes over. Then it is activated and you can move it."
 msgstr ""
-"<guilabel>Mover la capa activa</guilabel> : Solo se moverÃ¡ la capa activa"
-
-#: src/toolbox/tool-move.xml:129(para)
-msgid "If Move is on layer : <placeholder-1/>"
-msgstr "Si afectar estÃ¡ sobre capas : <placeholder-1/>"
 
 #: src/toolbox/tool-move.xml:147(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Move the current path</guilabel> : Only the current path will "
+#| "be moved. You can change the current path in the Path Dialog."
 msgid ""
-"<guilabel>Pick a path</guilabel> : That's the default option. If your image "
-"has several layers, some of them with a path, every path will be represented "
-"in Path Dialog, and one of them will be the current path. With this option, "
-"the mouse pointer turns to a small hand when it goes over a path. Then you "
-"can move this path by click-and-dragging it (it will be the current path "
-"while moving)."
+"<guilabel>Move the active layer</guilabel>: Only the current layer will be "
+"moved. This may be useful if you want to move a layer with transparent "
+"areas, where you can easily pick the wrong layer."
+msgstr ""
+"<guilabel>Mover la ruta activa </guilabel> : Solo la ruta activa se moverÃ¡. "
+"Puede cambiarla en el diÃ¡ogo de capas."
+
+#: src/toolbox/tool-move.xml:155(para)
+msgid "If Move is on <guiicon>Path</guiicon>:"
+msgstr ""
+
+#: src/toolbox/tool-move.xml:158(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Pick a path</guilabel> : That's the default option. If your "
+#| "image has several layers, some of them with a path, every path will be "
+#| "represented in Path Dialog, and one of them will be the current path. "
+#| "With this option, the mouse pointer turns to a small hand when it goes "
+#| "over a path. Then you can move this path by click-and-dragging it (it "
+#| "will be the current path while moving)."
+msgid ""
+"<guilabel>Pick a path</guilabel>: That's the default option. The mouse "
+"pointer turns to a small hand when it goes over a <link linkend=\"gimp-path-"
+"dialog-using\">visible path</link>. Then you can move this path by click-and-"
+"dragging it (it will be the active path while moving)."
 msgstr ""
 "<guilabel>Escoger una ruta</guilabel> : Es la opciÃ³n predeterminada. Si la "
 "imagen tiene varias capas, alguna de ellas con una ruta, cada ruta estarÃ¡ "
@@ -4828,74 +4524,95 @@ msgstr ""
 "pasa sobre una ruta. Entonces, se puede mover esta ruta pulsando y "
 "arrastrÃ¡ndola ( serÃ¡ la capa activa mientras se mueve)."
 
-#: src/toolbox/tool-move.xml:154(para)
+#: src/toolbox/tool-move.xml:167(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Move the current path</guilabel> : Only the current path will "
+#| "be moved. You can change the current path in the Path Dialog."
 msgid ""
-"<guilabel>Move the current path</guilabel> : Only the current path will be "
-"moved. You can change the current path in the Path Dialog."
+"<guilabel>Move the active path</guilabel>: Only the current path will be "
+"moved. You can change the current path in the <link linkend=\"gimp-path-"
+"dialog\">Path Dialog</link>."
 msgstr ""
 "<guilabel>Mover la ruta activa </guilabel> : Solo la ruta activa se moverÃ¡. "
 "Puede cambiarla en el diÃ¡ogo de capas."
 
-#: src/toolbox/tool-move.xml:145(para)
-msgid "If Move is on Path : <placeholder-1/>"
-msgstr "Si afectar estÃ¡ sobre rutas : <placeholder-1/>"
-
-#: src/toolbox/tool-move.xml:165(phrase)
+#: src/toolbox/tool-move.xml:180(title)
 msgid "Summary of Move tool actions"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:169(term)
+#: src/toolbox/tool-move.xml:183(term)
 msgid "Moving a selection"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:171(para)
+#: src/toolbox/tool-move.xml:185(para)
+#, fuzzy
+#| msgid ""
+#| "Make sure the image displaying the selected layer is active and copy it "
+#| "to the clipboard with <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></"
+#| "keycombo>."
 msgid ""
 "The Move tool allows to move the selection outline only. If the Move Mode is "
 "<quote>Layer</quote>, you must hold down <keycombo><keycap>Ctrl</"
-"keycap><keycap>Alt</keycap></keycombo> keys. If the Move Mode is Selection, "
-"you can click-and-drag any point in canvas to move the selection outline."
+"keycap><keycap>Alt</keycap></keycombo> keys."
 msgstr ""
+"AsegÃºrese que la imagen mostrada de la capa seleccionada es la activa y "
+"copiela en el portapapeles con <keycombo><keycap>Ctrl</keycap><keycap>C</"
+"keycap></keycombo>."
 
-#: src/toolbox/tool-move.xml:178(para)
+#: src/toolbox/tool-move.xml:190(para)
+msgid ""
+"If the Move Mode is Selection, you can click-and-drag any point in canvas to "
+"move the selection outline. You can also use the arrow keys to move "
+"selections precisely. Then, holding down the <keycap> Shift</keycap> key "
+"moves then by increments of 25 pixels."
+msgstr ""
+
+#: src/toolbox/tool-move.xml:196(para)
+msgid ""
+"When you move a selection with the Move tool, the center of the selection is "
+"marked with a small cross. This cross and selection boundaries snap to "
+"guides or grid if the <menuchoice><guimenu>View</guimenu><guimenuitem>Snap "
+"to Guides (or Grid)</guimenuitem></menuchoice> option is checked: this makes "
+"aligning selections easier."
+msgstr ""
+
+#: src/toolbox/tool-move.xml:206(para)
 msgid ""
 "See <link linkend=\"gimp-using-selections-moving\">Moving selections</link> "
 "for other possibilities."
 msgstr ""
 
-#: src/toolbox/tool-move.xml:185(term)
+#: src/toolbox/tool-move.xml:213(term)
 msgid "Moving a layer"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:188(primary)
-msgid "Layer"
-msgstr ""
-
-#: src/toolbox/tool-move.xml:191(para)
+#: src/toolbox/tool-move.xml:219(para)
 msgid ""
 "The Move Mode must be <quote>Layer</quote>. Then you can choose between "
 "<guilabel>Move the Active Layer</guilabel> and, if you have one or more "
 "layers, <guilabel>Point to Layer (or Guide)</guilabel>."
 msgstr ""
 
-#: src/toolbox/tool-move.xml:200(term)
+#: src/toolbox/tool-move.xml:228(term)
 msgid "Moving Grouped Layers"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:202(para)
+#: src/toolbox/tool-move.xml:230(para)
 msgid ""
 "If layers are grouped (with the little chain symbol) they will all move, "
 "regardless of which layer is currently active."
 msgstr ""
 
-#: src/toolbox/tool-move.xml:209(term)
+#: src/toolbox/tool-move.xml:237(term)
 msgid "Moving a guide"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:212(primary)
+#: src/toolbox/tool-move.xml:240(primary)
 msgid "Guide"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:215(para)
+#: src/toolbox/tool-move.xml:243(para)
 msgid ""
 "When you pull a guide from a ruler, the Move tool is automatically "
 "activated. That's not the case after using another tool, and you have to "
@@ -4903,95 +4620,52 @@ msgid ""
 "guide turns to red and you can click-and-drag to move it."
 msgstr ""
 
-#: src/toolbox/tool-move.xml:225(term)
+#: src/toolbox/tool-move.xml:253(term)
 msgid "Moving a path"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:231(para)
+#: src/toolbox/tool-move.xml:259(para)
 msgid ""
-"The path Tool Dialog has its own moving function: see <xref linkend=\"gimp-"
+"The Path Tool dialog has its own moving function: see <xref linkend=\"gimp-"
 "tool-path\"/>. But you can also use the Move Tool. The Move Mode must be set "
 "to <quote>Path</quote>. Note that the path becomes invisible; make it "
 "visible in the Path Dialog. You can choose the path to be moved or move the "
 "active path."
 msgstr ""
 
-#: src/toolbox/tool-move.xml:241(term)
+#: src/toolbox/tool-move.xml:269(term)
 msgid "Moving a text"
 msgstr ""
 
-#: src/toolbox/tool-move.xml:247(para)
+#: src/toolbox/tool-move.xml:275(para)
 msgid ""
 "Every text has its own layer and can be moved as layers. See <xref linkend="
-"\"gimp-tool-text\"/>. The only particular aspect is that the background of "
-"the text layer is transparent and that you have to click on a letter to move "
-"the text."
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-measure.xml:49(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-measure.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-measure.xml:92(None)
-#: src/toolbox/tool-measure.xml:200(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-measure-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-measure.xml:134(None)
-msgid ""
-"@@image: 'images/toolbox/measure-horiz.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-measure.xml:148(None)
-msgid "@@image: 'images/toolbox/measure-vert.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-measure.xml:185(None)
-msgid ""
-"@@image: 'images/toolbox/measure-tool-options.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-measure.xml:19(date)
-msgid "2008-01-30"
+"\"gimp-tool-text\"/>."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:25(phrase)
-#: src/toolbox/tool-measure.xml:29(secondary)
-#: src/toolbox/tool-measure.xml:32(primary)
+#: src/toolbox/tool-measure.xml:15(title)
+#: src/toolbox/tool-measure.xml:18(secondary)
+#: src/toolbox/tool-measure.xml:21(primary)
 msgid "Measure"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:35(primary)
+#: src/toolbox/tool-measure.xml:24(primary)
 msgid "Measure a distance"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:38(primary)
+#: src/toolbox/tool-measure.xml:27(primary)
 msgid "Measure an angle"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:41(primary)
+#: src/toolbox/tool-measure.xml:30(primary)
 msgid "Measure a surface"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:45(phrase)
+#: src/toolbox/tool-measure.xml:33(title)
 msgid "Measure tool"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:53(para)
+#: src/toolbox/tool-measure.xml:40(para)
 msgid ""
 "The Measure Tool is used to gain knowledge about pixel distances in your "
 "working image. By clicking and holding the mouse button, you can determine "
@@ -5000,34 +4674,48 @@ msgid ""
 "can also be displayed in the Info Window."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:60(para)
+#: src/toolbox/tool-measure.xml:47(para)
 msgid ""
 "When you pass the mouse pointer over the end point it turns to a move "
 "pointer. Then if you click you can resume the measure."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:66(phrase)
+#: src/toolbox/tool-measure.xml:53(title)
 msgid "Status Bar"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:68(para)
+#: src/toolbox/tool-measure.xml:54(para)
 msgid ""
 "Information is displayed in the <link linkend=\"gimp-image-window-status-bar"
-"\">status bar</link>, at the bottom of the Image window. The status bar "
-"shows a pair of numbers. The first number is the <emphasis>distance between "
-"the original point and the mouse pointer</emphasis>. Mostly the measure unit "
-"is shown as <emphasis>Pixel</emphasis>. The second number is the "
-"<emphasis>angle</emphasis> in every quadrant, from 0Â° to 90Â°."
+"\">status bar</link>, at the bottom of the Image window: "
+"<itemizedlist><listitem><para> Distance between the original point and the "
+"mouse pointer, in pixels. </para></listitem><listitem><para> Angle, in every "
+"quadrant, from 0Â° to 90Â°. </para></listitem><listitem><para> Pointer "
+"coordinates relative to the original point. </para></listitem></itemizedlist>"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:84(para)
+#: src/toolbox/tool-measure.xml:83(para)
+#, fuzzy
+#| msgid ""
+#| "You can access this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
+#| "guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
 msgid ""
 "You can get to the Measure Tool from the image-menu through: "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guimenuitem><accel>M</"
-"accel>easure</guimenuitem></menuchoice>,"
+"<menuchoice><guimenu>Tools</guimenu><guimenuitem>Measure</guimenuitem></"
+"menuchoice>,"
+msgstr ""
+"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
+"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
+
+#: src/toolbox/tool-measure.xml:92(para)
+msgid ""
+"or by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-measure-22.png\"/></guiicon> in Toolbox."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:110(para)
+#: src/toolbox/tool-measure.xml:109(para)
 msgid ""
 "Holding down the <keycap>Shift</keycap> allows to start a new measure from "
 "the pointed point without deleting the previous measure. Angle is measured "
@@ -5036,208 +4724,96 @@ msgid ""
 "angle</emphasis> on the image."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:127(para)
+#: src/toolbox/tool-measure.xml:122(para)
 msgid ""
 "Holding down the <keycap>Ctrl</keycap> key puts the tool into constrained "
 "straight line mode. The orientation of the line is constrained to the "
 "nearest multiple of 15 degrees."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:132(para)
+#: src/toolbox/tool-measure.xml:127(para)
 msgid ""
 "<keycap>Ctrl</keycap> key pressed and click on an end point creates a "
-"horizontal guide. The mouse pointer goes with the <placeholder-1/> icon."
+"horizontal guide. The mouse pointer goes with the <guiicon><inlinegraphic "
+"fileref=\"images/toolbox/measure-horiz.png\"/></guiicon> icon."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:146(para)
+#: src/toolbox/tool-measure.xml:139(para)
 msgid ""
 "<keycap>Alt</keycap> key and click on an end point creates a vertical guide. "
-"The mouse pointer goes with the <placeholder-1/> icon."
+"The mouse pointer goes with the <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/measure-vert.png\"/></guiicon> icon."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:163(para)
+#: src/toolbox/tool-measure.xml:158(para)
 msgid ""
 "This key combination and click on a measure line allows to move the measure."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:167(para)
+#: src/toolbox/tool-measure.xml:162(para)
 msgid ""
 "<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo> key "
 "combination and click on an end point creates a vertical and a horizontal "
 "guides."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:181(phrase)
+#: src/toolbox/tool-measure.xml:174(title)
 msgid "<quote>Measure</quote> tool options"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:193(para)
-#, fuzzy
-msgid ""
-"There is only one available option for the Measure Tool which can be "
-"accessed by double clicking the Measure tool icon <placeholder-1/>."
-msgstr ""
-"Se puede acceder a las opciones disponibles de la herramienta inclinar "
-"mediante una doble pulsaciÃ³n sobre el icono de la herramienta. <placeholder-"
-"1/>"
-
-#: src/toolbox/tool-measure.xml:208(term)
+#: src/toolbox/tool-measure.xml:183(term)
 msgid "Use Info Window"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:210(para)
+#: src/toolbox/tool-measure.xml:185(para)
 msgid ""
 "This option will display an Info Window dialog that details the measure tool "
 "results. The results are more complete on the status bar."
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:221(phrase)
+#: src/toolbox/tool-measure.xml:196(title)
 msgid "Measuring surfaces"
 msgstr ""
 
-#: src/toolbox/tool-measure.xml:223(para)
+#: src/toolbox/tool-measure.xml:197(para)
 msgid ""
 "You can't measure surfaces directly, but you can use the <link linkend="
 "\"gimp-histogram-dialog\">Histogram</link> that gives you the number of "
 "pixels in a selection."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:65(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-levels-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:80(None)
-msgid "@@image: 'images/toolbox/tools-levels.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:180(None)
-msgid ""
-"@@image: 'images/toolbox/levels-input-1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:196(None)
-msgid ""
-"@@image: 'images/toolbox/levels-input-2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:211(None)
-msgid ""
-"@@image: 'images/toolbox/levels-input-3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:269(None)
-msgid ""
-"@@image: 'images/toolbox/levels-output-1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:281(None)
-msgid ""
-"@@image: 'images/toolbox/levels-output-2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:325(None)
-msgid ""
-"@@image: 'images/toolbox/levels-eyedrop.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:362(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-levels.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:402(None)
-msgid ""
-"@@image: 'images/filters/examples/colors-retinex1.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:410(None)
-msgid "@@image: 'images/toolbox/levels-ex1b.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:426(None)
-msgid "@@image: 'images/toolbox/levels-ex2a.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:437(None)
-msgid "@@image: 'images/toolbox/levels-ex2b.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:455(None)
-msgid "@@image: 'images/toolbox/levels-ex3a.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-levels.xml:467(None)
-msgid "@@image: 'images/toolbox/levels-ex3b.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-levels.xml:17(date) src/toolbox/tool-blend.xml:24(date)
-msgid "2008-01-17"
-msgstr "2007-04-15"
-
-#: src/toolbox/tool-levels.xml:23(phrase)
-#: src/toolbox/tool-levels.xml:27(secondary)
+#: src/toolbox/tool-levels.xml:15(title)
+#: src/toolbox/tool-levels.xml:19(secondary)
 msgid "Levels"
 msgstr "Niveles"
 
-#: src/toolbox/tool-levels.xml:31(secondary)
+#: src/toolbox/tool-levels.xml:23(secondary)
 msgid "Adjust level colors"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:34(primary)
-msgid "Level Tool"
-msgstr ""
+#: src/toolbox/tool-levels.xml:26(primary)
+#, fuzzy
+#| msgid "Levels"
+msgid "Levels tool"
+msgstr "Niveles"
 
-#: src/toolbox/tool-levels.xml:37(primary)
+#: src/toolbox/tool-levels.xml:29(primary)
 msgid "Values"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:40(primary)
+#: src/toolbox/tool-levels.xml:32(primary)
 msgid "Gamma"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:43(primary)
+#: src/toolbox/tool-levels.xml:35(primary)
 msgid "Black point"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:46(primary)
+#: src/toolbox/tool-levels.xml:38(primary)
 msgid "White point"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:48(para)
+#: src/toolbox/tool-levels.xml:41(para)
 msgid ""
 "The Level tool provides features similar to the Histogram tool but can also "
 "change the intensity range of the active layer or selection in every "
@@ -5247,33 +4823,64 @@ msgstr ""
 "La herramienta niveles tiene caracteristicas similares al histograma pero, "
 "tambien, puede cambiar el rango intensidad de la capa activa o selecciÃ³n."
 
-#: src/toolbox/tool-levels.xml:58(para)
+#: src/toolbox/tool-levels.xml:51(para)
+#: src/toolbox/tool-desaturate.xml:43(para)
+#, fuzzy
+#| msgid "You can get to this tools in several ways :"
+msgid "You can get to this tools in several ways:"
+msgstr "Puede obtener esta herramienta de dos maneras:"
+
+#: src/toolbox/tool-levels.xml:53(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"You can get to the Level Tool in the image-menu through: "
-"<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</"
-"accel>olor Tools</guisubmenu><guimenuitem><accel>L</accel>evels</"
-"guimenuitem></menuchoice>, or <menuchoice><guimenu>Colors</"
-"guimenu><guimenuitem>Levels</guimenuitem></menuchoice>,"
+"In the image menu through <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Levels</"
+"guimenuitem></menuchoice>."
 msgstr ""
-"En el menÃº de la imagen <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
-"guisubmenu><guimenuitem><accel>N</accel>iveles</guimenuitem></menuchoice>"
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
 #: src/toolbox/tool-levels.xml:63(para)
+#, fuzzy
+#| msgid ""
+#| "or through <menuchoice><guimenu>Colors</guimenu><guimenuitem>Threshold</"
+#| "guimenuitem></menuchoice>,"
 msgid ""
-"or by clicking the <placeholder-1/> icon in Toolbox if this tool has been "
-"installed there. For this, go to <link linkend=\"gimp-tools-dialog\">Tools "
-"Dialog</link>."
+"In the image menu through <menuchoice><guimenu>Colors</"
+"guimenu><guimenuitem>Levels</guimenuitem></menuchoice>."
+msgstr ""
+"o pulsando sobre el icono e herramienta <placeholder-1/> en la caja de "
+"herramientas, si ya la ha instalado. Para esto, ir a <link linkend=\"gimp-"
+"tools-dialog\">DiÃ¡logo de herramientas</link>."
+
+#: src/toolbox/tool-levels.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "or by clicking the <placeholder-1/> icon in Toolbox if this tool has been "
+#| "installed there. For this, go to <link linkend=\"gimp-tools-dialog"
+#| "\">Tools Dialog</link>."
+msgid ""
+"By clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-levels-22.png\"/></guiicon> in the toolbox if this tool "
+"has been installed there. For this, go to <link linkend=\"gimp-tools-dialog"
+"\">Tools Dialog</link>."
 msgstr ""
 "Pulsando sobre el icono de la herramienta <placeholder-1/> en la caja de "
 "herramientas, si ya estÃ¡ instalado allÃ. Para esto, ir a <link linkend="
 "\"gimp-tools-dialog\">DiÃ¡logo de herramientas</link>."
 
-#: src/toolbox/tool-levels.xml:76(phrase)
+#: src/toolbox/tool-levels.xml:88(title)
 msgid "Level tool options"
 msgstr "Opciones de la herramienta niveles"
 
-#: src/toolbox/tool-levels.xml:86(term) src/toolbox/tool-curves.xml:82(term)
+#: src/toolbox/tool-levels.xml:139(term) src/toolbox/tool-curves.xml:120(term)
 #, fuzzy
 msgid "Channel"
 msgstr ""
@@ -5282,49 +4889,28 @@ msgstr ""
 "#-#-#-#-#  tool-levels.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Modificar los niveles por canal"
 
-#: src/toolbox/tool-levels.xml:91(para)
-msgid ""
-"<guilabel>Value</guilabel> makes changes to the value of all RGB channels in "
-"the image: the image becomes darker or lighter."
-msgstr ""
-
-#: src/toolbox/tool-levels.xml:94(para)
-msgid ""
-"<guilabel>Red</guilabel>, <guilabel>Green</guilabel> and <guilabel>Blue</"
-"guilabel> work on a particular color channel: the image gets more or less "
-"color. Remember that adding or removing a color result in removing or adding "
-"the complementary color"
-msgstr ""
-
-#: src/toolbox/tool-levels.xml:99(para)
-msgid ""
-"<guilabel>Alpha</guilabel> works on semi-transparent layers or selections: "
-"here, dark means more transparency, and white is fully opaque. Your image "
-"must have an Alpha Channel, otherwise this option is disabled."
-msgstr ""
-
-#: src/toolbox/tool-levels.xml:103(para)
-msgid ""
-"<guilabel>Initialize channel</guilabel> cancels changes to the selected "
-"channel."
-msgstr ""
-
-#: src/toolbox/tool-levels.xml:88(para)
+#: src/toolbox/tool-levels.xml:141(para)
 msgid ""
 "You can select the specific channel which will be modified by the tool: "
-"<placeholder-1/>"
-msgstr ""
-"Puede seleccionar el canal especÃfico que serÃ¡ modificado por la "
-"herramienta: Valor hace cambios en la intensidad de todos los pÃxeles. Los "
-"canales de color permiten cambiar la saturaciÃ³n. Canal alfa sobre la "
-"transparencia. <guilabel>Reiniciar el canal</guilabel> cancela los cambios "
-"en el canal seleccionado. <placeholder-1/>"
-
-#: src/toolbox/tool-levels.xml:110(term)
+"<itemizedlist><listitem><para><guilabel>Value</guilabel> makes changes to "
+"the value of all RGB channels in the image: the image becomes darker or "
+"lighter. </para></listitem><listitem><para><guilabel>Red</guilabel>, "
+"<guilabel>Green</guilabel> and <guilabel>Blue</guilabel> work on a "
+"particular color channel: the image gets more or less color. Remember that "
+"adding or removing a color result in removing or adding the complementary "
+"color </para></listitem><listitem><para><guilabel>Alpha</guilabel> works on "
+"semi-transparent layers or selections: here, dark means more transparency, "
+"and white is fully opaque. Your image must have an Alpha Channel, otherwise "
+"this option is disabled. </para></"
+"listitem><listitem><para><guilabel>Initialize channel</guilabel> cancels "
+"changes to the selected channel. </para></listitem></itemizedlist>"
+msgstr ""
+
+#: src/toolbox/tool-levels.xml:180(term)
 msgid "Input Levels"
 msgstr "Niveles de entrada"
 
-#: src/toolbox/tool-levels.xml:112(para)
+#: src/toolbox/tool-levels.xml:182(para)
 msgid ""
 "The main area is a graphic representation of the active layer or selection "
 "dark (Shadows), mid and light (Highlight)tones content (the Histogram). They "
@@ -5344,11 +4930,11 @@ msgstr ""
 "azul, por ejemplo, podrucira un histograma movido a la izquierda en los "
 "canales verde y rojo, es decir, falta de verde y rojo en los tonos claros."
 
-#: src/toolbox/tool-levels.xml:124(para)
+#: src/toolbox/tool-levels.xml:194(para)
 msgid "Level ranges can be modified in three ways:"
 msgstr "Los rangos de nivel se pueden modificar de tres maneras:"
 
-#: src/toolbox/tool-levels.xml:129(para)
+#: src/toolbox/tool-levels.xml:199(para)
 msgid ""
 "Three triangles as sliders: one black for dark tones (Shadows), one grey for "
 "midtones (Gamma), one white for light (Highlights) tones."
@@ -5357,21 +4943,21 @@ msgstr ""
 "gris para los medios (a menudo, llamado valor gamma) y uno blanco para los "
 "tonos claros."
 
-#: src/toolbox/tool-levels.xml:134(para)
+#: src/toolbox/tool-levels.xml:204(para)
 msgid ""
 "The black slider determines the <emphasis>black point </emphasis>: all "
 "pixels with this value or less will be black (no color with a color channel "
 "selected / transparent with the Alpha channel selected)."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:140(para)
+#: src/toolbox/tool-levels.xml:210(para)
 msgid ""
 "The white slider determines the <emphasis>white point </emphasis>: all "
 "pixels with this value or higher, will be white (fully colored with a color "
 "channel selected / fully opaque with the Alpha channel selected)."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:146(para)
+#: src/toolbox/tool-levels.xml:216(para)
 msgid ""
 "The gray slider determines the <emphasis>mid point</emphasis>. Going to the "
 "left, to the black, makes the image lighter (more colored / more opaque) . "
@@ -5379,7 +4965,7 @@ msgid ""
 "more transparent)."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:155(para)
+#: src/toolbox/tool-levels.xml:225(para)
 msgid ""
 "Two eye-droppers: when you click them, the mouse pointer becomes an eye-"
 "dropper. Then clicking on the image determines the black or the white point "
@@ -5390,31 +4976,34 @@ msgstr ""
 "derecha para coger el color mÃ¡s claro sobre la imagen. Puede encontrar estos "
 "colores en Ver/Ventana de informaciÃ³n (en la solapa cursor)."
 
-#: src/toolbox/tool-levels.xml:165(para)
+#: src/toolbox/tool-levels.xml:235(para)
 msgid "Three numeric text boxes to enter values directly."
 msgstr "Tres casillas para entrar valores directamente."
 
-#: src/toolbox/tool-levels.xml:170(para)
+#. summary
+#: src/toolbox/tool-levels.xml:242(para)
 msgid ""
 "Input Levels are used to lighten highlights (bright tones), darken shadows "
 "(dark tones), change the balance of bright and dark tones. Move sliders to "
 "the left to increase lightness (increase the chosen color / increase "
 "opacity). Move the sliders to the right to lessen lightness (lessen the "
-"chosen color / lessen opacity))."
+"chosen color / lessen opacity)."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:183(para)
-msgid ""
-"A gray-scaled image. Three stripes: Shadows (64), Mid Tones (127), "
-"Highlights (192). The histogram shows three peaks, one for each of the three "
-"tones."
-msgstr ""
+#: src/toolbox/tool-levels.xml:252(title)
+#, fuzzy
+#| msgid "Input Levels"
+msgid "Examples for Input Levels"
+msgstr "Niveles de entrada"
 
-#: src/toolbox/tool-levels.xml:192(phrase)
-msgid "Example for Input Levels"
+#: src/toolbox/tool-levels.xml:253(para)
+msgid ""
+"The original image is a gray-scaled image with three stripes: Shadows (64), "
+"Mid Tones (127), Highlights (192). The histogram shows three peaks, one for "
+"each of the three tones."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:199(para)
+#: src/toolbox/tool-levels.xml:269(para)
 msgid ""
 "The Value channel is selected. The black slider (Shadows) has been moved up "
 "to the Shadows peak. The 64 value became 0 and the Shadows stripe became "
@@ -5422,7 +5011,11 @@ msgid ""
 "of the tone range. Mid tones are made darker to 84 and Highlights to 171."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:214(para)
+#: src/toolbox/tool-levels.xml:282(para) src/toolbox/tool-levels.xml:382(para)
+msgid "Black slider has been moved"
+msgstr ""
+
+#: src/toolbox/tool-levels.xml:287(para)
 msgid ""
 "The white slider (highlights) has been moved up to the highlight peak. The "
 "192 value became 255 and the highlight stripe became white. The Gamma (mid "
@@ -5430,13 +5023,22 @@ msgid ""
 "tones are made lighter to 169 and Shadows to 84."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:227(term)
+#: src/toolbox/tool-levels.xml:300(para)
+msgid "White slider has been moved"
+msgstr ""
+
+#: src/toolbox/tool-levels.xml:308(term)
 msgid "Output Levels"
 msgstr "Niveles de salida"
 
-#: src/toolbox/tool-levels.xml:229(para)
+#: src/toolbox/tool-levels.xml:310(para)
+#, fuzzy
+#| msgid ""
+#| "Output Levels allows manual selection of a constrained output level "
+#| "range. There are also numeric text boxes with arrow-heads located here "
+#| "that can be used to interactively change the Output Levels."
 msgid ""
-"Output Levels allows manual selection of a constrained output level range. "
+"Output levels allows manual selection of a constrained output level range. "
 "There are also numeric text boxes with arrow-heads located here that can be "
 "used to interactively change the Output Levels."
 msgstr ""
@@ -5444,18 +5046,18 @@ msgstr ""
 "niveles. Hay unas flechas aquÃ, que se pueden usar para cambiar los niveles "
 "de salida."
 
-#: src/toolbox/tool-levels.xml:235(para)
+#: src/toolbox/tool-levels.xml:316(para)
 msgid "Output levels force the tone range to fit the new limits you have set."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:241(para)
+#: src/toolbox/tool-levels.xml:322(para)
 msgid ""
 "Working with Value: values are compressed and look more alike; so contrast "
 "is reduced. Shadows are made lighter: new details can show up but contrast "
 "is less; a compromise is necessary. Highlights are made darker."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:249(para)
+#: src/toolbox/tool-levels.xml:330(para)
 msgid ""
 "Working with Color channels: if you the use the green channel for example "
 "and set the output levels between 100 and 140, all pixels with some green, "
@@ -5463,25 +5065,37 @@ msgid ""
 "and 140."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:257(para)
+#: src/toolbox/tool-levels.xml:338(para)
 msgid ""
 "Working with Alpha channel: all Alpha values will be shifted to the range "
 "you have set."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:265(phrase)
+#: src/toolbox/tool-levels.xml:346(title)
 msgid "Example for Output Levels"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:272(para)
+#: src/toolbox/tool-levels.xml:348(para)
+#, fuzzy
+#| msgid ""
+#| "You can access this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
+#| "guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
 msgid ""
-"<emphasis role=\"bold\">Original image</emphasis>: A RGB gradient from black "
-"(0;0;0) to white (255;255;255). Output Levels has no histogram; here, we "
-"used <menuchoice><guimenu>Dialogs</guimenu><guimenuitem>Histogram</"
-"guimenuitem></menuchoice>."
+"The original image is a RGB gradient from black (0;0;0) to white "
+"(255;255;255). Output Levels has no histogram; here, we used "
+"<menuchoice><guimenu>Windows</guimenu><guisubmenu>Dockable Dialogs</"
+"guisubmenu><guimenuitem>Histogram</guimenuitem></menuchoice>."
+msgstr ""
+"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
+"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
+
+#: src/toolbox/tool-levels.xml:364(para)
+msgid "Original image (a gradient)"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:284(para)
+#: src/toolbox/tool-levels.xml:369(para)
 msgid ""
 "Value channel selected. The black slider has been moved to 63 and the white "
 "slider to 189. The Histogram shows the compression of pixels. No pixel is "
@@ -5489,11 +5103,11 @@ msgid ""
 "lighter and Highlights are darker: contrast is reduced."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:298(term) src/toolbox/tool-curves.xml:233(term)
+#: src/toolbox/tool-levels.xml:390(term)
 msgid "All Channels"
 msgstr "Todos los canales"
 
-#: src/toolbox/tool-levels.xml:300(para)
+#: src/toolbox/tool-levels.xml:392(para)
 msgid ""
 "<guilabel>Open</guilabel>: This button allows you to select a file holding "
 "level settings."
@@ -5501,7 +5115,7 @@ msgstr ""
 "<guilabel>Abrir</guilabel>: este botÃ³n permite seleccionar un archivo de "
 "configuraciÃ³n de niveles."
 
-#: src/toolbox/tool-levels.xml:303(para)
+#: src/toolbox/tool-levels.xml:396(para)
 msgid ""
 "<guilabel>Save</guilabel>: Allows you to save any levels you have set to a "
 "file that can be loaded later."
@@ -5509,13 +5123,13 @@ msgstr ""
 "<guilabel>Guardar</guilabel>: Permite guardar una configuraciÃ³n de niveles "
 "en un archivo que puede abrir cuando lo necesite."
 
-#: src/toolbox/tool-levels.xml:306(para)
+#: src/toolbox/tool-levels.xml:400(para)
 msgid "<guilabel>Auto</guilabel>: Performs an automatic setting of the levels."
 msgstr ""
 "<guilabel>Auto</guilabel>: Realiza una configuraciÃ³n automÃ¡tica de los "
 "niveles."
 
-#: src/toolbox/tool-levels.xml:309(para)
+#: src/toolbox/tool-levels.xml:404(para)
 msgid ""
 "<guilabel>Three eyedroppers</guilabel>: These three buttons respectively "
 "represent a white, a gray and a black eye-dropper. When you click one of "
@@ -5532,18 +5146,28 @@ msgstr ""
 "determina el nivel medio de gris. Todas las formas de gris se calculan a "
 "partir de estos tres niveles."
 
-#: src/toolbox/tool-levels.xml:321(phrase)
+#: src/toolbox/tool-levels.xml:416(title)
 msgid "Example for Levels eye-droppers"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:328(para)
+#: src/toolbox/tool-levels.xml:423(para)
 msgid ""
 "At the bottom, a gradient from black to white. Down, the result after "
 "clicking with the white eye-dropper: all pixels with a value higher than "
 "that of the clicked pixel turned to white."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:342(para)
+#: src/toolbox/tool-levels.xml:473(term)
+msgid "Edit these settings as Curves"
+msgstr ""
+
+#: src/toolbox/tool-levels.xml:475(para)
+msgid ""
+"To make your work easier, this button lets you turn to the <link linkend="
+"\"gimp-tool-curves\">Curves</link> tool with the same settings."
+msgstr ""
+
+#: src/toolbox/tool-levels.xml:486(para)
 msgid ""
 "The Preview button makes all changes to the levels dynamically so that the "
 "new level settings can be viewed straight away."
@@ -5551,26 +5175,28 @@ msgstr ""
 "La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
 "Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
 
-#: src/toolbox/tool-levels.xml:352(phrase)
-#: src/toolbox/tool-curves.xml:269(phrase)
+#: src/toolbox/tool-levels.xml:496(title)
+#: src/toolbox/tool-curves.xml:298(title)
 msgid "Tool Options dialog"
 msgstr "DiÃ¡logo de opciones de herramientas"
 
-#: src/toolbox/tool-levels.xml:358(phrase)
-msgid "<quote>Levels</quote> toool options"
-msgstr ""
+#: src/toolbox/tool-levels.xml:500(title)
+#, fuzzy
+#| msgid "<quote>Perspective</quote> tool options"
+msgid "<quote>Levels</quote> tool options"
+msgstr "Opciones de la herramienta <quote>Perspectiva</quote>"
 
-#: src/toolbox/tool-levels.xml:367(para) src/toolbox/tool-curves.xml:271(para)
+#: src/toolbox/tool-levels.xml:509(para) src/toolbox/tool-curves.xml:299(para)
 msgid ""
 "Although this tool is not present in Tool box, nevertheless it has a Tool "
 "Option Dialog under the Toolbox. These options are described here:"
 msgstr "Las opciones se describen aquÃ:"
 
-#: src/toolbox/tool-levels.xml:372(term) src/toolbox/tool-curves.xml:277(term)
+#: src/toolbox/tool-levels.xml:514(term) src/toolbox/tool-curves.xml:305(term)
 msgid "Histogram Scale"
 msgstr "Escala del histograma"
 
-#: src/toolbox/tool-levels.xml:374(para)
+#: src/toolbox/tool-levels.xml:516(para)
 msgid ""
 "These two options have the same action as the logarithmic and Linear buttons "
 "in the Levels dialog."
@@ -5578,12 +5204,12 @@ msgstr ""
 "Estas dos opciones tienen la misma funciÃ³n que los botones lineal y "
 "logarÃtmico en el diÃ¡logo de niveles."
 
-#: src/toolbox/tool-levels.xml:381(term) src/toolbox/tool-curves.xml:286(term)
-#: src/toolbox/tool-color-picker.xml:187(term)
+#: src/toolbox/tool-levels.xml:523(term) src/toolbox/tool-curves.xml:314(term)
+#: src/toolbox/tool-color-picker.xml:153(term)
 msgid "Sample Average"
 msgstr "Muestra ponderada"
 
-#: src/toolbox/tool-levels.xml:383(para)
+#: src/toolbox/tool-levels.xml:525(para)
 msgid ""
 "This slider sets the <quote>radius</quote> of the color-picking area. This "
 "area appears as a more or less enlarged square when you maintain the click "
@@ -5593,125 +5219,71 @@ msgstr ""
 "color (cuentagotas). Este area aparece, como un cuadrado mÃ¡s grande a mayor "
 "radio, cuando se mantiene pulsado el botÃ³n del ratÃ³n sobre un pÃxel."
 
-#: src/toolbox/tool-levels.xml:394(phrase)
+#: src/toolbox/tool-levels.xml:536(title)
 msgid "Actual practice"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:398(phrase)
+#: src/toolbox/tool-levels.xml:538(title)
 msgid "A very under-exposed image"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:413(para)
+#: src/toolbox/tool-levels.xml:553(para)
 msgid "The histogram shows a predominance of Shadows and missing Highlights."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:422(phrase)
+#: src/toolbox/tool-levels.xml:561(title)
 msgid "Setting the white point"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:429(para)
+#: src/toolbox/tool-levels.xml:567(para)
 msgid ""
 "The white slider has been moved to the start of well marked Highlights. The "
 "image lightens up."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:440(para)
+#: src/toolbox/tool-levels.xml:578(para)
 msgid ""
 "The resulting histogram (down) shows Highlights now, but Shadows are still "
 "predominant."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:449(phrase)
+#: src/toolbox/tool-levels.xml:586(title)
 msgid "Setting the balance between Shadows and Highlights"
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:458(para)
+#: src/toolbox/tool-levels.xml:592(para)
 msgid ""
 "The mid slider has been moved to the left. This results in reducing the "
 "proportion of Shadows and increasing the proportion of Highlights."
 msgstr ""
 
-#: src/toolbox/tool-levels.xml:470(para)
+#: src/toolbox/tool-levels.xml:604(para)
 msgid "The resulting histogram (down) confirms the reduction of Shadows."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:45(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-scissor.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:89(None)
-#: src/toolbox/tool-iscissors.xml:171(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-iscissors-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:114(None)
-msgid ""
-"@@image: 'images/toolbox/iscissors-selection.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:125(None)
-msgid ""
-"@@image: 'images/toolbox/cissors-mouse.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:127(None)
-msgid "@@image: 'images/toolbox/cissors-plus.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:129(None)
-msgid "@@image: 'images/toolbox/cissors-bad.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-iscissors.xml:165(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-scissor.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-iscissors.xml:22(date)
-msgid "2008-01-09"
-msgstr "2007-04-18"
-
-#: src/toolbox/tool-iscissors.xml:23(authorinitials)
-#: src/toolbox/tool-fuzzy-select.xml:19(authorinitials)
-#: src/toolbox/tool-free-select.xml:19(authorinitials)
-#: src/toolbox/tool-ellipse-select.xml:20(authorinitials)
-#: src/toolbox/tool-by-color-select.xml:20(authorinitials)
-msgid "P.P"
-msgstr "manuq"
+#: src/toolbox/tool-iscissors.xml:20(title)
+#, fuzzy
+#| msgid "Tool Options for the Intelligent Scissors"
+msgid "Intelligent Scissors"
+msgstr "Opciones de la herramienta"
 
-#: src/toolbox/tool-iscissors.xml:28(phrase)
-#: src/toolbox/tool-iscissors.xml:32(secondary)
+#: src/toolbox/tool-iscissors.xml:24(secondary)
 msgid "Scissors"
 msgstr "Las tijeras inteligentes"
 
-#: src/toolbox/tool-iscissors.xml:35(primary)
-msgid "Scissors Tool"
-msgstr ""
+#: src/toolbox/tool-iscissors.xml:27(primary)
+#, fuzzy
+#| msgid "Scissors"
+msgid "Scissors tool"
+msgstr "Las tijeras inteligentes"
 
-#: src/toolbox/tool-iscissors.xml:39(phrase)
-msgid "Intelligent Scissors tool icon in the Toolbox."
+#: src/toolbox/tool-iscissors.xml:31(title)
+#, fuzzy
+#| msgid "Intelligent Scissors tool icon in the Toolbox."
+msgid "Intelligent Scissors tool icon in the Toolbox"
 msgstr "El icono de las tijeras inteligentes en la caja de herramientas."
 
-#: src/toolbox/tool-iscissors.xml:49(para)
+#: src/toolbox/tool-iscissors.xml:39(para)
 msgid ""
 "The Intelligent Scissors tool is an interesting piece of equipment: it has "
 "some features in common with the Lasso, some features in common with the "
@@ -5734,25 +5306,7 @@ msgstr ""
 "tiene suerte, la ruta que halla la herramienta se corresponderÃ¡ con el "
 "contorno del Ã¡rea que intenta seleccionar."
 
-#: src/toolbox/tool-iscissors.xml:61(para)
-msgid ""
-"Each time you left-click with the mouse, you create a new control point, "
-"which is connected to the last control point by a curve that tries to follow "
-"edges in the image. To finish, click on the first point (the cursor changes "
-"to indicate when you are in the right spot). You can adjust the curve by "
-"dragging the control nodes, or by clicking to create new control nodes. When "
-"you are satisfied, click anywhere inside the curve to convert it into a "
-"selection."
-msgstr ""
-"Cada vez que se hace un clic izquierdo con el ratÃ³n, se crea un punto de "
-"control, que se conecta con el punto de control anteriormente colocado, por "
-"una curva que intenta seguir bordes de la imagen. Para finalizar, haga clic "
-"sobre el primer punto de control (el cursor cambia para indicar cuÃ¡ndo se "
-"halla en el punto correcto). Puede ajustar la curva arrastrando los puntos "
-"de control. Cuando estÃ© satisfecho, haga clic en cualquier lugar dentro de "
-"la curva para convertirla en una selecciÃ³n."
-
-#: src/toolbox/tool-iscissors.xml:70(para)
+#: src/toolbox/tool-iscissors.xml:51(para)
 msgid ""
 "Unfortunately, there seem to be some problems with the edge-following logic "
 "for this tool, with the result that the selections it creates tend to be "
@@ -5772,63 +5326,121 @@ msgstr ""
 "aunque no posee la capacidad de seguir los bordes, su curva persiste hasta "
 "que Ud. decide borrarla, y puede cambiarla en cualquier momento."
 
-#: src/toolbox/tool-iscissors.xml:85(para)
+#: src/toolbox/tool-iscissors.xml:65(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Intelligent Scissors Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-iscissors.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu bar <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
+#| "guimenuitem></menuchoice>;"
 msgid ""
-"The Intelligent Scissors can be activated from an image menu as "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
-"guisubmenu><guimenuitem>Intelligent Scissors</guimenuitem></menuchoice>; "
-"from the Toolbox by clicking on the tool icon <placeholder-1/> ; or from the "
-"keyboard using the shortcut <keycap>i</keycap>."
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Intelligent "
+"Scissors</guimenuitem></menuchoice>,"
 msgstr ""
-"Las tijeras inteligentes se pueden activar desde el menÃº de la imagen "
-"siguiendo <menuchoice><guimenu>Herramientas</"
+"Desde el menÃº de la imagen <menuchoice><guimenu>Herramientas</"
 "guimenu><guisubmenu>Herramientas de selecciÃ³n</"
-"guisubmenu><guimenuitem>Tijeras inteligentes</guimenuitem></menuchoice>; "
-"desde la caja de herramientas clicando en el icono <placeholder-1/>; o desde "
-"el teclado mediante el atajo <keycap>i</keycap>."
+"guisubmenu><guimenuitem>SelecciÃ³n rectangular</guimenuitem></menuchoice>."
 
-#: src/toolbox/tool-iscissors.xml:98(para)
+#: src/toolbox/tool-iscissors.xml:80(para)
 msgid ""
-"The Scissor tool does not have any special key modifiers, only the ones that "
-"affect all selection tools in the same way. See <xref linkend=\"gimp-tool-"
-"select\"/> for help with these."
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-iscissors-22.png\"/></guiicon> in the ToolBox,"
 msgstr ""
-"Las tijeras inteligentes no tienen teclas modificadoras especiales, sÃ³lo las "
-"que afectan a todas las herramientas de selecciÃ³n de la misma manera. Ã?stas "
-"se explican en la secciÃ³n sobre <link linkend=\"gimp-tool-select"
-"\">herramientas de selecciÃ³n</link>."
 
-#: src/toolbox/tool-iscissors.xml:106(phrase)
-#: src/toolbox/tool-fuzzy-select.xml:106(phrase)
-#: src/toolbox/tool-free-select.xml:96(phrase)
-#: src/toolbox/tool-ellipse-select.xml:138(phrase)
+#: src/toolbox/tool-iscissors.xml:90(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid "by using the keyboard shortcut <keycap>I</keycap>."
+msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
+
+#: src/toolbox/tool-iscissors.xml:99(para)
+msgid ""
+"The default behavior of the <keycap>Shift</keycap>, <keycap>Ctrl</keycap>, "
+"and <keycap>Alt</keycap> keys is described in <xref linkend=\"gimp-tools-"
+"select-modifiers\"/> for all selection tools."
+msgstr ""
+
+#: src/toolbox/tool-iscissors.xml:104(para)
+msgid ""
+"There is, however, one key modifier that has a special behavior if you use "
+"it while editing a selection, that is <emphasis>after</emphasis> you have "
+"added the first node:"
+msgstr ""
+
+#: src/toolbox/tool-iscissors.xml:113(para)
+msgid ""
+"By default, the <emphasis>auto-edge snap feature</emphasis> is enabled: "
+"whenever you click and drag the mouse pointer, the Scissors tool finds the "
+"point of the maximal gradient (where the color change is maximal) for "
+"placing a new control node or moving an existing node."
+msgstr ""
+
+#: src/toolbox/tool-iscissors.xml:120(para)
+msgid ""
+"Holding down this key while clicking and dragging disables this feature, and "
+"the control node will be placed at the position of the mouse pointer."
+msgstr ""
+
+#: src/toolbox/tool-iscissors.xml:131(title)
+#: src/toolbox/tool-fuzzy-select.xml:123(phrase)
+#: src/toolbox/tool-free-select.xml:135(title)
+#: src/toolbox/tool-ellipse-select.xml:153(title)
 msgid "Tool handling"
 msgstr ""
 
-#: src/toolbox/tool-iscissors.xml:110(phrase)
-msgid "Using Intelligent Scissors."
+#: src/toolbox/tool-iscissors.xml:133(title)
+#, fuzzy
+#| msgid "Tool Options for the Intelligent Scissors"
+msgid "Using Intelligent Scissors"
+msgstr "Opciones de la herramienta"
+
+#: src/toolbox/tool-iscissors.xml:141(para)
+msgid ""
+"Each time you left-click with the mouse, you create a new control point, "
+"which is connected to the last control point by a curve that tries to follow "
+"edges in the image. To finish, click on the first point (the cursor changes "
+"to indicate when you are in the right spot). You can adjust the curve by "
+"dragging the control nodes, or by clicking to create new control nodes. When "
+"you are satisfied, click anywhere inside the curve to convert it into a "
+"selection."
 msgstr ""
+"Cada vez que se hace un clic izquierdo con el ratÃ³n, se crea un punto de "
+"control, que se conecta con el punto de control anteriormente colocado, por "
+"una curva que intenta seguir bordes de la imagen. Para finalizar, haga clic "
+"sobre el primer punto de control (el cursor cambia para indicar cuÃ¡ndo se "
+"halla en el punto correcto). Puede ajustar la curva arrastrando los puntos "
+"de control. Cuando estÃ© satisfecho, haga clic en cualquier lugar dentro de "
+"la curva para convertirla en una selecciÃ³n."
 
-#: src/toolbox/tool-iscissors.xml:118(para)
+#: src/toolbox/tool-iscissors.xml:150(para)
 msgid ""
 "As said above when you click with this tool you drop points. The selection "
 "boundary is driven by these control points. During creation you can move "
 "each one by clicking and dragging, except the first and the last one. The "
 "selection is closed when you are clicking the last point over the first one. "
 "When the selection is closed the pointer shape changes according to its "
-"position: inside <placeholder-1/> , on the boundary <placeholder-2/> and "
-"outside <placeholder-3/> . You can adjust the selection creating new points "
-"by clicking on the boundary or by moving each control points (merged first "
-"and last point). The selection is validated when you click inside."
+"position: inside <guiicon><inlinegraphic fileref=\"images/toolbox/cissors-"
+"mouse.png\"/></guiicon>, on the boundary <guiicon><inlinegraphic fileref="
+"\"images/toolbox/cissors-plus.png\"/></guiicon>, and outside "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/cissors-bad.png\"/></"
+"guiicon>. You can adjust the selection creating new points by clicking on "
+"the boundary or by moving each control points (merged first and last point). "
+"The selection is validated when you click inside."
 msgstr ""
 
-#: src/toolbox/tool-iscissors.xml:134(para)
+#: src/toolbox/tool-iscissors.xml:175(para)
 msgid ""
 "You have to notice that you can get only one selection; if you create a "
 "second selection, the first one is erased when you validate the second one."
 msgstr ""
 
-#: src/toolbox/tool-iscissors.xml:140(para)
+#: src/toolbox/tool-iscissors.xml:181(para)
 msgid ""
 "Be sure not to click inside the curve until you are completely done "
 "adjusting it. Once you have converted it into a selection, undoing takes you "
@@ -5839,33 +5451,27 @@ msgid ""
 "with the Path tool.)"
 msgstr ""
 
-#: src/toolbox/tool-iscissors.xml:150(para)
-#: src/toolbox/tool-free-select.xml:98(para)
+#: src/toolbox/tool-iscissors.xml:191(para)
+#: src/toolbox/tool-free-select.xml:136(para)
 msgid ""
 "To move the selection, see <link linkend=\"gimp-using-selections-moving"
 "\">Moving selections</link>."
 msgstr ""
 
-#: src/toolbox/tool-iscissors.xml:161(phrase)
+#: src/toolbox/tool-iscissors.xml:200(title)
 msgid "Tool Options for the Intelligent Scissors"
 msgstr "Opciones de la herramienta"
 
-#: src/toolbox/tool-iscissors.xml:169(para)
-msgid ""
-"You can get the tool option display by double-clicking on the <placeholder-1/"
-"> icon within the Tool box."
-msgstr ""
-
-#: src/toolbox/tool-iscissors.xml:176(term)
-#: src/toolbox/tool-ellipse-select.xml:189(term)
-msgid "Modes; Antialias; Feather edges"
+#: src/toolbox/tool-iscissors.xml:213(term)
+#: src/toolbox/tool-ellipse-select.xml:197(term)
+msgid "Modes; Antialiasing; Feather edges"
 msgstr ""
 
-#: src/toolbox/tool-iscissors.xml:186(term)
+#: src/toolbox/tool-iscissors.xml:221(term)
 msgid "Interactive boundary"
 msgstr "Mostrar los lÃmites interactivamente"
 
-#: src/toolbox/tool-iscissors.xml:188(para)
+#: src/toolbox/tool-iscissors.xml:223(para)
 msgid ""
 "If this option is enabled, dragging a control node during placement will "
 "indicate the path that will be taken by the selection boundary. If it is not "
@@ -5881,49 +5487,16 @@ msgstr ""
 "ratÃ³n. En sistemas lentos, si los puntos estÃ¡n muy alejados, desactivar esta "
 "opciÃ³n puede hacer que la herramienta trabaje mÃ¡s rÃ¡pido."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ink.xml:41(None)
-msgid "@@image: 'images/toolbox/toolbox-pen.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ink.xml:65(None) src/toolbox/tool-ink.xml:98(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-ink-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ink.xml:91(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-ink.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ink.xml:195(None)
-msgid ""
-"@@image: 'images/tool-options/ink-type-circle.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-ink.xml:18(date) src/toolbox/tool-dodge-burn.xml:16(date)
-#: src/toolbox/intro.xml:17(date)
-msgid "2006-02-09"
-msgstr "2006-08-06"
-
-#: src/toolbox/tool-ink.xml:24(phrase) src/toolbox/tool-ink.xml:28(secondary)
-#: src/toolbox/tool-ink.xml:31(primary)
+#: src/toolbox/tool-ink.xml:15(title) src/toolbox/tool-ink.xml:18(secondary)
+#: src/toolbox/tool-ink.xml:21(primary)
 msgid "Ink"
 msgstr "Herramienta de tinta"
 
-#: src/toolbox/tool-ink.xml:35(phrase)
+#: src/toolbox/tool-ink.xml:25(title)
 msgid "The <quote>Ink</quote> tool in Toolbox"
 msgstr "La tinta en la caja de herramientas"
 
-#: src/toolbox/tool-ink.xml:45(para)
+#: src/toolbox/tool-ink.xml:33(para)
 msgid ""
 "The Ink tool uses a simulation of an ink pen with a controllable nib to "
 "paint solid brush strokes with an antialiased edge. The size, shape and "
@@ -5934,41 +5507,50 @@ msgstr ""
 "El tamaÃ±o, la forma y el Ã¡ngulo del plumÃn pueden ajustarse para determinar "
 "cÃ³mo se dibujan los trazos."
 
-#: src/toolbox/tool-ink.xml:54(para)
+#: src/toolbox/tool-ink.xml:41(para)
 msgid "You can find the Ink tool in several ways :"
 msgstr ""
 
-#: src/toolbox/tool-ink.xml:57(para)
+#: src/toolbox/tool-ink.xml:44(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"In the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint Tools</"
-"guisubmenu><guimenuitem>In<accel>k</accel></guimenuitem></menuchoice>."
+"In the image-menu through: <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Ink</guimenuitem></"
+"menuchoice>."
 msgstr ""
-"La tinta puede activarse desde el menÃº de la imagen: <guimenuitem><accel>H</"
-"accel>erramientas</guimenuitem>/ <guimenuitem>Herramientas de <accel>p</"
-"accel>intura </guimenuitem>/<guimenuitem><accel>T</accel>inta .</guimenuitem>"
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-ink.xml:69(para)
-msgid "By using the <keycap>K</keycap> keyboard shortcut."
+#: src/toolbox/tool-ink.xml:54(para)
+msgid ""
+"By clicking on the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-ink-22.png\"/></guiicon> in Toolbox,"
 msgstr ""
 
-#: src/toolbox/tool-ink.xml:79(para)
+#: src/toolbox/tool-ink.xml:62(para)
+#, fuzzy
+#| msgid "or by using the <keycap>B</keycap> keyboard shortcut."
+msgid "or by using the <keycap>K</keycap> keyboard shortcut."
+msgstr "o por medio del atajo de teclado <keycap>B</keycap>."
+
+#: src/toolbox/tool-ink.xml:71(para)
 msgid "This tool has no special modifier keys."
 msgstr ""
 
-#: src/toolbox/tool-ink.xml:87(phrase)
+#: src/toolbox/tool-ink.xml:77(title)
 msgid "Ink Tool options"
 msgstr "Opciones de la herramienta tinta"
 
-#: src/toolbox/tool-ink.xml:95(para)
-msgid ""
-"You can find tool options by double clicking on the ink tool icon. "
-"<placeholder-1/> in Toolbox."
-msgstr ""
-"Las opciones disponibles para esta herramienta pueden ser accedidas "
-"realizando doble clic sobre su icono. <placeholder-1/>"
-
-#: src/toolbox/tool-ink.xml:103(term) src/toolbox/tool-blend.xml:158(term)
+#: src/toolbox/tool-ink.xml:89(term)
+#: src/toolbox/tool-bucket-fill.xml:126(term)
+#: src/toolbox/tool-blend.xml:146(term)
 #, fuzzy
 msgid "Mode; Opacity"
 msgstr ""
@@ -5977,11 +5559,11 @@ msgstr ""
 "#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Modo"
 
-#: src/toolbox/tool-ink.xml:109(term)
+#: src/toolbox/tool-ink.xml:95(term)
 msgid "Adjustment"
 msgstr "Ajuste"
 
-#: src/toolbox/tool-ink.xml:115(para)
+#: src/toolbox/tool-ink.xml:101(para)
 msgid ""
 "Controls the apparent width of the pen's nib with values that ranges from 0 "
 "(very thin) to 20 (very thick)."
@@ -5989,17 +5571,17 @@ msgstr ""
 "Controla el ancho del plumÃn de la estilogrÃ¡fica, que varÃa desde 0 (muy "
 "fino) hasta 20 (muy grueso)"
 
-#: src/toolbox/tool-ink.xml:124(para)
+#: src/toolbox/tool-ink.xml:110(para)
 msgid ""
 "This controls the apparent angle of the pen's nib relative to horizontal."
 msgstr ""
 "Controla el Ã¡ngulo del plumÃn de la estilogrÃ¡fica relativo a la horizontal."
 
-#: src/toolbox/tool-ink.xml:134(term)
+#: src/toolbox/tool-ink.xml:120(term)
 msgid "Sensitivity"
 msgstr "Sensibilidad"
 
-#: src/toolbox/tool-ink.xml:140(para)
+#: src/toolbox/tool-ink.xml:126(para)
 msgid ""
 "This controls the size of the nib, from minimum to maximum. Note that a size "
 "of 0 does not result in a nib of size zero, but rather a nib of minimum size."
@@ -6007,11 +5589,11 @@ msgstr ""
 "Controla el tamaÃ±o del plumÃn, desde mÃnimo hasta mÃ¡ximo. Note que un tamaÃ±o "
 "de 0 no da un plumÃn de tamaÃ±o cero, sino un plumÃn con el mÃnimo de tamaÃ±o."
 
-#: src/toolbox/tool-ink.xml:148(term)
+#: src/toolbox/tool-ink.xml:134(term)
 msgid "Tilt"
 msgstr "Alabeo"
 
-#: src/toolbox/tool-ink.xml:150(para)
+#: src/toolbox/tool-ink.xml:136(para)
 msgid ""
 "Controls the apparent tilt of the nib relative to horizontal. This control "
 "and the Angle control described above are interrelated. Experimentation is "
@@ -6021,11 +5603,11 @@ msgstr ""
 "Ã¡ngulo descrito arriba estÃ¡n interrelacionados. Experimentar es la mejor "
 "forma de aprender a usarlos."
 
-#: src/toolbox/tool-ink.xml:159(term)
+#: src/toolbox/tool-ink.xml:145(term)
 msgid "Speed"
 msgstr "Velocidad"
 
-#: src/toolbox/tool-ink.xml:161(para)
+#: src/toolbox/tool-ink.xml:147(para)
 msgid ""
 "This controls the effective size of the nib as a function of drawing speed. "
 "That is, as with a physical pen, the faster you draw, the narrower the line."
@@ -6034,24 +5616,27 @@ msgstr ""
 "Como si fuera una pluma real, mientras mÃ¡s rÃ¡pido dibuje, mÃ¡s fina es la "
 "lÃnea."
 
-#: src/toolbox/tool-ink.xml:172(term)
+#: src/toolbox/tool-ink.xml:158(term)
 msgid "Type and Shape"
 msgstr "Tipo y forma"
 
-#: src/toolbox/tool-ink.xml:176(term)
-#: src/toolbox/tool-dodge-burn.xml:143(term)
+#: src/toolbox/tool-ink.xml:162(term)
+#: src/toolbox/tool-dodge-burn.xml:126(term)
 msgid "Type"
 msgstr "Tipo"
 
-#: src/toolbox/tool-ink.xml:178(para)
-msgid "There are three nib shapes to choose from: circle, diamond, and square."
+#: src/toolbox/tool-ink.xml:164(para)
+#, fuzzy
+#| msgid ""
+#| "There are three nib shapes to choose from: circle, diamond, and square."
+msgid "There are three nib shapes to choose from: circle, square, and diamond."
 msgstr "Hay tres formas de plumÃn para elegir: circular, diamante y cuadrada."
 
-#: src/toolbox/tool-ink.xml:185(term) src/toolbox/tool-blend.xml:204(term)
+#: src/toolbox/tool-ink.xml:171(term) src/toolbox/tool-blend.xml:192(term)
 msgid "Shape"
 msgstr "Forma"
 
-#: src/toolbox/tool-ink.xml:187(para)
+#: src/toolbox/tool-ink.xml:173(para)
 msgid ""
 "The geometry of the nib type can be adjusted by holding button 1 of the "
 "mouse on the small square at the center of the Shape icon and moving it "
@@ -6061,59 +5646,13 @@ msgstr ""
 "<mousebutton>BotÃ³n 1</mousebutton> del mouse sobre el pequeÃ±o cuadrado que "
 "estÃ¡ en el centro del icono de forma, y moviÃ©ndolo."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-hue-saturation.xml:53(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-hue-saturation-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-hue-saturation.xml:71(None)
-msgid ""
-"@@image: 'images/toolbox/tools-hue-sat.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-hue-saturation.xml:111(None)
-msgid ""
-"@@image: 'images/toolbox/hue-sat-overlap-1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-hue-saturation.xml:122(None)
-msgid ""
-"@@image: 'images/toolbox/hue-sat-overlap-2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-hue-saturation.xml:132(None)
-msgid ""
-"@@image: 'images/toolbox/hue-sat-overlap-3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-hue-saturation.xml:18(date)
-#: src/toolbox/tool-flip.xml:18(date)
-#, fuzzy
-msgid "2008-01-14"
-msgstr ""
-"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-18\n"
-"#-#-#-#-#  tool-hue-saturation.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-04-14"
-
-#: src/toolbox/tool-hue-saturation.xml:24(phrase)
-#: src/toolbox/tool-hue-saturation.xml:28(secondary)
-#: src/toolbox/tool-hue-saturation.xml:31(primary)
+#: src/toolbox/tool-hue-saturation.xml:16(title)
+#: src/toolbox/tool-hue-saturation.xml:20(secondary)
+#: src/toolbox/tool-hue-saturation.xml:23(primary)
 msgid "Hue-Saturation"
 msgstr "Tono-SaturaciÃ³n"
 
-#: src/toolbox/tool-hue-saturation.xml:33(para)
+#: src/toolbox/tool-hue-saturation.xml:26(para)
 msgid ""
 "The Hue-Saturation tool is used to adjust hue, saturation and lightness "
 "levels on a range of color weights for the selected area or active layer."
@@ -6122,28 +5661,34 @@ msgstr ""
 "saturaciÃ³n y la luminosidad de un rango de color en la capa activa o "
 "selecciÃ³n."
 
-#: src/toolbox/tool-hue-saturation.xml:41(para)
-msgid "You can get to the Hue-Saturationtool in two ways :"
-msgstr "Puedes obtener la herramienta tono-saturaciÃ³n de dos maneras:"
+#: src/toolbox/tool-hue-saturation.xml:32(para)
+msgid "You can get to the Hue-Saturation tool in two ways :"
+msgstr "Puede obtener la herramienta colorizar de dos maneras:"
 
-#: src/toolbox/tool-hue-saturation.xml:44(para)
+#: src/toolbox/tool-hue-saturation.xml:35(para)
+#, fuzzy
+#| msgid ""
+#| "In the the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
+#| "guimenu><guisubmenu><accel>C</accel>olor Tools</"
+#| "guisubmenu><guimenuitem>Hue- <accel>S</accel>aturation</guimenuitem></"
+#| "menuchoice>, or <menuchoice><guimenu>Colors</guimenu><guimenuitem>Hue-"
+#| "Saturation</guimenuitem></menuchoice>"
 msgid ""
-"In the the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>C</accel>olor Tools</guisubmenu><guimenuitem>Hue- "
-"<accel>S</accel>aturation</guimenuitem></menuchoice>, or "
-"<menuchoice><guimenu>Colors</guimenu><guimenuitem>Hue-Saturation</"
-"guimenuitem></menuchoice>"
+"In the the image-menu through: <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Hue-Saturation</"
+"guimenuitem></menuchoice>, or <menuchoice><guimenu>Colors</"
+"guimenu><guimenuitem>Hue-Saturation</guimenuitem></menuchoice>"
 msgstr ""
 "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
 "guimenu><guisubmenu>Herramientas de <accel>C</accel>olor</"
 "guisubmenu><guimenuitem>Tono-<accel>S</accel>aturaciÃ³n</guimenuitem></"
 "menuchoice>"
 
-#: src/toolbox/tool-hue-saturation.xml:51(para)
-#: src/toolbox/tool-color-balance.xml:57(para)
+#: src/toolbox/tool-hue-saturation.xml:49(para)
 #, fuzzy
 msgid ""
-"By clicking the tool icon: <placeholder-1/> in Toolbox, provided that you "
+"By clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-hue-saturation-22.png\"/></guiicon> in Toolbox, provided that you "
 "have installed color tools in Toolbox. For this, go to <link linkend=\"gimp-"
 "tools-dialog\">Tools Dialog</link>."
 msgstr ""
@@ -6156,15 +5701,15 @@ msgstr ""
 "herramientas, si ya la ha instalado en ella. Para esto, ir a <link linkend="
 "\"gimp-tools-dialog\">DiÃ¡logo de herramientas</link>."
 
-#: src/toolbox/tool-hue-saturation.xml:67(phrase)
+#: src/toolbox/tool-hue-saturation.xml:66(title)
 msgid "Hue-Saturation tool options"
 msgstr "Opciones de la herramienta Tono-SaturaciÃ³n"
 
-#: src/toolbox/tool-hue-saturation.xml:77(term)
+#: src/toolbox/tool-hue-saturation.xml:117(term)
 msgid "Select Primary Color to Adjust"
 msgstr "Seleccionar el color primario a usar"
 
-#: src/toolbox/tool-hue-saturation.xml:79(para)
+#: src/toolbox/tool-hue-saturation.xml:119(para)
 msgid ""
 "You can choose, between six, the three primary colors (Red, Green and Blue) "
 "and the three complementary colors (Cyan, Magenta and Yellow), the color to "
@@ -6178,66 +5723,74 @@ msgstr ""
 "cÃrculo de color. Si pulsa en el botÃ³n <guilabel>Principal</guilabel>, todos "
 "los colores se verÃ¡n afectados con los cambios."
 
-#: src/toolbox/tool-hue-saturation.xml:90(para)
+#: src/toolbox/tool-hue-saturation.xml:130(para)
 msgid ""
 "Hue changes are shown in color swatches and the result is visible in the "
 "image if the <quote>Preview</quote> option is enabled."
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:97(term)
+#: src/toolbox/tool-hue-saturation.xml:137(term)
 msgid "Overlap"
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:99(para)
+#: src/toolbox/tool-hue-saturation.xml:139(para)
 msgid ""
 "This slider lets you set how much color ranges will overlap. This effect is "
 "very subtle and works on very next colors only:"
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:105(phrase)
+#: src/toolbox/tool-hue-saturation.xml:145(phrase)
 msgid "Example for the <quote>Overlap</quote> option"
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:114(para)
+#: src/toolbox/tool-hue-saturation.xml:155(para)
 msgid ""
 "<emphasis>Original image</emphasis>. From the left to the right: a reddish "
 "yellow (255;240;0); a pure yellow (255;255;0); a greenish yellow (240;255;0)."
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:125(para)
+#: src/toolbox/tool-hue-saturation.xml:168(para)
 msgid ""
 "<emphasis>Overlap = 0</emphasis>. Hue = 15. Colors become (186;255;1), "
-"(168;255,1), (156,255,1)."
+"(168;255;1), (156;255;1)."
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:135(para)
+#: src/toolbox/tool-hue-saturation.xml:180(para)
 msgid ""
 "<emphasis>Overlap = 100</emphasis>. Hue = 15. Colors become (192;255;1), "
 "(168;255;1), (162;255;1). Because of overlap, greenish is less green and "
 "reddish is less red."
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:146(term)
+#: src/toolbox/tool-hue-saturation.xml:192(term)
 msgid "Adjust Selected Color"
 msgstr "Modificar el color seleccionado"
 
-#: src/toolbox/tool-hue-saturation.xml:150(para)
+#: src/toolbox/tool-hue-saturation.xml:196(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Hue</guilabel> : The slider and the input box allow you to "
+#| "select a hue in the color circle (-180, 180)."
 msgid ""
-"<guilabel>Hue</guilabel> : The slider and the input box allow you to select "
-"a hue in the color circle (-180, 180)."
+"<guilabel>Hue</guilabel>: The slider and the input box allow you to select a "
+"hue in the color circle (-180, 180)."
 msgstr ""
 "<guilabel>Tono</guilabel> : El deslizador y las casillas permiten "
 "seleccionar un tono del circulo de color (-180, 180)."
 
-#: src/toolbox/tool-hue-saturation.xml:156(para)
+#: src/toolbox/tool-hue-saturation.xml:203(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Lightness</guilabel> : The slider and the input box allow you "
+#| "to select a value (luminosity): -100, 100."
 msgid ""
-"<guilabel>Lightness</guilabel> : The slider and the input box allow you to "
+"<guilabel>Lightness</guilabel>: The slider and the input box allow you to "
 "select a value (luminosity): -100, 100."
 msgstr ""
 "<guilabel>Luminosidad</guilabel> : El deslizador y las casillas permiten "
 "seleccionar un valor (luminosidad): (-100, 100)."
 
-#: src/toolbox/tool-hue-saturation.xml:161(para)
+#: src/toolbox/tool-hue-saturation.xml:209(para)
 msgid ""
 "Lightness changes here concern a color range, while they concern a color "
 "tone with Curves and Levels tools, which work on color channels. If you "
@@ -6246,15 +5799,19 @@ msgid ""
 "with Curves or Levels tools."
 msgstr ""
 
-#: src/toolbox/tool-hue-saturation.xml:172(para)
+#: src/toolbox/tool-hue-saturation.xml:220(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Saturation</guilabel> : The slider and the input box allow you "
+#| "to select a saturation: -100, 100."
 msgid ""
-"<guilabel>Saturation</guilabel> : The slider and the input box allow you to "
+"<guilabel>Saturation</guilabel>: The slider and the input box allow you to "
 "select a saturation: -100, 100."
 msgstr ""
 "<guilabel>SaturaciÃ³n</guilabel> : El deslizador y las casillas permiten "
 "seleccionar una saturaciÃ³n: (-100, 100)."
 
-#: src/toolbox/tool-hue-saturation.xml:178(para)
+#: src/toolbox/tool-hue-saturation.xml:227(para)
 msgid ""
 "The <guilabel>Initialize Color</guilabel> button deletes changes to hue, "
 "lightness and saturation of the selected color."
@@ -6262,7 +5819,7 @@ msgstr ""
 "<guilabel>Restablecer color</guilabel> : Borra los cambios en el tono, la "
 "luminosidad y la saturaciÃ³n del color seleccionado."
 
-#: src/toolbox/tool-hue-saturation.xml:188(para)
+#: src/toolbox/tool-hue-saturation.xml:237(para)
 msgid ""
 "The Preview button makes all changes dynamically so that they can be viewed "
 "straight away."
@@ -6270,47 +5827,16 @@ msgstr ""
 "La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
 "Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-heal.xml:36(None)
-msgid "@@image: 'images/toolbox/toolbox-heal.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-heal.xml:76(None) src/toolbox/tool-heal.xml:147(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-heal-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-heal.xml:140(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-heal.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-heal.xml:202(None)
-msgid "@@image: 'images/toolbox/heal-compar.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-heal.xml:15(date)
-msgid "2007-10-27"
-msgstr ""
-
-#: src/toolbox/tool-heal.xml:21(phrase)
-#: src/toolbox/tool-heal.xml:25(secondary)
-#: src/toolbox/tool-heal.xml:28(primary)
+#: src/toolbox/tool-heal.xml:13(title) src/toolbox/tool-heal.xml:16(secondary)
+#: src/toolbox/tool-heal.xml:19(primary)
 msgid "Heal"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:32(phrase)
+#: src/toolbox/tool-heal.xml:23(title)
 msgid "The <quote>Heal tool</quote> in the Toolbox"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:40(para)
+#: src/toolbox/tool-heal.xml:30(para)
 msgid ""
 "This tool was once described as <quote>The healing brush looks like a smart "
 "clone tool on steroids</quote>. And indeed the Healing Tool is a close "
@@ -6322,7 +5848,7 @@ msgid ""
 "Georgiev <xref linkend=\"bibliography-online-georgiev\"/>."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:51(para)
+#: src/toolbox/tool-heal.xml:41(para)
 msgid ""
 "To use it, first choose a brush with a size adapted to the defect. Then "
 "<keycap>Ctrl</keycap>-click on the area you want to reproduce. Release the "
@@ -6332,24 +5858,33 @@ msgid ""
 "risk of daubing"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:68(para)
+#: src/toolbox/tool-heal.xml:57(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"From the image-menu: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint tools</"
-"guisubmenu><guimenuitem><accel>H</accel>eal</guimenuitem></menuchoice>,"
+"From the image-menu: <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint "
+"tools</guisubmenu><guimenuitem>Heal</guimenuitem></menuchoice>,"
 msgstr ""
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-heal.xml:74(para)
+#: src/toolbox/tool-heal.xml:67(para)
 msgid ""
-"The Tool can also be called by clicking the tool icon: <placeholder-1/> in "
-"the Toolbox,"
+"or by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-heal-22.png\"/></guiicon> in the Toolbox,"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:81(para)
+#: src/toolbox/tool-heal.xml:76(para)
 msgid "or by clicking on the <keycap>H</keycap> keyboard shortcut."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:97(para)
+#: src/toolbox/tool-heal.xml:91(para)
 msgid ""
 "The Ctrl key is used to select the source. You can heal from any layer of "
 "any image, by clicking on the image display, with the Ctrl key held down, "
@@ -6360,7 +5895,7 @@ msgid ""
 "In source-selection mode, the cursor changes to a crosshair-symbol."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:115(para)
+#: src/toolbox/tool-heal.xml:109(para)
 msgid ""
 "Once the source is set, if you press this key, you will see a thin line "
 "connecting the previously clicked point with the current pointer location. "
@@ -6368,136 +5903,82 @@ msgid ""
 "down, the tool will <quote>heal</quote> along this line."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:136(phrase)
+#: src/toolbox/tool-heal.xml:124(title)
 msgid "Heal Tool options"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:144(para)
-msgid ""
-"The available tool options can be accessed by double clicking the Heal tool "
-"icon. <placeholder-1/> in the Toolbox."
-msgstr ""
-
-#: src/toolbox/tool-heal.xml:150(para)
-msgid ""
-"The options of this tool are common with the other painting tools and are "
-"described in <link linkend=\"gimp-tool-painting\">Common options of painting "
-"tools</link>. The <quote>Alignment</quote> option is described in <link "
-"linkend=\"gimp-tool-clone\">Clone tool</link>."
-msgstr ""
-
-#: src/toolbox/tool-heal.xml:158(term) src/toolbox/tool-clone.xml:148(term)
+#: src/toolbox/tool-heal.xml:136(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
+#| "edges"
 msgid ""
-"Mode; Opacity; Brush; Pressure Sensitivity, Fade out, Apply Jitter, Hard "
+"Mode; Opacity; Brush; Scale; Brush Dynamics, Fade out, Apply Jitter, Hard "
 "Edges"
-msgstr ""
+msgstr "Opacidad"
 
-#: src/toolbox/tool-heal.xml:167(term)
+#: src/toolbox/tool-heal.xml:145(term)
 msgid "Sample merged"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:169(para)
+#: src/toolbox/tool-heal.xml:147(para)
 msgid ""
 "If you enable this option, healing is not calculated only from the values of "
 "the active layer, but from all visible layers."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:176(term) src/toolbox/tool-clone.xml:194(term)
+#: src/toolbox/tool-heal.xml:154(term) src/toolbox/tool-clone.xml:224(term)
 msgid "Alignment"
 msgstr "AlineaciÃ³n"
 
-#: src/toolbox/tool-heal.xml:178(para)
+#: src/toolbox/tool-heal.xml:156(para)
 msgid ""
 "This option is described in <link linkend=\"gimp-tool-clone\">Clone tool</"
 "link>."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:188(phrase)
+#: src/toolbox/tool-heal.xml:166(title)
 msgid "Healing is not cloning"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:190(para)
+#: src/toolbox/tool-heal.xml:167(para)
 msgid ""
 "Although the Heal tool has common features with the Clone tool on using, the "
 "result is quite different."
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:196(phrase)
-msgid "Comparing <quote>Heal</quote> and <quote>Clone</quote>"
+#: src/toolbox/tool-heal.xml:172(title)
+msgid "Comparing <quote>Clone</quote> and <quote>Heal</quote>"
 msgstr ""
 
-#: src/toolbox/tool-heal.xml:205(para)
+#: src/toolbox/tool-heal.xml:178(para)
 msgid ""
 "Two black spots in the red area. Zoom x800. The source is where the four "
 "colors meet. Cloning on the left spot. Healing on the right spot."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-fuzzy-select.xml:46(None)
-msgid "@@image: 'images/toolbox/toolbox-wand.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-fuzzy-select.xml:89(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-fuzzy-select-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-fuzzy-select.xml:116(None)
-msgid ""
-"@@image: 'images/toolbox/fuzzy-selection.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-fuzzy-select.xml:145(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-wand.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-fuzzy-select.xml:18(date)
-#: src/toolbox/tool-free-select.xml:18(date)
-#: src/toolbox/tool-ellipse-select.xml:19(date)
-#: src/toolbox/tool-by-color-select.xml:19(date)
-#, fuzzy
-msgid "2007-12-22"
-msgstr ""
-"#-#-#-#-#  tool-by-color-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-03-27\n"
-"#-#-#-#-#  tool-ellipse-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2006-10-13\n"
-"#-#-#-#-#  tool-free-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-03-27\n"
-"#-#-#-#-#  tool-fuzzy-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"2007-03-27"
-
-#: src/toolbox/tool-fuzzy-select.xml:24(phrase)
+#: src/toolbox/tool-fuzzy-select.xml:15(phrase)
 msgid "Fuzzy selection (Magic wand)"
 msgstr "Herramienta de selecciÃ³n borrosa (la varita mÃ¡gica)"
 
-#: src/toolbox/tool-fuzzy-select.xml:28(secondary)
-#: src/toolbox/tool-fuzzy-select.xml:35(primary)
+#: src/toolbox/tool-fuzzy-select.xml:19(secondary)
+#: src/toolbox/tool-fuzzy-select.xml:26(primary)
 msgid "Fuzzy Selection"
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:32(secondary)
+#: src/toolbox/tool-fuzzy-select.xml:23(secondary)
 msgid "Fuzzy selection"
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:38(primary)
+#: src/toolbox/tool-fuzzy-select.xml:29(primary)
 msgid "Magic Wand"
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:42(phrase)
+#: src/toolbox/tool-fuzzy-select.xml:34(phrase)
 msgid "Magic Wand tool icon in the Toolbox"
 msgstr "La varita mÃ¡gica en la caja de herramientas"
 
-#: src/toolbox/tool-fuzzy-select.xml:50(para)
+#: src/toolbox/tool-fuzzy-select.xml:43(para)
 msgid ""
 "The Fuzzy Select (Magic Wand) tool is designed to select areas of the "
 "current layer or image based on color similarity."
@@ -6510,7 +5991,7 @@ msgstr ""
 "rango de similaridad arrastrando el ratÃ³n hacia abajo o hacia la derecha: "
 "mientras mÃ¡s lejos lo lleve, mayor serÃ¡ el Ã¡rea seleccionada."
 
-#: src/toolbox/tool-fuzzy-select.xml:54(para)
+#: src/toolbox/tool-fuzzy-select.xml:47(para)
 msgid ""
 "When using this tool, it is very important to pick the right starting point. "
 "If you select the wrong spot, you might get something very different from "
@@ -6520,16 +6001,28 @@ msgstr ""
 "mÃ¡s apropiado. Si selecciona un mal punto, probablemente obtendrÃ¡ una "
 "selecciÃ³n muy diferente a la esperada."
 
-#: src/toolbox/tool-fuzzy-select.xml:59(para)
+#: src/toolbox/tool-fuzzy-select.xml:52(para)
+#, fuzzy
+#| msgid ""
+#| "The Wand is a good tool for selecting objects with sharp edges. It is fun "
+#| "to use, so beginners often start out using it a lot. You will probably "
+#| "find, however, that the more you use it, the more frustrated you become "
+#| "with the difficulty of selecting exactly what you what, no more, no less. "
+#| "More experienced users find that the <link linkend=\"gimp-tool-path"
+#| "\">Path</link> and <link linkend=\"gimp-tool-by-color-select\">Color "
+#| "Select</link> tools are often more efficient, and use the Wand less. "
+#| "Still, it is useful for selecting an area within a contour, or touching "
+#| "up imperfect selections.It often works very well for selecting a solid-"
+#| "colored (or nearly solid-colored) background area."
 msgid ""
 "The Wand is a good tool for selecting objects with sharp edges. It is fun to "
 "use, so beginners often start out using it a lot. You will probably find, "
 "however, that the more you use it, the more frustrated you become with the "
-"difficulty of selecting exactly what you what, no more, no less. More "
+"difficulty of selecting exactly what you want, no more, no less. More "
 "experienced users find that the <link linkend=\"gimp-tool-path\">Path</link> "
 "and <link linkend=\"gimp-tool-by-color-select\">Color Select</link> tools "
 "are often more efficient, and use the Wand less. Still, it is useful for "
-"selecting an area within a contour, or touching up imperfect selections.It "
+"selecting an area within a contour, or touching up imperfect selections. It "
 "often works very well for selecting a solid-colored (or nearly solid-"
 "colored) background area."
 msgstr ""
@@ -6545,7 +6038,7 @@ msgstr ""
 "hemos dicho, es Ãºtil para las Ã¡reas bien delineadas. En general trabaja bien "
 "para seleccionar fondos con un color sÃ³lido."
 
-#: src/toolbox/tool-fuzzy-select.xml:72(para)
+#: src/toolbox/tool-fuzzy-select.xml:65(para)
 msgid ""
 "Note that as the selected area expands outward from the center, it does not "
 "only propagate to pixels that touch each other: it is capable of jumping "
@@ -6562,22 +6055,40 @@ msgstr ""
 "hacer a la varita mÃ¡s o menos agresiva. El relleno con la cubeta y con la "
 "herramienta de mezcla tambiÃ©n se verÃ¡n afectados."
 
-#: src/toolbox/tool-fuzzy-select.xml:84(para)
+#: src/toolbox/tool-fuzzy-select.xml:78(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Magic Wand Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-fuzzy-select.xml:83(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu bar <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
+#| "guimenuitem></menuchoice>;"
+msgid ""
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Fuzzy Select</"
+"guimenuitem></menuchoice>,"
+msgstr ""
+"Desde el menÃº de la imagen <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de selecciÃ³n</"
+"guisubmenu><guimenuitem>SelecciÃ³n rectangular</guimenuitem></menuchoice>."
+
+#: src/toolbox/tool-fuzzy-select.xml:93(para)
 msgid ""
-"The Magic Wand Tool can be activated from an image menu as "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
-"guisubmenu><guimenuitem>Fuzzy Select</guimenuitem></menuchoice>; from the "
-"Toolbox by clicking on the tool icon <placeholder-1/>; or from the keyboard "
-"using the shortcut <keycap>U</keycap>."
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-fuzzy-select-22.png\"/></guiicon> in the ToolBox,"
 msgstr ""
-"La varita mÃ¡gica se puede activar desde el menÃº de la imagen siguiendo "
-"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
-"selecciÃ³n</guisubmenu><guimenuitem>SelecciÃ³n borrosa</guimenuitem></"
-"menuchoice>; o desde la caja de herramientas haciendo clic sobre el icono "
-"<placeholder-1/>; o por medio del atajo de teclado <keycap>z</keycap>. La \"Z"
-"\" es la inicial de \"Zauber\", tÃ©rmino que en alemÃ¡n significa magia."
 
-#: src/toolbox/tool-fuzzy-select.xml:98(para)
+#: src/toolbox/tool-fuzzy-select.xml:103(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid "by using the keyboard shortcut <keycap>U</keycap>."
+msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
+
+#: src/toolbox/tool-fuzzy-select.xml:114(para)
 msgid ""
 "The Fuzzy Select tool does not have any special key modifiers, only the ones "
 "that affect all selection tools in the same way. See <xref linkend=\"gimp-"
@@ -6588,11 +6099,11 @@ msgstr ""
 "<link linkend=\"gimp-tool-select\">Herramientas de selecciÃ³n</link> para "
 "saber de Ã©stos."
 
-#: src/toolbox/tool-fuzzy-select.xml:110(phrase)
+#: src/toolbox/tool-fuzzy-select.xml:127(phrase)
 msgid "Using Magic Wand tool: selected pixels are contiguous"
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:120(para)
+#: src/toolbox/tool-fuzzy-select.xml:137(para)
 msgid ""
 "It starts selecting when you click at a spot in the image, and expands "
 "outwards like water flooding low-lying areas, selecting contiguous pixels "
@@ -6602,19 +6113,19 @@ msgid ""
 "reduce the selection by dragging upwards or to the left."
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:128(para)
-#: src/toolbox/tool-by-color-select.xml:105(para)
+#: src/toolbox/tool-fuzzy-select.xml:145(para)
+#: src/toolbox/tool-by-color-select.xml:110(para)
 msgid ""
 "To move the selection see <link linkend=\"gimp-using-selections-moving"
 "\">Moving selections</link>."
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:141(phrase)
+#: src/toolbox/tool-fuzzy-select.xml:159(phrase)
 msgid "Tool Options for the Magic Wand tool"
 msgstr "Opciones de herramienta para la varita mÃ¡gica"
 
-#: src/toolbox/tool-fuzzy-select.xml:162(term)
-#: src/toolbox/tool-bucket-fill.xml:221(term)
+#: src/toolbox/tool-fuzzy-select.xml:183(term)
+#: src/toolbox/tool-bucket-fill.xml:211(term)
 #, fuzzy
 msgid "Finding Similar Colors"
 msgstr ""
@@ -6623,7 +6134,7 @@ msgstr ""
 "#-#-#-#-#  tool-fuzzy-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Buscando colores similares"
 
-#: src/toolbox/tool-fuzzy-select.xml:164(para)
+#: src/toolbox/tool-fuzzy-select.xml:185(para)
 msgid ""
 "These options affect the way the Magic Wand expands the selection out from "
 "the initial point."
@@ -6631,11 +6142,11 @@ msgstr ""
 "Estas opciones afectan a la manera en que la varita mÃ¡gica expande la "
 "selecciÃ³n desde el punto inicial."
 
-#: src/toolbox/tool-fuzzy-select.xml:170(term)
+#: src/toolbox/tool-fuzzy-select.xml:191(term)
 msgid "Select Transparent Areas"
 msgstr "Seleccionar las Ã¡reas transparentes"
 
-#: src/toolbox/tool-fuzzy-select.xml:172(para)
+#: src/toolbox/tool-fuzzy-select.xml:193(para)
 msgid ""
 "This option gives the Magic Wand the ability to select areas that are "
 "completely transparent. If this option is not checked, transparent areas "
@@ -6645,13 +6156,13 @@ msgstr ""
 "completamente transparentes. Si esta opciÃ³n no estÃ¡ activada, las Ã¡reas "
 "transparentes no van a ser incluidas en la selecciÃ³n."
 
-#: src/toolbox/tool-fuzzy-select.xml:181(term)
-#: src/toolbox/tool-color-picker.xml:175(term)
-#: src/toolbox/tool-bucket-fill.xml:238(term)
+#: src/toolbox/tool-fuzzy-select.xml:202(term)
+#: src/toolbox/tool-color-picker.xml:141(term)
+#: src/toolbox/tool-bucket-fill.xml:228(term)
 msgid "Sample Merged"
 msgstr "Muestra combinada"
 
-#: src/toolbox/tool-fuzzy-select.xml:183(para)
+#: src/toolbox/tool-fuzzy-select.xml:204(para)
 msgid ""
 "This option becomes relevant when you have several layers in your image, and "
 "the active layer is either semi-transparent or is set to another Layer Mode "
@@ -6672,7 +6183,7 @@ msgstr ""
 "las capas visibles. Para mayor informaciÃ³n, vea la entrada del glosario "
 "<xref linkend=\"glossary-samplemerge\"/>."
 
-#: src/toolbox/tool-fuzzy-select.xml:201(para)
+#: src/toolbox/tool-fuzzy-select.xml:222(para)
 msgid ""
 "This slider determines the range of colors that will be selected at the "
 "moment you click the pointer on the initial point, before dragging it: the "
@@ -6690,17 +6201,17 @@ msgstr ""
 "arrastra el ratÃ³n, por lo tanto tiene las mismas posibilidades "
 "independientemente del umbral, que define sÃ³lo el valor inicial."
 
-#: src/toolbox/tool-fuzzy-select.xml:216(term)
+#: src/toolbox/tool-fuzzy-select.xml:237(term)
 msgid "Selection by"
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:218(para)
+#: src/toolbox/tool-fuzzy-select.xml:239(para)
 msgid ""
 "With this option you can choose which component of the image GIMP shall use "
 "to calculate the similarity."
 msgstr ""
 
-#: src/toolbox/tool-fuzzy-select.xml:222(para)
+#: src/toolbox/tool-fuzzy-select.xml:243(para)
 msgid ""
 "The components you can choose from are <guimenuitem>Red</guimenuitem>, "
 "<guimenuitem>Green</guimenuitem>, <guimenuitem>Blue</guimenuitem>, "
@@ -6708,57 +6219,31 @@ msgid ""
 "<guimenuitem>Value</guimenuitem>."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-free-select.xml:43(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-lasso.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-free-select.xml:79(None)
-#: src/toolbox/tool-free-select.xml:129(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-free-select-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-free-select.xml:108(None)
-msgid ""
-"@@image: 'images/toolbox/free-selection.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-free-select.xml:123(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-lasso.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-free-select.xml:24(phrase)
+#: src/toolbox/tool-free-select.xml:15(title)
 msgid "Free Selection (Lasso)"
 msgstr "Herramienta de selecciÃ³n libre (el lazo)"
 
-#: src/toolbox/tool-free-select.xml:28(secondary)
+#: src/toolbox/tool-free-select.xml:19(secondary)
+#: src/toolbox/tool-free-select.xml:23(secondary)
 msgid "Free Selection"
 msgstr ""
 
-#: src/toolbox/tool-free-select.xml:32(secondary)
-msgid "Free selection"
-msgstr ""
+#: src/toolbox/tool-free-select.xml:27(secondary)
+#: src/toolbox/tool-free-select.xml:29(primary)
+#, fuzzy
+#| msgid "Ellipse Selection"
+msgid "Polygonal Selection"
+msgstr "Herramienta de selecciÃ³n elÃptica"
 
-#: src/toolbox/tool-free-select.xml:35(primary)
+#: src/toolbox/tool-free-select.xml:30(primary)
 msgid "Lasso"
 msgstr ""
 
-#: src/toolbox/tool-free-select.xml:39(phrase)
+#: src/toolbox/tool-free-select.xml:33(title)
 msgid "Free Selection icon in the Toolbox"
 msgstr "El icono del lazo en la caja de herramientas"
 
-#: src/toolbox/tool-free-select.xml:47(para)
+#: src/toolbox/tool-free-select.xml:41(para)
 msgid ""
 "The Free Selection tool, or Lasso, lets you create a selection by drawing it "
 "free-hand with the pointer, while holding down the left mouse button (or, "
@@ -6782,7 +6267,7 @@ msgstr ""
 "esbozo con el lazo y luego cambiar al modo de <link linkend=\"gimp-qmask"
 "\">mÃ¡scara rÃ¡pida</link> para trabajar en detalles."
 
-#: src/toolbox/tool-free-select.xml:59(para)
+#: src/toolbox/tool-free-select.xml:53(para)
 msgid ""
 "For information on selections and how they are used in GIMP see <link "
 "linkend=\"gimp-concepts-selection\">Selections</link>. For information on "
@@ -6795,7 +6280,7 @@ msgstr ""
 "comÃºn se describe en la secciÃ³n <link linkend=\"gimp-tool-select"
 "\">Herramientas de selecciÃ³n</link>."
 
-#: src/toolbox/tool-free-select.xml:65(para)
+#: src/toolbox/tool-free-select.xml:61(para)
 msgid ""
 "The Free Selection tool is much easier to use with a tablet than with a "
 "mouse."
@@ -6803,21 +6288,59 @@ msgstr ""
 "La herramienta de selecciÃ³n libre es mucho mÃ¡s fÃ¡cil de utilizar con una "
 "tableta que con el ratÃ³n."
 
-#: src/toolbox/tool-free-select.xml:74(para)
+#: src/toolbox/tool-free-select.xml:67(para)
 msgid ""
-"The Lasso Tool can be activated from an image menu as "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
-"guisubmenu><guimenuitem>Free Select</guimenuitem></menuchoice>; from the "
-"Toolbox by clicking on the tool icon <placeholder-1/>; or from the keyboard "
-"using the shortcut <keycap>f</keycap>."
+"A new possibility came up with GIMP-2.6: the polygonal selection. Instead of "
+"click-and-dragging to draw a free hand selection, you can click only. This "
+"creates an anchor point. Then moving the mouse pointer draws a line with a "
+"new anchor point that you can move as long as you don't click again (the "
+"mouse pointer comes with the moving cross). Clicking again anchors this "
+"point and creates a segment. By pressing the <keycap>Ctrl</keycap> keyboard "
+"key while moving the mouse pointer contrains moving angles to 15Â°."
 msgstr ""
-"El lazo puede activarse desde el menÃº de la imagen siguiendo "
-"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
-"selecciÃ³n</guisubmenu><guimenuitem>SelecciÃ³n libre</guimenuitem></"
-"menuchoice>; desde la caja de herramientas haciendo clic sobre el icono "
-"<placeholder-1/>; o desde el teclado por medio del atajo <keycap>f</keycap>."
 
-#: src/toolbox/tool-free-select.xml:87(para)
+#: src/toolbox/tool-free-select.xml:77(para)
+msgid "So, you can mix free hand segments and polygonal segments."
+msgstr ""
+
+#: src/toolbox/tool-free-select.xml:81(title)
+msgid "Mixing free hand segments and polygonal segments"
+msgstr ""
+
+#: src/toolbox/tool-free-select.xml:92(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Lasso Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-free-select.xml:97(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu bar <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
+#| "guimenuitem></menuchoice>;"
+msgid ""
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Free Select</"
+"guimenuitem></menuchoice>,"
+msgstr ""
+"Desde el menÃº de la imagen <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de selecciÃ³n</"
+"guisubmenu><guimenuitem>SelecciÃ³n rectangular</guimenuitem></menuchoice>."
+
+#: src/toolbox/tool-free-select.xml:107(para)
+msgid ""
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-free-select-22.png\"/></guiicon> in the ToolBox,"
+msgstr ""
+
+#: src/toolbox/tool-free-select.xml:117(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid "by using the keyboard shortcut <keycap>F</keycap>."
+msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
+
+#: src/toolbox/tool-free-select.xml:126(para)
 msgid ""
 "The Free Select tool does not have any special key modifiers, only the ones "
 "that affect all selection tools in the same way. See <link linkend=\"gimp-"
@@ -6828,23 +6351,15 @@ msgstr ""
 "linkend=\"gimp-tool-select\">Herramientas de selecciÃ³n</link> para saber de "
 "Ã©stos."
 
-#: src/toolbox/tool-free-select.xml:104(phrase)
+#: src/toolbox/tool-free-select.xml:141(title)
 msgid "Rough selection with the Free Selection tool."
 msgstr ""
 
-#: src/toolbox/tool-free-select.xml:119(phrase)
+#: src/toolbox/tool-free-select.xml:153(title)
 msgid "Tool Options for the Lasso tool"
 msgstr "Opciones de herramienta para el lazo"
 
-#: src/toolbox/tool-free-select.xml:127(para)
-msgid ""
-"You can find the lasso options by double-clicking on the <placeholder-1/> "
-"icon in the Toolbox."
-msgstr ""
-"Puede hallar las opciones del lazo haciendo doble clic sobre su icono "
-"<placeholder-1/> en la caja de herramientas."
-
-#: src/toolbox/tool-free-select.xml:132(para)
+#: src/toolbox/tool-free-select.xml:163(para)
 msgid ""
 "The Free Select tool has no special tool options, only the ones that affect "
 "all selection tools in the same way. See <link linkend=\"gimp-tool-select"
@@ -6854,120 +6369,20 @@ msgstr ""
 "herramientas de selecciÃ³n. Vea la secciÃ³n sobre <link linkend=\"gimp-tool-"
 "select\">Herramientas de selecciÃ³n</link> para hallarlas."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:44(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-toolbox.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:81(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-ex1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:100(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-ex2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:122(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-ex3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:138(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-ex4.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:165(None)
-#: src/toolbox/tool-foreground-select.xml:224(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-foreground-select-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:213(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-options.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:249(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-contig1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:260(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-contig2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:271(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-contig3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:339(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-smoothing1.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:350(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-smoothing2.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-foreground-select.xml:361(None)
-msgid ""
-"@@image: 'images/toolbox/FG-select-smoothing3.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-foreground-select.xml:17(date)
-msgid "2007-07-26"
-msgstr "2007-09-14"
-
-#: src/toolbox/tool-foreground-select.xml:23(phrase)
-#: src/toolbox/tool-foreground-select.xml:27(secondary)
-#: src/toolbox/tool-foreground-select.xml:31(secondary)
-#: src/toolbox/tool-foreground-select.xml:34(primary)
+#: src/toolbox/tool-foreground-select.xml:14(title)
+#: src/toolbox/tool-foreground-select.xml:18(secondary)
+#: src/toolbox/tool-foreground-select.xml:22(secondary)
+#: src/toolbox/tool-foreground-select.xml:25(primary)
 msgid "Foreground Select"
 msgstr "Herramienta de selecciÃ³n de primer plano"
 
-#: src/toolbox/tool-foreground-select.xml:38(phrase)
+#: src/toolbox/tool-foreground-select.xml:29(title)
 msgid "The <quote>Foreground Select</quote> tool in the Toolbox"
 msgstr ""
 "La herramienta <quote>SelecciÃ³n de primer plano</quote> en la caja de "
 "herramientas"
 
-#: src/toolbox/tool-foreground-select.xml:48(para)
+#: src/toolbox/tool-foreground-select.xml:37(para)
 msgid ""
 "This tool lets you extract the foreground from the active layer or from a "
 "selection. It is based on the SIOX method (Simple Interactive Object "
@@ -6979,15 +6394,15 @@ msgstr ""
 "Extraction). Puede visitar su pÃ¡gina web <xref linkend=\"bibliography-online-"
 "siox\"/>."
 
-#: src/toolbox/tool-foreground-select.xml:56(phrase)
+#: src/toolbox/tool-foreground-select.xml:45(title)
 msgid "Directions for use"
 msgstr "Indicaciones para su uso"
 
-#: src/toolbox/tool-foreground-select.xml:58(para)
+#: src/toolbox/tool-foreground-select.xml:46(para)
 msgid "The creation of a selection with this tool works in a couple of steps:"
 msgstr "Esta herramienta funciona de una manera particular:"
 
-#: src/toolbox/tool-foreground-select.xml:63(para)
+#: src/toolbox/tool-foreground-select.xml:51(para)
 msgid ""
 "<emphasis>Roughly select the foreground</emphasis> you want to extract. When "
 "you select this tool, the mouse pointer goes with the lasso icon. It "
@@ -6999,7 +6414,7 @@ msgstr ""
 "convierte en el icono lazo. Actualmente, funciona como la herramienta de "
 "selecciÃ³n difusa. Seleccione lo menos posible del fondo."
 
-#: src/toolbox/tool-foreground-select.xml:68(para)
+#: src/toolbox/tool-foreground-select.xml:57(para)
 msgid ""
 "As soon as you release the mouse button, the non selected part of the image "
 "is covered with a dark blue mask. If the selection is not closed, its ends "
@@ -7011,11 +6426,11 @@ msgstr ""
 "los finales se enlazarÃ¡n, automaticamente, con una lÃnea recta. El puntero "
 "del ratÃ³n se vuelve, ahora un icono de brocha para el siguiente paso."
 
-#: src/toolbox/tool-foreground-select.xml:77(phrase)
+#: src/toolbox/tool-foreground-select.xml:65(title)
 msgid "The foreground is roughly selected"
 msgstr "El frente se selecciona aproximadamente"
 
-#: src/toolbox/tool-foreground-select.xml:87(para)
+#: src/toolbox/tool-foreground-select.xml:75(para)
 msgid ""
 "<emphasis>Draw a line through the foreground</emphasis>: using the "
 "paintbrush, whose size can be changed in options, draw a continuous line in "
@@ -7030,11 +6445,11 @@ msgstr ""
 "color de la lÃnea no es importante; es mejor usar un color distinto de el "
 "del fondo. Sea cuidadoso de no pintar pÃxeles del fondo."
 
-#: src/toolbox/tool-foreground-select.xml:96(phrase)
+#: src/toolbox/tool-foreground-select.xml:84(title)
 msgid "The line drawn on the foreground"
 msgstr "La lÃnea dibujada en el frente"
 
-#: src/toolbox/tool-foreground-select.xml:103(para)
+#: src/toolbox/tool-foreground-select.xml:91(para)
 msgid ""
 "In this example, it is important that the line goes over the yellow "
 "capitulum of the flower."
@@ -7042,28 +6457,37 @@ msgstr ""
 "En este ejemplo, es importante que la lÃnea vaya sobre el amarillo de la "
 "flor."
 
-#: src/toolbox/tool-foreground-select.xml:112(para)
-msgid "When you release the mouse button, all non-selected areas are in dark :"
+#: src/toolbox/tool-foreground-select.xml:100(para)
+#, fuzzy
+#| msgid ""
+#| "When you release the mouse button, all non-selected areas are in dark :"
+msgid "When you release the mouse button, all non-selected areas are in dark:"
 msgstr ""
 "Cuando suelta el botÃ³n del ratÃ³n, el Ã¡rea no seleccionada estÃ¡n en negro:"
 
-#: src/toolbox/tool-foreground-select.xml:118(phrase)
+#: src/toolbox/tool-foreground-select.xml:105(title)
 msgid "The area which will be selected"
 msgstr "El Ã¡rea que serÃ¡ seleccionada"
 
-#: src/toolbox/tool-foreground-select.xml:128(para)
+#: src/toolbox/tool-foreground-select.xml:115(para)
+#, fuzzy
+#| msgid ""
+#| "You still have to press the <keycap>Enter</keycap> key to get the wanted "
+#| "selection :"
 msgid ""
 "You still have to press the <keycap>Enter</keycap> key to get the wanted "
-"selection :"
+"selection:"
 msgstr ""
 "Todavia tiene que presionar la tecla <keycap>Enter</keycap> para obtener la "
 "selecciÃ³n deseada:"
 
-#: src/toolbox/tool-foreground-select.xml:134(phrase)
-msgid "Foreground is selected."
+#: src/toolbox/tool-foreground-select.xml:120(title)
+#, fuzzy
+#| msgid "Foreground is selected."
+msgid "Foreground is selected"
 msgstr "El frente estÃ¡ seleccionado."
 
-#: src/toolbox/tool-foreground-select.xml:145(para)
+#: src/toolbox/tool-foreground-select.xml:130(para)
 msgid ""
 "Until you press <keycap>Enter</keycap>, you can't undo this selection by "
 "<keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo> nor by "
@@ -7077,19 +6501,24 @@ msgstr ""
 "guimenuitem></menuchoice>, y al historial de deshacer no le concierne. Para "
 "borrar esta selecciÃ³n, se deberÃ¡ seleccionar otra herramienta."
 
-#: src/toolbox/tool-foreground-select.xml:158(para)
+#: src/toolbox/tool-foreground-select.xml:148(para)
 msgid "You can activate the Foreground Select tool in two ways:"
 msgstr "Puede activar esta herramienta de dos maneras:"
 
-#: src/toolbox/tool-foreground-select.xml:163(para)
-msgid "By clicking on the tool icon <placeholder-1/> in the Toolbox."
+#: src/toolbox/tool-foreground-select.xml:153(para)
+msgid ""
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-foreground-select-22.png\"/></guiicon> in the Toolbox,"
 msgstr ""
-"Pulsando sobre el icono de la herramienta <placeholder-1/> en la caja de "
-"herramientas."
 
-#: src/toolbox/tool-foreground-select.xml:170(para)
+#: src/toolbox/tool-foreground-select.xml:163(para)
+#, fuzzy
+#| msgid ""
+#| "Through <menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#| "guisubmenu><guimenuitem>Foreground Select</guimenuitem></menuchoice> in "
+#| "the image menu."
 msgid ""
-"Through <menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+"through <menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
 "guisubmenu><guimenuitem>Foreground Select</guimenuitem></menuchoice> in the "
 "image menu."
 msgstr ""
@@ -7098,46 +6527,40 @@ msgstr ""
 "guisubmenu><guimenuitem>SelecciÃ³n del frente</guimenuitem></menuchoice> en "
 "el menÃº de la imagen."
 
-#: src/toolbox/tool-foreground-select.xml:177(para)
+#: src/toolbox/tool-foreground-select.xml:174(para)
+#, fuzzy
+#| msgid ""
+#| "You can find this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</"
+#| "guisubmenu><guimenuitem>Posterize</guimenuitem></menuchoice> or "
+#| "<menuchoice><guimenu>Colors</guimenu><guimenuitem>Posterize</"
+#| "guimenuitem></menuchoice>,"
 msgid ""
 "This tool has no shortcut, but you can set one using "
-"<menuchoice><guimenu>File</guimenu><guisubmenu>Preferences</"
+"<menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</"
 "guisubmenu><guisubmenu>Interface</guisubmenu><guisubmenu>Configure Keyboard "
-"Shortcuts</guisubmenu><guisubmenu>tools</guisubmenu><guimenuitem>Foreground "
+"Shortcuts</guisubmenu><guisubmenu>Tools</guisubmenu><guimenuitem>Foreground "
 "Select</guimenuitem></menuchoice>"
 msgstr ""
+"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
+"guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
+"guisubmenu><guimenuitem><accel>P</accel>osterizar</guimenuitem></menuchoice>"
 
-#: src/toolbox/tool-foreground-select.xml:194(para)
+#: src/toolbox/tool-foreground-select.xml:197(para)
 msgid ""
 "By pressing the <keycap>Ctrl</keycap> key, you can switching between "
 "foreground and background selection painting."
 msgstr ""
 
-#: src/toolbox/tool-foreground-select.xml:208(phrase)
+#: src/toolbox/tool-foreground-select.xml:209(title)
 msgid "<quote>Foreground Select</quote> tool options"
 msgstr "Opciones de herramientas <quote>SelecciÃ³n de primer plano</quote>"
 
-#: src/toolbox/tool-foreground-select.xml:216(para)
-msgid ""
-"<guilabel>Feather Edges</guilabel> and <guilabel>Color Sensitivity </"
-"guilabel> options have been checked."
-msgstr ""
-"Las opciones <guilabel>Difuminar los bordes</guilabel> y "
-"<guilabel>Sensibilidad de color</guilabel> han sido marcadas."
-
-#: src/toolbox/tool-foreground-select.xml:222(para)
-msgid ""
-"You can get the option dialog by double-clicking on the tool icon "
-"<placeholder-1/> in the toolbox:"
-msgstr ""
-"Puede obtener el diÃ¡logo opciones mediante una doble pulsaciÃ³n sobre el "
-"icono de la herramienta <placeholder-1/> en la caja de herramientas:"
-
-#: src/toolbox/tool-foreground-select.xml:235(term)
+#: src/toolbox/tool-foreground-select.xml:228(term)
 msgid "Contiguous"
 msgstr "Contigua"
 
-#: src/toolbox/tool-foreground-select.xml:237(para)
+#: src/toolbox/tool-foreground-select.xml:230(para)
 msgid ""
 "If this option is enabled, only the area contiguous to the stroke will be "
 "selected. Otherwise all the areas with same colors will be selected."
@@ -7145,11 +6568,11 @@ msgstr ""
 "Esta opciÃ³n modifica el comportamiento de la herramienta si las Ã¡reas del "
 "mismo color estÃ¡n separadas en la imagen:"
 
-#: src/toolbox/tool-foreground-select.xml:244(phrase)
+#: src/toolbox/tool-foreground-select.xml:236(title)
 msgid "<quote>Contiguous</quote> option effect"
 msgstr "Efectos de la opciÃ³n <quote>Contigua</quote>"
 
-#: src/toolbox/tool-foreground-select.xml:252(para)
+#: src/toolbox/tool-foreground-select.xml:243(para)
 msgid ""
 "Two separated areas with the same color. On the left, only the left area is "
 "marked."
@@ -7160,35 +6583,35 @@ msgstr ""
 "opciÃ³n contigua no estÃ¡ marcada: ambas Ã¡reas, aunque estÃ¡n separadas, se "
 "seleccionan."
 
-#: src/toolbox/tool-foreground-select.xml:263(para)
+#: src/toolbox/tool-foreground-select.xml:255(para)
 msgid ""
 "The Contiguous option is checked: only the area close to the painted line is "
 "selected."
 msgstr "Retoque interactivo"
 
-#: src/toolbox/tool-foreground-select.xml:274(para)
+#: src/toolbox/tool-foreground-select.xml:267(para)
 msgid ""
 "The Contiguous option is not checked: both areas, although they are "
 "separated, are selected."
 msgstr ""
 "Algunas opcionespara trabajar de manera mÃ¡s precisa sobre la selecciÃ³n:"
 
-#: src/toolbox/tool-foreground-select.xml:284(term)
+#: src/toolbox/tool-foreground-select.xml:277(term)
 msgid "Interactive refinement"
 msgstr "Marcar el frente"
 
-#: src/toolbox/tool-foreground-select.xml:286(para)
+#: src/toolbox/tool-foreground-select.xml:279(para)
 msgid "Here are some options to work more precisely on your selection:"
 msgstr ""
 "opciÃ³n predeterminada. El color de frente de la caja de herramientas se usa "
 "para pintar. Los colores cubiertos por la lÃnea pintada se usarÃ¡n para la "
 "extracciÃ³n."
 
-#: src/toolbox/tool-foreground-select.xml:291(term)
+#: src/toolbox/tool-foreground-select.xml:284(term)
 msgid "Mark foreground"
 msgstr "Marcar el fondo"
 
-#: src/toolbox/tool-foreground-select.xml:293(para)
+#: src/toolbox/tool-foreground-select.xml:286(para)
 msgid ""
 "default option. The foreground color of the Toolbox is used to paint. Colors "
 "covered by the painted line will be used for extraction."
@@ -7200,11 +6623,11 @@ msgstr ""
 "tienen el mismo color que los pÃxeles <quote>borrados</quote> no serÃ¡n "
 "extraidos."
 
-#: src/toolbox/tool-foreground-select.xml:301(term)
+#: src/toolbox/tool-foreground-select.xml:294(term)
 msgid "Mark background"
 msgstr "Picel pequeÃ±o / Pincel grande"
 
-#: src/toolbox/tool-foreground-select.xml:303(para)
+#: src/toolbox/tool-foreground-select.xml:296(para)
 msgid ""
 "You can access this option either by clicking on the radio button or, more "
 "simply, by pressing the <keycap>Ctrl</keycap> key. The mouse pointer goes "
@@ -7215,33 +6638,33 @@ msgstr ""
 "Este deslizador permite adaptar el tamaÃ±o de la brocha usada para pintar la "
 "lÃnea. Una brocha pequeÃ±a permite seleccionar detalles mÃ¡s finos."
 
-#: src/toolbox/tool-foreground-select.xml:315(term)
+#: src/toolbox/tool-foreground-select.xml:308(term)
 msgid "Small brush / Large brush"
 msgstr "Suavizado"
 
-#: src/toolbox/tool-foreground-select.xml:317(para)
+#: src/toolbox/tool-foreground-select.xml:310(para)
 msgid ""
 "This slider lets you adapt the size of the brush used to paint the line. A "
 "small brush fits well thin details."
 msgstr "El deslizador permite quitar los pequeÃ±os agujeros de la selecciÃ³n."
 
-#: src/toolbox/tool-foreground-select.xml:327(term)
+#: src/toolbox/tool-foreground-select.xml:320(term)
 msgid "Smoothing"
 msgstr "Efecto de la opciÃ³n <quote>Suavizado</quote>"
 
-#: src/toolbox/tool-foreground-select.xml:329(para)
+#: src/toolbox/tool-foreground-select.xml:322(para)
 msgid "The slider lets you remove small holes in your selection."
 msgstr ""
 "Para esta demostraciÃ³n, se han aÃ±adido (izquierda) los agujeros pequeÃ±os "
 "pintados con el color de fondo"
 
-#: src/toolbox/tool-foreground-select.xml:334(phrase)
+#: src/toolbox/tool-foreground-select.xml:326(title)
 msgid "<quote>Smoothing</quote> option effect"
 msgstr ""
 "En el centro, suavizado = 0 : no se seleccionan los agujeros de mÃ¡s de 1 "
 "pÃxel."
 
-#: src/toolbox/tool-foreground-select.xml:342(para)
+#: src/toolbox/tool-foreground-select.xml:333(para)
 msgid ""
 "For this demonstration, small holes painted with the background color of the "
 "image have been added (left)."
@@ -7249,21 +6672,23 @@ msgstr ""
 "A la derecha, suavizado = 7 : se seleccionan los agujeros de menos de 3 "
 "pÃxeles."
 
-#: src/toolbox/tool-foreground-select.xml:353(para)
-msgid "Smoothing= 0 : more than 1 pixel wide holes are not selected."
+#: src/toolbox/tool-foreground-select.xml:345(para)
+#, fuzzy
+#| msgid "Smoothing= 0 : more than 1 pixel wide holes are not selected."
+msgid "Smoothing = 0 : more than 1 pixel wide holes are not selected."
 msgstr "Vista previa del color"
 
-#: src/toolbox/tool-foreground-select.xml:364(para)
+#: src/toolbox/tool-foreground-select.xml:357(para)
 msgid "Smoothing = 7 : less than 3 pixels wide holes are selected."
 msgstr ""
 "Puede seleccionar entre Rojo, Verde y Azul para la mÃ¡scara del fondo de la "
 "imagen."
 
-#: src/toolbox/tool-foreground-select.xml:373(term)
+#: src/toolbox/tool-foreground-select.xml:366(term)
 msgid "Preview color"
 msgstr "Sensibilidad de color"
 
-#: src/toolbox/tool-foreground-select.xml:375(para)
+#: src/toolbox/tool-foreground-select.xml:368(para)
 msgid ""
 "You can select between Red, Green and Blue to mask the image background."
 msgstr ""
@@ -7271,48 +6696,27 @@ msgstr ""
 "link>. Si la imagen contiene muchos pÃxeles del mismo color en diferentes "
 "tonos, se puede incrementar la sensibilidad de la selecciÃ³n para este color."
 
-#: src/toolbox/tool-foreground-select.xml:382(term)
+#: src/toolbox/tool-foreground-select.xml:375(term)
 msgid "Color Sensitivity"
 msgstr "translator-credits"
 
-#: src/toolbox/tool-foreground-select.xml:384(para)
+#: src/toolbox/tool-foreground-select.xml:377(para)
 msgid ""
 "This option uses the <link linkend=\"glossary-lab\">L*a*b</link> color "
 "model. If your image contains many pixels of the same color in different "
 "tones, you can increase the sensibility of the selection for this color."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-flip.xml:39(None)
-msgid "@@image: 'images/toolbox/toolbox-flip.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-flip.xml:67(None) src/toolbox/tool-flip.xml:126(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-flip-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-flip.xml:115(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-flip.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-flip.xml:24(phrase)
-#: src/toolbox/tool-flip.xml:28(secondary)
-#: src/toolbox/tool-flip.xml:31(primary)
+#: src/toolbox/tool-flip.xml:15(title) src/toolbox/tool-flip.xml:18(secondary)
+#: src/toolbox/tool-flip.xml:21(primary)
 msgid "Flip"
 msgstr "Invertir la imagen"
 
-#: src/toolbox/tool-flip.xml:35(phrase)
+#: src/toolbox/tool-flip.xml:25(title)
 msgid "Flip tool"
 msgstr "Herramienta invertir"
 
-#: src/toolbox/tool-flip.xml:43(para)
+#: src/toolbox/tool-flip.xml:32(para)
 msgid ""
 "The Flip tool provides the ability to flip layers or selections either "
 "horizontally or vertically. When a selection is flipped, a new layer with a "
@@ -7323,47 +6727,45 @@ msgstr ""
 "invierte, se crea una nueva capa con una selecciÃ³n flotante. Puede usar esta "
 "herramienta para crear reflejos."
 
-#: src/toolbox/tool-flip.xml:53(para)
-msgid "You can get to the Flip tool in several ways :"
-msgstr "Puede seleccionar la herramienta invertir de varias maneras:"
+#: src/toolbox/tool-flip.xml:41(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Flip Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
 
-#: src/toolbox/tool-flip.xml:56(para)
+#: src/toolbox/tool-flip.xml:46(para)
+#, fuzzy
+#| msgid ""
+#| "In the the image-menu through: <guimenuitem><accel>T</accel>ools</"
+#| "guimenuitem>/ <guimenuitem><accel>T</accel>ransform Tools</guimenuitem>/"
+#| "<guimenuitem><accel>F</accel>lip </guimenuitem>,"
 msgid ""
-"In the the image-menu through: <guimenuitem><accel>T</accel>ools</"
-"guimenuitem>/ <guimenuitem><accel>T</accel>ransform Tools</guimenuitem>/"
-"<guimenuitem><accel>F</accel>lip </guimenuitem>,"
+"From the image menu bar <guimenuitem>Tools</guimenuitem>/ "
+"<guimenuitem>Transform Tools</guimenuitem><guimenuitem>Flip</guimenuitem>,"
 msgstr ""
 "En el menÃº de la imagen: <guimenuitem><accel>H</accel>erramientas</"
 "guimenuitem>/ <guimenuitem>Herramientas de <accel>t</accel>ransformaciÃ³n </"
 "guimenuitem>/<guimenuitem><accel>V</accel>oltear </guimenuitem>,"
 
-#: src/toolbox/tool-flip.xml:71(para)
+#: src/toolbox/tool-flip.xml:54(para)
 msgid ""
-"or by using the <keycombo><keycap>Shift</keycap><keycap>F</keycap></"
-"keycombo> key combination."
+"By clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-flip-22.png\"/></guiicon> in Toolbox,"
 msgstr ""
-"o mediante el uso de la combinaciÃ³n de teclas <keycombo><keycap>Mayus</"
-"keycap><keycap>F</keycap></keycombo>."
 
-#: src/toolbox/tool-flip.xml:85(term) src/toolbox/tool-crop.xml:117(term)
-#: src/toolbox/tool-color-picker.xml:102(term)
+#: src/toolbox/tool-flip.xml:63(para)
 #, fuzzy
-msgid "Shortcut"
-msgstr ""
-"#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Atajos de teclado\n"
-"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Atajos"
-
-#: src/toolbox/tool-flip.xml:87(para)
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>F</keycap></"
+#| "keycombo> key combination."
 msgid ""
-"The <keycombo><keycap>Shift</keycap><keycap>F</keycap></keycombo> key "
-"combination will change the active tool to Flip."
+"by using the <keycombo><keycap>Shift</keycap><keycap>F</keycap></keycombo> "
+"key combination."
 msgstr ""
-"La combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>f</keycap></"
-"keycombo> cambiarÃ¡ la herramienta actual a la herramienta invertir."
+"o mediante el uso de la combinaciÃ³n de teclas <keycombo><keycap>Mayus</"
+"keycap><keycap>F</keycap></keycombo>."
 
-#: src/toolbox/tool-flip.xml:98(para)
+#: src/toolbox/tool-flip.xml:80(para)
 msgid ""
 "<keycap>Ctrl</keycap> lets you change the modes between horizontal and "
 "vertical flipping."
@@ -7371,28 +6773,19 @@ msgstr ""
 "<keycap>Ctrl</keycap> le permite cambiar entre los modos de invertir, "
 "horizontal y vertical."
 
-#: src/toolbox/tool-flip.xml:111(phrase)
+#: src/toolbox/tool-flip.xml:91(title)
 msgid "<quote>Flip Tool</quote> Options"
 msgstr "<quote>Herramienta invertir</quote> Opciones"
 
-#: src/toolbox/tool-flip.xml:123(para)
-msgid ""
-"The available tool options for the Flip Tool can be accessed by double "
-"clicking the Flip Tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede acceder a las opciones disponibles para la herramienta invertir "
-"mediante una doble pulsaciÃ³n sobre el icono de la herramienta. <placeholder-"
-"1/>"
-
-#: src/toolbox/tool-flip.xml:131(term)
+#: src/toolbox/tool-flip.xml:103(term)
 msgid "Affect"
 msgstr "Afectar"
 
-#: src/toolbox/tool-flip.xml:137(term)
+#: src/toolbox/tool-flip.xml:109(term)
 msgid "Flip Type"
 msgstr "Tipo de volteo"
 
-#: src/toolbox/tool-flip.xml:139(para)
+#: src/toolbox/tool-flip.xml:111(para)
 msgid ""
 "The Tool Toggle settings control flipping in either a Horizontal or Vertical "
 "direction. This toggle can also be switched using a key modifier."
@@ -7400,54 +6793,27 @@ msgstr ""
 "Puede escoger el sentido de la inversiÃ³n: horizontal o vertical. TambiÃ©n se "
 "puede conmutar usando una tecla modificadora."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-eraser.xml:45(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-eraser.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-eraser.xml:93(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-eraser-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-eraser.xml:157(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-eraser.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-eraser.xml:20(date)
-msgid "2006-06-04"
-msgstr "2006-08-06"
-
-#: src/toolbox/tool-eraser.xml:26(phrase)
-#: src/toolbox/tool-eraser.xml:30(secondary)
-#: src/toolbox/tool-eraser.xml:33(primary)
+#: src/toolbox/tool-eraser.xml:18(title)
+#: src/toolbox/tool-eraser.xml:21(secondary)
+#: src/toolbox/tool-eraser.xml:24(primary)
 msgid "Eraser"
 msgstr "La goma de borrar"
 
-#: src/toolbox/tool-eraser.xml:36(primary)
-#: src/toolbox/tool-clone.xml:378(term)
-#: src/toolbox/tool-brush.xml:464(primary)
+#: src/toolbox/tool-eraser.xml:27(primary)
+#: src/toolbox/tool-clone.xml:389(term)
+#: src/toolbox/tool-brush.xml:270(primary)
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/toolbox/tool-eraser.xml:37(secondary)
+#: src/toolbox/tool-eraser.xml:28(secondary)
 msgid "Eraser tool"
 msgstr ""
 
-#: src/toolbox/tool-eraser.xml:41(phrase)
+#: src/toolbox/tool-eraser.xml:32(title)
 msgid "Eraser tool icon in the Toolbox"
 msgstr "La goma de borrar en la caja de herramientas"
 
-#: src/toolbox/tool-eraser.xml:49(para)
+#: src/toolbox/tool-eraser.xml:40(para)
 msgid ""
 "The Eraser is used to remove areas of color from the current layer or from a "
 "selection of this layer. If the Eraser is used on something that does not "
@@ -7468,7 +6834,21 @@ msgstr ""
 "producirÃ¡ la transparencia parcial o total, dependiendo de los ajustes en "
 "las opciones de herramientas."
 
-#: src/toolbox/tool-eraser.xml:60(para)
+#: src/toolbox/tool-eraser.xml:53(title)
+msgid "Eraser and Alpha channel"
+msgstr ""
+
+#: src/toolbox/tool-eraser.xml:59(para)
+msgid ""
+"The Background Color is White. The image has no Alpha channel. The Eraser "
+"(Opacity 100%) shows the BG color."
+msgstr ""
+
+#: src/toolbox/tool-eraser.xml:70(para)
+msgid "The image has an Alpha channel. The Eraser shows transparency."
+msgstr ""
+
+#: src/toolbox/tool-eraser.xml:77(para)
 msgid ""
 "If you need to erase some group of pixels completely, leaving no trace "
 "behind of their previous contents, you should check the \"Hard edge\" box in "
@@ -7481,7 +6861,7 @@ msgstr ""
 "subpÃxel de la brocha causarÃ¡ un borrado parcial en los ejes del trazo, "
 "incluso para las brochas con bordes duros."
 
-#: src/toolbox/tool-eraser.xml:68(para)
+#: src/toolbox/tool-eraser.xml:86(para)
 msgid ""
 "If you use GIMP with a tablet, you may find it convenient to treat the "
 "reverse end of the stylus as an eraser. To make this work, all you need to "
@@ -7500,33 +6880,32 @@ msgstr ""
 "opuesta continuarÃ¡ funcionando como Goma hasta que seleccione una "
 "herramienta diferente con la misma."
 
-#: src/toolbox/tool-eraser.xml:82(para)
-msgid "You can activate the Eraser tool in several ways :"
-msgstr ""
-"La goma puede ser activada siguiendo el menÃº de imagen en el siguiente "
-"orden: <menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas "
-"de pintura</guisubmenu><guimenuitem>Goma de borrar</guimenuitem></"
-"menuchoice>; y tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/"
-">; o presionando la tecla de atajo <keycap>E</keycap>."
+#: src/toolbox/tool-eraser.xml:99(para) src/toolbox/tool-clone.xml:80(para)
+#, fuzzy
+#| msgid "You can activate the Align tool in several ways :"
+msgid "You can activate this tool in several ways:"
+msgstr "Puede activar la herramienta de varias maneras :"
 
-#: src/toolbox/tool-eraser.xml:85(para)
+#: src/toolbox/tool-eraser.xml:102(para)
 msgid ""
 "From the image menu through <menuchoice><guimenu>Tools</"
 "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Eraser</"
 "guimenuitem></menuchoice>;"
 msgstr ""
 
-#: src/toolbox/tool-eraser.xml:91(para)
-msgid "from the Toolbox by clicking on the tool icon <placeholder-1/>;"
+#: src/toolbox/tool-eraser.xml:112(para)
+msgid ""
+"from the Toolbox by clicking on the tool icon <guiicon><inlinegraphic "
+"fileref=\"images/toolbox/stock-tool-eraser-22.png\"/></guiicon>;"
 msgstr ""
 
-#: src/toolbox/tool-eraser.xml:97(para)
+#: src/toolbox/tool-eraser.xml:120(para)
 msgid ""
 "or from the keyboard using the shortcut <keycombo><keycap>Shift</"
 "keycap><keycap>E</keycap></keycombo>."
 msgstr ""
 
-#: src/toolbox/tool-eraser.xml:108(para)
+#: src/toolbox/tool-eraser.xml:130(para)
 msgid ""
 "See the <xref linkend=\"gimp-tool-brush\"/> for a description of key "
 "modifiers that have the same effect on all brush tools."
@@ -7535,7 +6914,7 @@ msgstr ""
 "link> para una descripciÃ³n de las teclas modificadoras que tienen el mismo "
 "efecto en todas las herramientas de brocha."
 
-#: src/toolbox/tool-eraser.xml:118(para)
+#: src/toolbox/tool-eraser.xml:140(para)
 msgid ""
 "For the Eraser, holding down the <keycap>Ctrl</keycap> key puts it into "
 "<quote>color picker</quote> mode, so that it selects the color of any pixel "
@@ -7552,7 +6931,7 @@ msgstr ""
 "(drawables) que no admiten transparencia, la goma reemplaza el Ã¡rea con el "
 "color de fondo actual."
 
-#: src/toolbox/tool-eraser.xml:134(para)
+#: src/toolbox/tool-eraser.xml:156(para)
 msgid ""
 "For the Eraser, holding down the <keycap>Alt</keycap> key switches it into "
 "<quote>anti-erase</quote> mode, as described below in the Tool Options "
@@ -7566,21 +6945,19 @@ msgstr ""
 "el administrador de ventanas. Si esto le sucede, deberÃa poder usar Shift-"
 "Alt en su lugar."
 
-#: src/toolbox/tool-eraser.xml:153(phrase)
+#: src/toolbox/tool-eraser.xml:173(title)
 msgid "Tool Options for the Eraser tool"
 msgstr "Opciones de herramienta para la goma"
 
-#: src/toolbox/tool-eraser.xml:163(term)
-msgid "Brush; Pressure sensitivity; Scale; Fade out; Incremental; Hard edges"
-msgstr ""
-
-#: src/toolbox/tool-eraser.xml:172(term) src/toolbox/tool-brush.xml:461(term)
-#: src/toolbox/tool-brush.xml:468(primary)
-#: src/toolbox/tool-brush.xml:534(term)
-msgid "Opacity"
+#: src/toolbox/tool-eraser.xml:186(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
+#| "edges"
+msgid "Brush; Scale; Brush Dynamics; Fade Out; Apply Jitter; Incremental"
 msgstr "Opacidad"
 
-#: src/toolbox/tool-eraser.xml:174(para)
+#: src/toolbox/tool-eraser.xml:196(para)
 msgid ""
 "The <guilabel>Opacity</guilabel> slider, in spite of its name, determines "
 "the <quote>strength</quote> of the tool. Thus, when you erase on a layer "
@@ -7592,11 +6969,23 @@ msgstr ""
 "que tiene canal alfa, cuanta mÃ¡s \"opacidad\" uses, Â¡obtendrÃ¡ mÃ¡s "
 "transparencia!"
 
-#: src/toolbox/tool-eraser.xml:183(term)
+#: src/toolbox/tool-eraser.xml:205(term)
+#, fuzzy
+#| msgid "Feather Edges"
+msgid "Hard Edge"
+msgstr "Difuminar bordes"
+
+#: src/toolbox/tool-eraser.xml:207(para)
+msgid ""
+"This option avoids partial erasure at the edges of the brush-stroke. See "
+"above."
+msgstr ""
+
+#: src/toolbox/tool-eraser.xml:214(term)
 msgid "Anti Erase"
 msgstr "Anti-borrado"
 
-#: src/toolbox/tool-eraser.xml:185(para)
+#: src/toolbox/tool-eraser.xml:216(para)
 msgid ""
 "The Anti Erase option of the Erase tool can un-erase areas of an image, even "
 "if they are completely transparent. This feature only works when used on "
@@ -7614,7 +7003,7 @@ msgstr ""
 "por el administrador de ventanas, manteniendo apretadas Shift y Alt al mismo "
 "tiempo)."
 
-#: src/toolbox/tool-eraser.xml:196(para)
+#: src/toolbox/tool-eraser.xml:227(para)
 msgid ""
 "To understand how anti-erasing is possible, you should realize that erasing "
 "(or cutting, for that matter) only affects the alpha channel, not the RGB "
@@ -7630,73 +7019,34 @@ msgstr ""
 "borrado incrementa el valor del canal alfa para que vuelva a ver los datos "
 "RGB."
 
-#: src/toolbox/tool-eraser.xml:204(para)
-msgid ""
-"An annoying feature: on a layer you have created with a transparent "
-"background, using anti-erasing on non-painted areas paints with black!"
-msgstr ""
-"Una propiedad enojosa: al utilizar el anti-borrado sobre las Ã¡reas no "
-"pintadas de una capa creada con un fondo transparente Â¡se pinta con negro!"
-
-#: src/toolbox/tool-eraser.xml:216(secondary)
+#: src/toolbox/tool-eraser.xml:250(secondary)
 msgid "Change shape"
 msgstr ""
 
-#: src/toolbox/tool-eraser.xml:218(para)
+#: src/toolbox/tool-eraser.xml:252(para)
 msgid ""
 "You can use the Eraser tool to change the shape of a floating selection. By "
 "erasing, you can trim the edges of the selection."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ellipse-select.xml:44(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-ellipsel.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ellipse-select.xml:79(None)
-#: src/toolbox/tool-ellipse-select.xml:183(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-ellipse-select-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ellipse-select.xml:146(None)
-msgid ""
-"@@image: 'images/toolbox/ellipse-selection.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-ellipse-select.xml:176(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-ellipsel.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-ellipse-select.xml:25(phrase)
-#: src/toolbox/tool-ellipse-select.xml:29(secondary)
+#: src/toolbox/tool-ellipse-select.xml:16(title)
+#: src/toolbox/tool-ellipse-select.xml:20(secondary)
 msgid "Ellipse Selection"
 msgstr "Herramienta de selecciÃ³n elÃptica"
 
-#: src/toolbox/tool-ellipse-select.xml:33(secondary)
+#: src/toolbox/tool-ellipse-select.xml:24(secondary)
 msgid "Ellipse selection"
 msgstr ""
 
-#: src/toolbox/tool-ellipse-select.xml:36(primary)
+#: src/toolbox/tool-ellipse-select.xml:27(primary)
 msgid "Ellipse Selection Tool"
 msgstr ""
 
-#: src/toolbox/tool-ellipse-select.xml:40(phrase)
+#: src/toolbox/tool-ellipse-select.xml:31(title)
 msgid "Ellipse Select icon in the Toolbox"
 msgstr "El icono de la herramienta de selecciÃ³n elÃptica en la caja."
 
-#: src/toolbox/tool-ellipse-select.xml:48(para)
+#: src/toolbox/tool-ellipse-select.xml:39(para)
 msgid ""
 "The Ellipse Selection tool is designed to select circular and elliptical "
 "regions from an image, with high-quality anti-aliasing if you want it. For "
@@ -7713,7 +7063,20 @@ msgstr ""
 "las herramientas de selecciÃ³n tienen en comÃºn se describe en la secciÃ³n "
 "<link linkend=\"gimp-tool-select\">Herramientas de selecciÃ³n</link>."
 
-#: src/toolbox/tool-ellipse-select.xml:56(para)
+#: src/toolbox/tool-ellipse-select.xml:47(para)
+#, fuzzy
+#| msgid ""
+#| "This tool is also used for rendering a circle or ellipse on an image. To "
+#| "render a filled ellipse, create an elliptical selection, and then fill it "
+#| "using the <link linkend=\"gimp-tool-bucket-fill\">Bucket Fill tool</"
+#| "link>. To create an elliptical outline, the simplest and most flexible "
+#| "approach is to create an elliptical selection and then <link linkend="
+#| "\"gimp-selection-stroke\">stroke</link> it. However, the quality of anti-"
+#| "aliasing with this approach is rather crude. A higher quality outline can "
+#| "be obtained by creating two elliptical selections with different sizes, "
+#| "subtracting the inner one from the outer one; however this is not always "
+#| "easy to get right. The command <menuchoice><guimenu>Selection</"
+#| "guimenu><guimenuitem>Border...</guimenuitem></menuchoice> makes it easy."
 msgid ""
 "This tool is also used for rendering a circle or ellipse on an image. To "
 "render a filled ellipse, create an elliptical selection, and then fill it "
@@ -7724,7 +7087,7 @@ msgid ""
 "approach is rather crude. A higher quality outline can be obtained by "
 "creating two elliptical selections with different sizes, subtracting the "
 "inner one from the outer one; however this is not always easy to get right. "
-"The command <menuchoice><guimenu>Selection</guimenu><guimenuitem>Border...</"
+"The command <menuchoice><guimenu>Select</guimenu><guimenuitem>Border...</"
 "guimenuitem></menuchoice> makes it easy."
 msgstr ""
 "Esta herramienta puede ser utilizada para pintar un cÃrculo o una elipsis en "
@@ -7738,22 +7101,42 @@ msgstr ""
 "diferentes tamaÃ±os, sustrayendo la segunda elipsis a la primera, pero esto "
 "no siempre es fÃ¡cil de lograr."
 
-#: src/toolbox/tool-ellipse-select.xml:74(para)
+#: src/toolbox/tool-ellipse-select.xml:67(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Ellipse Selection Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-ellipse-select.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu bar <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
+#| "guimenuitem></menuchoice>;"
 msgid ""
-"The Ellipse Selection Tool can be activated from an image menu as "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
-"guisubmenu><guimenuitem>Ellipse Select</guimenuitem></menuchoice>; from the "
-"Toolbox by clicking on the tool icon <placeholder-1/>; or from the keyboard "
-"by using the <keycap>e</keycap> shortcut."
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Ellipse Select</"
+"guimenuitem></menuchoice>;"
 msgstr ""
-"La herramienta de selecciÃ³n elÃptica se puede activar seleccionando "
-"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
-"selecciÃ³n</guisubmenu><guimenuitem>SelecciÃ³n elÃptica</guimenuitem></"
-"menuchoice> desde el menÃº de la imagen. O desde la caja de herramientas "
-"haciendo clic sobre el icono <placeholder-1/>; o desde el teclado usando el "
-"atajo <keycap>e</keycap>."
+"Desde el menÃº de la imagen <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de selecciÃ³n</"
+"guisubmenu><guimenuitem>SelecciÃ³n rectangular</guimenuitem></menuchoice>."
 
-#: src/toolbox/tool-ellipse-select.xml:94(para)
+#: src/toolbox/tool-ellipse-select.xml:82(para)
+msgid ""
+"By clicking on the tool icon "
+"<guiicon><inlinemediaobject><imageobject><imagedata fileref=\"images/toolbox/"
+"stock-tool-ellipse-select-22.png\"/></imageobject></inlinemediaobject></"
+"guiicon> in the ToolBox,"
+msgstr ""
+
+#: src/toolbox/tool-ellipse-select.xml:95(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid "By using the keyboard shortcut <keycap>E</keycap>."
+msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
+
+#: src/toolbox/tool-ellipse-select.xml:111(para)
 msgid ""
 "Pressing the key after starting your selection, and holding it down until "
 "you are finished, causes your starting point to be used as the center of the "
@@ -7769,7 +7152,7 @@ msgstr ""
 "<emphasis>antes</emphasis> de haber comenzado la selecciÃ³n, Ã©sta se "
 "sustraerÃ¡ a la selecciÃ³n existente."
 
-#: src/toolbox/tool-ellipse-select.xml:110(para)
+#: src/toolbox/tool-ellipse-select.xml:125(para)
 msgid ""
 "Pressing the Shift key after starting your selection, and holding it down "
 "until you are finished, constrains the selection to be a circle. Note that "
@@ -7781,7 +7164,7 @@ msgstr ""
 "cÃrculo. Note que si presiona la tecla Shift <emphasis>antes</emphasis> de "
 "comenzar la selecciÃ³n, Ã©sta se aÃ±adirÃ¡ a la selecciÃ³n existente."
 
-#: src/toolbox/tool-ellipse-select.xml:128(para)
+#: src/toolbox/tool-ellipse-select.xml:143(para)
 msgid ""
 "Pressing both keys combines the two effects, giving you a circular selection "
 "centered on your starting point."
@@ -7792,11 +7175,11 @@ msgstr ""
 "selecciÃ³n da como resultado la intersecciÃ³n de la selecciÃ³n actual con la "
 "existente."
 
-#: src/toolbox/tool-ellipse-select.xml:142(phrase)
+#: src/toolbox/tool-ellipse-select.xml:155(title)
 msgid "Example of Ellipse Selection."
 msgstr ""
 
-#: src/toolbox/tool-ellipse-select.xml:150(para)
+#: src/toolbox/tool-ellipse-select.xml:163(para)
 msgid ""
 "When this tool is selected the mouse pointer comes with a circle icon as "
 "soon as it is over the image. A drag-and-drop allows you to get an ellipse "
@@ -7806,7 +7189,7 @@ msgid ""
 "easily later."
 msgstr ""
 
-#: src/toolbox/tool-ellipse-select.xml:158(para)
+#: src/toolbox/tool-ellipse-select.xml:171(para)
 msgid ""
 "When the pointer is moving on the canvas, the pointer and selection aspects "
 "change. You can change the size of the selection by using handles. See <link "
@@ -7814,66 +7197,35 @@ msgid ""
 "rectangular chapter."
 msgstr ""
 
-#: src/toolbox/tool-ellipse-select.xml:172(phrase)
+#: src/toolbox/tool-ellipse-select.xml:183(title)
 msgid "Tool Options for the Ellipse Select tool"
 msgstr "Las opciones de la herramienta de selecciÃ³n elÃptica."
 
-#: src/toolbox/tool-ellipse-select.xml:180(para)
-msgid ""
-"You can access to the Ellipse Selection options by double-clicking on the "
-"<placeholder-1/> icon."
-msgstr ""
-"Puede acceder a las opciones de esta herramienta efectuando doble clic sobre "
-"el icono <placeholder-1/>."
-
-#: src/toolbox/tool-ellipse-select.xml:197(term)
+#: src/toolbox/tool-ellipse-select.xml:203(term)
 msgid "All other options"
 msgstr ""
 
-#: src/toolbox/tool-ellipse-select.xml:201(para)
+#: src/toolbox/tool-ellipse-select.xml:205(para)
 msgid ""
 "All these options work exactly the same way, they were described for the "
 "rectangular selection already. See for <xref linkend=\"tool-rect-select-"
 "options\"/> details."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-dodge-burn.xml:37(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-dodge.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-dodge-burn.xml:63(None)
-#: src/toolbox/tool-dodge-burn.xml:129(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-dodge-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-dodge-burn.xml:118(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-dodge.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-dodge-burn.xml:22(phrase)
+#: src/toolbox/tool-dodge-burn.xml:13(title)
 msgid "Dodge or Burn"
 msgstr "Blanquear o ennegrecer"
 
-#: src/toolbox/tool-dodge-burn.xml:26(secondary)
-#: src/toolbox/tool-dodge-burn.xml:29(primary)
+#: src/toolbox/tool-dodge-burn.xml:16(secondary)
+#: src/toolbox/tool-dodge-burn.xml:19(primary)
 msgid "Dodge/Burn"
 msgstr ""
 
-#: src/toolbox/tool-dodge-burn.xml:33(phrase)
+#: src/toolbox/tool-dodge-burn.xml:23(title)
 msgid "Dodge tool"
 msgstr "La herramienta para blanquear o ennegrecer"
 
-#: src/toolbox/tool-dodge-burn.xml:41(para)
+#: src/toolbox/tool-dodge-burn.xml:30(para)
 msgid ""
 "The Dodge or Burn tool uses the current brush to lighten or darken the "
 "colors in your image. The mode will determine which type of pixels are "
@@ -7882,15 +7234,35 @@ msgstr ""
 "Esta herramienta utiliza la brocha para blanquear o ennegrecer los colores "
 "de la imagen. El modo determina los tipos de pÃxeles que se ven afectados."
 
-#: src/toolbox/tool-dodge-burn.xml:55(para)
+#: src/toolbox/tool-dodge-burn.xml:43(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"From the image-menu: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint Tools</"
-"guisubmenu><guimenuitem>Dod<accel>g</accel>e / Burn</guimenuitem></"
-"menuchoice>."
+"From the image-menu: <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint "
+"Tools</guisubmenu><guimenuitem>Dodge / Burn</guimenuitem></menuchoice>."
 msgstr ""
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-dodge-burn.xml:67(para)
+#: src/toolbox/tool-dodge-burn.xml:53(para)
+#, fuzzy
+#| msgid ""
+#| "You can also call it by clicking the tool icon: <guiicon><placeholder-1/> "
+#| "in the Toolbox, </guiicon>"
+msgid ""
+"The Tool can also be called by clicking the tool icon: "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-dodge-22.png\"/"
+"></guiicon>,"
+msgstr ""
+"La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/>"
+
+#: src/toolbox/tool-dodge-burn.xml:62(para)
 msgid ""
 "or by using the <keycombo><keycap>Shift</keycap><keycap>D</keycap></"
 "keycombo> keyboard shortcut."
@@ -7899,7 +7271,7 @@ msgstr ""
 "keycombo> cambia la herramienta activa por la herramienta para blanquear o "
 "ennegrecer."
 
-#: src/toolbox/tool-dodge-burn.xml:85(para)
+#: src/toolbox/tool-dodge-burn.xml:79(para)
 msgid ""
 "Toggle between dodge or burn types. The type will remain switched until "
 "<keycap>Ctrl</keycap> is released."
@@ -7907,7 +7279,7 @@ msgstr ""
 "Cambia entre los modos blanquear y ennegrecer. El modo permanece invertido "
 "hasta que la tecla <keycap>Ctrl</keycap> sea soltada."
 
-#: src/toolbox/tool-dodge-burn.xml:96(para)
+#: src/toolbox/tool-dodge-burn.xml:90(para)
 msgid ""
 "<keycap>Shift</keycap> places the Dodge or Burn tool into straight line "
 "mode. Holding Shift while clicking <mousebutton>Button1</mousebutton> will "
@@ -7921,60 +7293,61 @@ msgstr ""
 "consecutivos continÃºan blanqueando o ennegreciendo en lÃneas rectas que "
 "parten de la anterior."
 
-#: src/toolbox/tool-dodge-burn.xml:113(phrase)
+#: src/toolbox/tool-dodge-burn.xml:105(title)
 msgid "<quote>Dodge/Burn</quote> tool options"
 msgstr "Opciones de la herramienta <quote>blanquear/ennegrecer</quote>"
 
-#: src/toolbox/tool-dodge-burn.xml:126(para)
-msgid ""
-"The available tool options for the Dodge or Burn Tool can be accessed by "
-"double clicking the Dodge or Burn Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para la herramienta blanquear/ennegrecer pueden "
-"accederese haciendo doble clic en su icono. <placeholder-1/>"
-
-#: src/toolbox/tool-dodge-burn.xml:134(term)
+#: src/toolbox/tool-dodge-burn.xml:117(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
+#| "edges"
 msgid ""
-"Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
-"edges"
+"Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply Jitter, Hard edges"
 msgstr "Opacidad"
 
-#: src/toolbox/tool-dodge-burn.xml:145(para)
+#: src/toolbox/tool-dodge-burn.xml:128(para)
 msgid "The dodge effect lightens colors."
 msgstr "Blanquear ilumina los colores."
 
-#: src/toolbox/tool-dodge-burn.xml:146(para)
+#: src/toolbox/tool-dodge-burn.xml:129(para)
 msgid "The burn effect darkens colors."
 msgstr "Ennegrecer oscurece los colores."
 
-#: src/toolbox/tool-dodge-burn.xml:152(para)
+#: src/toolbox/tool-dodge-burn.xml:133(term)
+#, fuzzy
+#| msgid "Rate"
+msgid "Range"
+msgstr "Tasa"
+
+#: src/toolbox/tool-dodge-burn.xml:135(para)
 msgid "There are three modes:"
 msgstr "Esta herramienta posee tres modos:"
 
-#: src/toolbox/tool-dodge-burn.xml:155(para)
+#: src/toolbox/tool-dodge-burn.xml:138(para)
 msgid "<guilabel>Shadows</guilabel> restricts the effect to darkest pixels."
 msgstr ""
 "<guilabel>Sombras</guilabel> restrige el efecto a los pixeles mÃ¡s oscuros."
 
-#: src/toolbox/tool-dodge-burn.xml:160(para)
+#: src/toolbox/tool-dodge-burn.xml:143(para)
 msgid ""
 "<guilabel>Midtones</guilabel> restricts the effect to pixels of average tone."
 msgstr ""
 "<guilabel>Tonos medios</guilabel> restringe el efecto a los pixeles con un "
 "valor tonal medio."
 
-#: src/toolbox/tool-dodge-burn.xml:165(para)
+#: src/toolbox/tool-dodge-burn.xml:148(para)
 msgid ""
 "<guilabel>Highlights</guilabel> restricts the effect to lightest pixels."
 msgstr ""
 "<guilabel>Puntos de luz</guilabel> restringe el efecto a los pixeles mÃ¡s "
 "luminosos."
 
-#: src/toolbox/tool-dodge-burn.xml:173(term)
+#: src/toolbox/tool-dodge-burn.xml:156(term)
 msgid "Exposure"
 msgstr "ExposiciÃ³n"
 
-#: src/toolbox/tool-dodge-burn.xml:175(para)
+#: src/toolbox/tool-dodge-burn.xml:158(para)
 msgid ""
 "Exposure defines how much the tool effect will be strong, as a more or less "
 "exposed photograph. Default slider is 50 but can vary from 0 to 100."
@@ -7983,92 +7356,175 @@ msgstr ""
 "una fotografÃa mÃ¡s o menos expuesta. Por omisiÃ³n es 50, y puede variar de 0 "
 "a 100."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:56(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-curves-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
+#: src/toolbox/tool-desaturate.xml:15(title)
+#: src/toolbox/tool-desaturate.xml:21(primary)
+#, fuzzy
+#| msgid "Distribute"
+msgid "Desaturate"
+msgstr "Distribuir"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:76(None)
-msgid "@@image: 'images/toolbox/tools-curves.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
+#: src/toolbox/tool-desaturate.xml:17(primary)
+#, fuzzy
+#| msgid "Colorize"
+msgid "Colors"
+msgstr "Colorear"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:317(None)
-msgid "@@image: 'images/toolbox/curves-work.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-desaturate.xml:18(secondary)
+msgid "Convert to gray scale"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:333(None)
+#: src/toolbox/tool-desaturate.xml:23(para)
 msgid ""
-"@@image: 'images/toolbox/curves-horiz-1.png'; md5=THIS FILE DOESN'T EXIST"
+"By using the <guimenuitem>Desaturate</guimenuitem> command, you can convert "
+"all of the colors on the active layer to corresponding shades of gray. This "
+"differs from converting the image to grayscale in two respects. First, it "
+"only operates on the active layer and second, the colors on the layer are "
+"still RGB values with three components. This means that you can paint on the "
+"layer, or individual parts of it, using color at a later time."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:344(None)
+#: src/toolbox/tool-desaturate.xml:34(para)
 msgid ""
-"@@image: 'images/toolbox/curves-horiz-2.png'; md5=THIS FILE DOESN'T EXIST"
+"This command only works on layers of <link linkend=\"glossary-rgb\">RGB</"
+"link> images. If the image is in Grayscale or Indexed mode, it can do "
+"nothing."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:361(None)
-msgid ""
-"@@image: 'images/toolbox/curves-vert-1.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-desaturate.xml:42(title)
+#, fuzzy
+msgid "Activating the Command"
 msgstr ""
+"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Activar herramienta\n"
+"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Activar la herramienta\n"
+"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta\n"
+"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta\n"
+"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:384(None)
+#: src/toolbox/tool-desaturate.xml:46(para)
+#, fuzzy
+#| msgid ""
+#| "In the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Curves</"
+#| "guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
+#| "guimenu><guimenuitem>Curves</guimenuitem></menuchoice>."
 msgid ""
-"@@image: 'images/toolbox/curves-vert-2.png'; md5=THIS FILE DOESN'T EXIST"
+"In the image menu through <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Desaturate</"
+"guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
+"guimenu><guimenuitem>Desaturate</guimenuitem></menuchoice>,"
 msgstr ""
+"En el meÃº de la imagen <guimenuitem><accel>H</accel>erramientas</"
+"guimenuitem>/ <guimenuitem>Herramientas de <accel>c</accel>olor</"
+"guimenuitem>/ <guimenuitem><accel>C</accel>urvas. </guimenuitem>"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:407(None)
+#: src/toolbox/tool-desaturate.xml:60(para)
+#, fuzzy
+#| msgid ""
+#| "By clicking on the tool icon <placeholder-1/> in Toolbox, if this tool "
+#| "has been installed there (see <link linkend=\"gimp-tools-dialog\">Tools "
+#| "dialog</link>."
 msgid ""
-"@@image: 'images/toolbox/curves-invert.png'; md5=THIS FILE DOESN'T EXIST"
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-convert-grayscale-16.png\"/></guiicon> in Toolbox, if this "
+"tool has been installed there (see <link linkend=\"gimp-tools-dialog\">Tools "
+"dialog</link>."
 msgstr ""
+"Pulsando sobre el icono de la herramienta <placeholder-1/> en la caja de "
+"herramientas, si ya estÃ¡ instalada allÃ. Para esto, mirar <link linkend="
+"\"gimp-tools-dialog\">DiÃ¡logo de herramientas</link>."
+
+#: src/toolbox/tool-desaturate.xml:76(title)
+#, fuzzy
+#| msgid "The <quote>Adjust Color Curves</quote> dialog"
+msgid "The <quote>Desaturate</quote> option dialog"
+msgstr "La herramienta curvas"
+
+#: src/toolbox/tool-desaturate.xml:83(para)
+#, fuzzy
+#| msgid "Several functions are available with this mode:"
+msgid "Three options are available:"
+msgstr "Hay varias funciones disponibles en este modo:"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:427(None)
-msgid "@@image: 'images/toolbox/curves-H-S.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-desaturate.xml:85(title)
+msgid "Choose shade of gray based on"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:445(None)
-msgid ""
-"@@image: 'images/toolbox/curves-lighten-1.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-desaturate.xml:87(term)
+#, fuzzy
+#| msgid "Brightness"
+msgid "Lightness"
+msgstr "Brillo"
+
+#: src/toolbox/tool-desaturate.xml:89(para)
+#: src/toolbox/tool-desaturate.xml:104(para)
+#: src/toolbox/tool-desaturate.xml:121(para)
+#, fuzzy
+#| msgid "The area which will be selected"
+msgid "The graylevel will be calculated as"
+msgstr "El Ã¡rea que serÃ¡ seleccionada"
+
+#: src/toolbox/tool-desaturate.xml:93(phrase)
+msgid "Lightness = &frac12;&times; (max(R,G,B) + min(R,G,B))"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-curves.xml:459(None)
-msgid ""
-"@@image: 'images/toolbox/curves-lighten-2.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-desaturate.xml:102(term)
+#, fuzzy
+#| msgid "Preserve Luminosity"
+msgid "Luminosity"
+msgstr "Conservar la luminosidad"
+
+#: src/toolbox/tool-desaturate.xml:108(phrase)
+msgid "Luminosity = 0.21 &times; R + 0.71 &times; G + 0.07 &times; B"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:18(date)
-msgid "2008-01-23"
-msgstr "2007-04-15"
+#: src/toolbox/tool-desaturate.xml:119(term)
+#, fuzzy
+#| msgid "Sample Average"
+msgid "Average"
+msgstr "Muestra ponderada"
+
+#: src/toolbox/tool-desaturate.xml:125(phrase)
+msgid "Average Brightness = (R + G + B) &divide; 3"
+msgstr ""
+
+#: src/toolbox/tool-desaturate.xml:133(title)
+#, fuzzy
+#| msgid "Colorize options"
+msgid "Comparing the three options"
+msgstr "Opciones de colorear"
+
+#: src/toolbox/tool-desaturate.xml:148(para)
+#, fuzzy
+#| msgid "<quote>Filter</quote> brushes"
+msgid "<quote>Lightness</quote> applied"
+msgstr "Brochas \"filtro\""
+
+#: src/toolbox/tool-desaturate.xml:157(para)
+#, fuzzy
+#| msgid "<quote>Smoothing</quote> option effect"
+msgid "<quote>Luminosity</quote> applied."
+msgstr ""
+"En el centro, suavizado = 0 : no se seleccionan los agujeros de mÃ¡s de 1 "
+"pÃxel."
+
+#: src/toolbox/tool-desaturate.xml:169(para)
+#, fuzzy
+#| msgid "<quote>Filter</quote> brushes"
+msgid "<quote>Average</quote> applied."
+msgstr "Brochas \"filtro\""
 
-#: src/toolbox/tool-curves.xml:24(phrase)
-#: src/toolbox/tool-curves.xml:28(secondary)
-#: src/toolbox/tool-curves.xml:31(primary)
+#: src/toolbox/tool-curves.xml:16(title)
+#: src/toolbox/tool-curves.xml:20(secondary)
+#: src/toolbox/tool-curves.xml:23(primary)
 msgid "Curves"
 msgstr "Curvas"
 
-#: src/toolbox/tool-curves.xml:33(para)
+#: src/toolbox/tool-curves.xml:26(para)
 msgid ""
 "The Curves tool is the most sophisticated tool for changing the color, "
 "brightness, contrast or transparency of the active layer or a selection. "
@@ -8078,11 +7534,13 @@ msgstr ""
 "La herramienta curvas es la mÃ¡s sofisticada para ajustar las tonalidades de "
 "la imÃ¡genes."
 
-#: src/toolbox/tool-curves.xml:44(para)
-msgid "You can get to this tools in several ways :"
+#: src/toolbox/tool-curves.xml:36(para)
+#, fuzzy
+#| msgid "You can get to this tools in several ways :"
+msgid "You can get to this tool in several ways:"
 msgstr "Puede obtener esta herramienta de dos maneras:"
 
-#: src/toolbox/tool-curves.xml:47(para)
+#: src/toolbox/tool-curves.xml:39(para)
 msgid ""
 "In the image menu through <menuchoice><guimenu>Tools</"
 "guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Curves</"
@@ -8093,9 +7551,15 @@ msgstr ""
 "guimenuitem>/ <guimenuitem>Herramientas de <accel>c</accel>olor</"
 "guimenuitem>/ <guimenuitem><accel>C</accel>urvas. </guimenuitem>"
 
-#: src/toolbox/tool-curves.xml:54(para)
+#: src/toolbox/tool-curves.xml:53(para)
+#, fuzzy
+#| msgid ""
+#| "By clicking on the tool icon <placeholder-1/> in Toolbox, if this tool "
+#| "has been installed there (see <link linkend=\"gimp-tools-dialog\">Tools "
+#| "dialog</link>."
 msgid ""
-"By clicking on the tool icon <placeholder-1/> in Toolbox, if this tool has "
+"By clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-curves-22.png\"/></guiicon> in Toolbox, if this tool has "
 "been installed there (see <link linkend=\"gimp-tools-dialog\">Tools dialog</"
 "link>."
 msgstr ""
@@ -8103,35 +7567,35 @@ msgstr ""
 "herramientas, si ya estÃ¡ instalada allÃ. Para esto, mirar <link linkend="
 "\"gimp-tools-dialog\">DiÃ¡logo de herramientas</link>."
 
-#: src/toolbox/tool-curves.xml:65(phrase)
+#: src/toolbox/tool-curves.xml:67(title)
 msgid "<quote>Adjust Color Curves</quote> options"
 msgstr "Ajustar las curvas de color"
 
-#: src/toolbox/tool-curves.xml:70(phrase)
+#: src/toolbox/tool-curves.xml:69(title)
 msgid "The <quote>Adjust Color Curves</quote> dialog"
 msgstr "La herramienta curvas"
 
-#: src/toolbox/tool-curves.xml:84(para)
+#: src/toolbox/tool-curves.xml:123(para)
 msgid "There are five options:"
 msgstr ""
 "Hay cinco opciones: Valor para luminosidad y contraste; rojo, verde y azul "
 "para la saturaciÃ³n; y alfa (si la imagen tiene canal alfa)."
 
-#: src/toolbox/tool-curves.xml:90(phrase)
+#: src/toolbox/tool-curves.xml:125(term)
 msgid "Value"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:93(para)
+#: src/toolbox/tool-curves.xml:127(para)
 msgid ""
 "The curve represents the Value, i.e the brightness of pixels as you can see "
 "them in the composite image."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:101(phrase)
+#: src/toolbox/tool-curves.xml:134(term)
 msgid "Red; Green; Blue"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:104(para)
+#: src/toolbox/tool-curves.xml:136(para)
 msgid ""
 "The curve represents the quantity of color in each of the three RGB "
 "channels. Here, <emphasis>dark</emphasis> means <emphasis>little</emphasis> "
@@ -8139,11 +7603,11 @@ msgid ""
 "the color."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:115(phrase)
+#: src/toolbox/tool-curves.xml:146(term)
 msgid "Alpha"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:118(para)
+#: src/toolbox/tool-curves.xml:148(para)
 msgid ""
 "The curve represents the opacity of the pixels. <emphasis>Dark</emphasis> "
 "means <emphasis>very transparent</emphasis>. <emphasis>Light</emphasis> "
@@ -8151,11 +7615,11 @@ msgid ""
 "channel for this option to be enabled."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:132(term)
+#: src/toolbox/tool-curves.xml:162(term)
 msgid "Reset Channel"
 msgstr "Reinicializar el canal"
 
-#: src/toolbox/tool-curves.xml:134(para)
+#: src/toolbox/tool-curves.xml:164(para)
 msgid ""
 "This button deletes all changes made to the selected channel and returns to "
 "default values."
@@ -8163,30 +7627,28 @@ msgstr ""
 "Este botÃ³n anula todos los cambios en el canal seleccionado y devuelve los "
 "valores predeterminados."
 
-#: src/toolbox/tool-curves.xml:141(term)
+#: src/toolbox/tool-curves.xml:171(term)
 msgid "Linear and Logarithmic buttons"
 msgstr "Botones lineal y logarÃtmico"
 
-#: src/toolbox/tool-curves.xml:143(para)
+#: src/toolbox/tool-curves.xml:173(para)
+#, fuzzy
+#| msgid ""
+#| "These buttons allow to choose the Linear or Logarithmic type of the "
+#| "histogram. You can also use the same options in Tool Options dialog."
 msgid ""
 "These buttons allow to choose the Linear or Logarithmic type of the "
-"histogram. You can also use the same options in Tool Options dialog."
+"histogram. You can also use the same options in Tool Options dialog. This "
+"grayed out histogram is not displayed by default."
 msgstr ""
 "Estos botones permiten elegir el tipo, lineal o logarÃtmico, del histograma. "
 "Puede usar las mismas opciones en el diÃ¡logo opciones de herramientas"
 
-#: src/toolbox/tool-curves.xml:151(term)
+#: src/toolbox/tool-curves.xml:181(term)
 msgid "Main Editing Area"
 msgstr "Area principal de ediciÃ³n"
 
-#: src/toolbox/tool-curves.xml:155(para)
-msgid ""
-"<emphasis>The vertical gradient</emphasis>: it represents the the "
-"destination, the output tonal scale. It ranges from 0 (black) to 255 "
-"(white), from Shadows to Highlights."
-msgstr ""
-
-#: src/toolbox/tool-curves.xml:161(para)
+#: src/toolbox/tool-curves.xml:185(para)
 msgid ""
 "<emphasis>The horizontal gradient</emphasis>: it represents the input tonal "
 "scale. It, too, ranges from 0 (black) to 255 (white), from Shadows to "
@@ -8195,7 +7657,14 @@ msgid ""
 "layer or selection."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:170(para)
+#: src/toolbox/tool-curves.xml:195(para)
+msgid ""
+"<emphasis>The vertical gradient</emphasis>: it represents the the "
+"destination, the output tonal scale. It ranges from 0 (black) to 255 "
+"(white), from Shadows to Highlights."
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:202(para)
 msgid ""
 "<emphasis>The chart</emphasis>: the curve is drawn on a grid and goes from "
 "the bottom left corner to the top right corner. The pointer x/y position is "
@@ -8205,16 +7674,16 @@ msgid ""
 "black (0) and white (255)."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:178(para)
+#: src/toolbox/tool-curves.xml:211(para)
 msgid ""
 "If you click on the curve, a new <emphasis>anchor</emphasis> is created. "
-"When the mouse pointer goes over an anchor, it takes the form of the moving "
-"crosshair. You can click-and-drag the anchor to bend the curve. If you click "
+"When the mouse pointer goes over an anchor, it takes the form of a small "
+"hand. You can click-and-drag the anchor to bend the curve. If you click "
 "outside of the curve, an anchor is also created, and the curve includes it "
 "automatically."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:186(para)
+#: src/toolbox/tool-curves.xml:219(para)
 msgid ""
 "Unactive anchors are black. The active anchor is white. You can activate an "
 "anchor by clicking on it. You can also swap the anchor activation by using "
@@ -8224,21 +7693,21 @@ msgid ""
 "increments of 15 pixels."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:195(para)
+#: src/toolbox/tool-curves.xml:228(para)
 msgid ""
 "Two anchors define a <emphasis>curve segment</emphasis> which represents a "
 "tonal range in the layer. You can click-and-drag this segment (this creates "
 "a new anchor). Of course, you can't drag it beyond the end anchors."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:201(para)
+#: src/toolbox/tool-curves.xml:234(para)
 msgid ""
 "To delete all anchors (apart from both ends), click on the <guilabel>Reset "
 "Channel</guilabel> button. To delete only one anchor, move it onto another "
-"point or to the grid border."
+"point or to the grid border, left or right."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:207(para)
+#: src/toolbox/tool-curves.xml:240(para)
 msgid ""
 "Meanwhile, on the canvas, the mouse pointer has the form of an eye-dropper. "
 "If you click on a pixel, a vertical line appears on the chart, positioned to "
@@ -8249,50 +7718,55 @@ msgid ""
 "anchor will show up when releasing the mouse left button."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:218(para)
+#: src/toolbox/tool-curves.xml:251(para)
 msgid ""
 "The histogram of the active layer or selection for the selected channel is "
-"represented grayed out in the chart. It's only a reference. --&gt;"
+"represented grayed out in the chart. It's only a reference."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:235(para)
-msgid ""
-"<guilabel>Open</guilabel>: This button allows you to select a file holding "
-"curve settings."
-msgstr ""
-"<guilabel>Abrir</guilabel>: Este botÃ³n permite abrir un archivo de curva."
-
-#: src/toolbox/tool-curves.xml:238(para)
-msgid ""
-"<guilabel>Save</guilabel>: Allows you to save any curves you have set to a "
-"file that can be loaded later."
-msgstr ""
-"<guilabel>Guardar</guilabel>: Permite guardar la configuraciÃ³n de una curva."
-
-#: src/toolbox/tool-curves.xml:244(term)
+#: src/toolbox/tool-curves.xml:261(term)
 msgid "Curve type"
 msgstr "Tipos de curva"
 
-#: src/toolbox/tool-curves.xml:246(para)
+#: src/toolbox/tool-curves.xml:265(term)
+#, fuzzy
+#| msgid "Smoothing"
+msgid "Smooth"
+msgstr "Efecto de la opciÃ³n <quote>Suavizado</quote>"
+
+#: src/toolbox/tool-curves.xml:267(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Smooth</guilabel>: This mode constrains the curve type to a "
+#| "smooth line with tension. It provides a more realistic render than the "
+#| "following."
 msgid ""
-"<guilabel>Smooth</guilabel>: This mode constrains the curve type to a smooth "
-"line with tension. It provides a more realistic render than the following."
+"This the default mode. It constrains the curve type to a smooth line with "
+"tension. It provides a more realistic render than the following."
 msgstr ""
 "<guilabel>Suave</guilabel>: Este modo impone un tipo de curva con una linea "
 "suave con tensiÃ³n. Proporciona una representaciÃ³n mÃ¡s realista que la "
 "siguiente."
 
-#: src/toolbox/tool-curves.xml:250(para)
+#: src/toolbox/tool-curves.xml:275(term)
+msgid "Free Hand"
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:277(para)
+#, fuzzy
+#| msgid ""
+#| "<guilabel>Free</guilabel>: With GIMP-v2.4, you are not totally free to "
+#| "draw the curve. You actually draw a broken line that you can smooth by "
+#| "clicking the <guibutton>Smooth</guibutton> button."
 msgid ""
-"<guilabel>Free</guilabel>: With GIMP-v2.4, you are not totally free to draw "
-"the curve. You actually draw a broken line that you can smooth by clicking "
-"the <guibutton>Smooth</guibutton> button."
+"With this mode, you can draw a broken line that you can smooth by clicking "
+"the <guibutton>Curve Type</guibutton> button again."
 msgstr ""
 "<guilabel>Mano alzada</guilabel>: Se puede dibujar una curva a mano alzada "
 "con el ratÃ³n. Con segmentos de curva esparcidos por toda la rejilla, pero "
 "dificil de repetir."
 
-#: src/toolbox/tool-curves.xml:260(para)
+#: src/toolbox/tool-curves.xml:290(para)
 msgid ""
 "The Preview button makes all changes to the levels dynamically so that the "
 "new level settings can be viewed immediately."
@@ -8300,7 +7774,7 @@ msgstr ""
 "La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
 "Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
 
-#: src/toolbox/tool-curves.xml:279(para)
+#: src/toolbox/tool-curves.xml:307(para)
 msgid ""
 "These two options have the same action as the logarithmic and Linear buttons "
 "in the Curves dialog."
@@ -8308,7 +7782,7 @@ msgstr ""
 "Estas dos opciones tienen las mismas acciones que los botones lineal y "
 "logarÃtmico en el diÃ¡logo de curvas."
 
-#: src/toolbox/tool-curves.xml:288(para)
+#: src/toolbox/tool-curves.xml:316(para)
 msgid ""
 "This slider sets the <quote>radius</quote> of the color-picking area. This "
 "area appears as a more or less enlarged square when you maintain the click "
@@ -8319,50 +7793,66 @@ msgstr ""
 "color (cuentagotas). Este area aparece, como un cuadrado mÃ¡s grande a mayor "
 "radio, cuando se mantiene pulsado el botÃ³n del ratÃ³n sobre un pÃxel."
 
-#: src/toolbox/tool-curves.xml:300(phrase)
+#: src/toolbox/tool-curves.xml:328(title)
 msgid "Using the <quote>Curves</quote> tool"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:304(term)
+#: src/toolbox/tool-curves.xml:331(title)
 msgid "Summary and basic shapes"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:306(para)
+#: src/toolbox/tool-curves.xml:333(para)
 msgid ""
 "We create anchors and segments on the curve and we move them to shape the "
 "curve. This curve maps <quote>input</quote> tones of the active layer or "
 "selection to <quote>output</quote> tones."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:313(phrase)
+#: src/toolbox/tool-curves.xml:340(title)
 msgid "How the Curves tool works"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:320(para)
+#: src/toolbox/tool-curves.xml:342(para)
 msgid "Moving the anchor of a pixel upwards makes this pixel brighter."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:329(phrase)
+#: src/toolbox/tool-curves.xml:350(para)
+msgid "Moving the anchor upwards"
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:356(title)
+#: src/toolbox/tool-curves.xml:367(title)
 msgid "Making the curve more horizontal"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:336(para)
+#: src/toolbox/tool-curves.xml:358(para)
 msgid ""
 "Making the curve more horizontal forces all the input tonal range to occupy "
 "a shrunk output tonal range."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:347(para)
+#: src/toolbox/tool-curves.xml:362(para)
 msgid ""
 "The histogram shows the compression of pixels into the output range. Darkest "
 "and brightest pixels disappeared: contrast decreases."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:357(phrase)
+#: src/toolbox/tool-curves.xml:373(para)
+msgid "Make the curve more horizontal"
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:381(para)
+#, fuzzy
+#| msgid "The result"
+msgid "The resulting histogram"
+msgstr "El resultado"
+
+#: src/toolbox/tool-curves.xml:388(title)
+#: src/toolbox/tool-curves.xml:409(title)
 msgid "Making the curve more vertical"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:364(para)
+#: src/toolbox/tool-curves.xml:390(para)
 msgid ""
 "Moving the upper end point to the left and the lower end point to the right "
 "is the same as moving the white slider to the left and the black slider to "
@@ -8376,111 +7866,85 @@ msgid ""
 "be extended to the whole output tonal range."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:387(para)
+#: src/toolbox/tool-curves.xml:403(para)
 msgid ""
 "The histogram shows the extension of values, from black (0) to White (255): "
 "contrast is increased. Since the Value channel is selected, changes affect "
 "all color channels and colors increase."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:399(term)
+#: src/toolbox/tool-curves.xml:416(para)
+msgid "Make the curve more vertical"
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:425(para)
+msgid "Result and its histogram"
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:433(title)
 msgid "Practical cases"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:403(phrase)
+#: src/toolbox/tool-curves.xml:436(title)
 msgid "Invert colors"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:410(para)
+#: src/toolbox/tool-curves.xml:444(para)
+msgid "Inverted curve"
+msgstr ""
+
+#: src/toolbox/tool-curves.xml:447(para)
 msgid ""
 "Black is made White (fully colored / fully opaque). White is made black "
 "(black, fully transparent). All pixels adopt the complementary color. Why "
-"that? Because subtracting 255 from the channel values gives the "
-"complementary color. For example: 19;197;248 a sky blue gives 255-19; 255-"
-"197; 255-248 = 236;58;7, a bright red."
+"that? Because subtracting the channel values from 255 gives the "
+"complementary color. For example: 19;197;248 a sky blue gives 255-19; "
+"255-197; 255-248 = 236;58;7, a bright red."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:423(phrase)
+#: src/toolbox/tool-curves.xml:457(title)
 msgid "Enhance contrast"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:430(para)
+#: src/toolbox/tool-curves.xml:464(para)
+#, fuzzy
+#| msgid "Contrast"
+msgid "Contrast enhanced"
+msgstr "Contraste"
+
+#: src/toolbox/tool-curves.xml:467(para)
 msgid ""
 "Contrast is increased in mid tones because the curve is steeper there. "
 "Highlights and Shadows are increased but contrast is slightly less in these "
 "areas because the curve is flatter."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:441(phrase)
+#: src/toolbox/tool-curves.xml:475(title)
 msgid "Working on color channels"
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:448(para)
+#: src/toolbox/tool-curves.xml:483(para)
 msgid ""
 "For every channel, we moved the white point horizontally to the left, to the "
 "first Highlights. This lightens Highlights up. Then we shaped the curve to "
 "lighten Mid tons and Shadows while keeping black."
 msgstr ""
 
-#: src/toolbox/tool-curves.xml:462(para)
-msgid "The original image and the result."
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:46(None)
-msgid "@@image: 'images/toolbox/toolbox-crop.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:93(None) src/toolbox/tool-crop.xml:173(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-crop-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:162(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-crop.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:200(None)
-msgid "@@image: 'images/toolbox/crop-grow-1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:211(None)
-msgid "@@image: 'images/toolbox/crop-grow-2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:332(None)
-msgid "@@image: 'images/toolbox/auto-shrink1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-crop.xml:342(None)
-msgid "@@image: 'images/toolbox/auto-shrink2.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-curves.xml:495(para)
+msgid "The original image and the result"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:26(phrase) src/toolbox/tool-crop.xml:29(primary)
-#: src/toolbox/tool-crop.xml:33(secondary)
-#: src/toolbox/tool-crop.xml:37(secondary)
+#: src/toolbox/tool-crop.xml:18(title) src/toolbox/tool-crop.xml:21(primary)
+#: src/toolbox/tool-crop.xml:25(secondary)
+#: src/toolbox/tool-crop.xml:29(secondary)
 msgid "Crop"
 msgstr "Recortar y redimensionar"
 
-#: src/toolbox/tool-crop.xml:38(tertiary) src/toolbox/tool-crop.xml:42(phrase)
+#: src/toolbox/tool-crop.xml:34(title)
 msgid "Crop tool"
 msgstr "Herramienta recortar"
 
-#: src/toolbox/tool-crop.xml:50(para)
+#: src/toolbox/tool-crop.xml:41(para)
 msgid ""
 "The Crop Tool is used to crop or clip an image. It works on all the layers "
 "of the image, visible and invisible. This tool is often used to remove "
@@ -8494,7 +7958,7 @@ msgstr ""
 "necesitas un tamaÃ±o especÃfico de imagen, distinto de las dimensiones del "
 "original."
 
-#: src/toolbox/tool-crop.xml:57(para)
+#: src/toolbox/tool-crop.xml:48(para)
 msgid ""
 "Just like the selection tools, the new crop tool has been enhanced with the "
 "v2.4 release. The resize handles actually resize the crop rectangle instead "
@@ -8515,140 +7979,141 @@ msgstr ""
 "regiÃ³n de recorte o pulsando los botones recortar o redimensionar en el "
 "diÃ¡logo."
 
-#: src/toolbox/tool-crop.xml:69(para)
+#: src/toolbox/tool-crop.xml:60(para)
 msgid ""
 "When the mouse becomes the moving cross-hair, you can use the keyboard arrow "
 "keys to move the crop rectangle. Holding the <keycap>Shift</keycap> key down "
-"allows to move by steps of 25 pixels."
+"allows to move by increments of 25 pixels."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:74(para)
+#: src/toolbox/tool-crop.xml:65(para)
 msgid ""
 "You can use Guides to position the crop area. Make sure that the "
 "<menuchoice><guimenu>View</guimenu><guimenuitem>Snap to Guides</"
 "guimenuitem></menuchoice> option is checked."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:85(para)
+#: src/toolbox/tool-crop.xml:74(para)
 msgid ""
-"You can access this tool from the image-menu through: "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
-"guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
+"You can see the aspect ratio in the status bar: "
+"<mediaobject><imageobject><imagedata format=\"PNG\" fileref=\"images/toolbox/"
+"display_ratio.png\"/></imageobject></mediaobject>"
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
-"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
-"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
 
-#: src/toolbox/tool-crop.xml:91(para)
-msgid ""
-"The Tool can also be called by clicking the tool icon: <placeholder-1/>,"
-msgstr ""
-"TambiÃ©n se puede seleccionar pulsando sobre el icono de la herramienta: "
-"<placeholder-1/>"
+#: src/toolbox/tool-crop.xml:90(para)
+#, fuzzy
+#| msgid "You can activate the Align tool in several ways :"
+msgid "You can activate this tool in different ways:"
+msgstr "Puede activar la herramienta de varias maneras :"
 
-#: src/toolbox/tool-crop.xml:97(para)
+#: src/toolbox/tool-crop.xml:95(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"or by using the <keycombo><keycap>Shift</keycap><keycap>C</keycap></"
-"keycombo> keys."
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Transform tools</guisubmenu><guimenuitem>Crop</"
+"guimenuitem></menuchoice>,"
 msgstr ""
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-crop.xml:104(para)
+#: src/toolbox/tool-crop.xml:105(para)
 msgid ""
-"A different and quicker way to crop selections is using the "
-"<menuchoice><guimenu><accel>I</accel>mage</guimenu><guimenuitem><accel>C</"
-"accel>rop Image</guimenuitem></menuchoice> function in the Image menu."
+"by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-crop-22.png\"/></guiicon>in the ToolBox,"
 msgstr ""
-"Una manera rÃ¡pida y diferente para recortar selecciones es el uso de la "
-"funciÃ³n <menuchoice><guimenu><accel>I</accel>magen</"
-"guimenu><guimenuitem><accel>R</accel>ecortar la imagen</guimenuitem></"
-"menuchoice> en el menÃº de la imagen."
 
-#: src/toolbox/tool-crop.xml:119(para)
+#: src/toolbox/tool-crop.xml:114(para)
+#, fuzzy
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>S</keycap></"
+#| "keycombo> key combination."
 msgid ""
-"The <keycombo><keycap>Shift</keycap><keycap>C</keycap></keycombo> shortcut "
-"will change the active tool to the Crop Tool."
+"by using the keyboard shortcut <keycombo><keycap>Shift</keycap><keycap>C</"
+"keycap></keycombo>."
 msgstr ""
-"El atajo <keycombo><keycap>Mayus</keycap><keycap>C</keycap></keycombo> "
-"cambiarÃ¡ la herramienta activa a la herramienta recortar"
+"o usando la combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>S</"
+"keycap></keycombo>."
 
-#: src/toolbox/tool-crop.xml:129(para)
+#: src/toolbox/tool-crop.xml:124(para)
 msgid "When you maintain click on the crop rectangle, handles disappear and"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:135(para)
+#: src/toolbox/tool-crop.xml:130(para)
 msgid ""
 "holding down the <keycap>Ctrl</keycap> key toggles to the <guilabel>Extend "
 "from Center</guilabel> option,"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:141(para)
+#: src/toolbox/tool-crop.xml:136(para)
 msgid ""
 "holding down the <keycap>Shift</keycap> key toggles to the <guilabel>Fixed</"
 "guilabel> option, which makes some dimensions fixed."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:158(phrase)
-msgid "<quote>Crop</quote> tool options"
-msgstr "Opciones de la herramienta <quote>Recortar y redimensionar</quote>"
-
-#: src/toolbox/tool-crop.xml:170(para)
-msgid ""
-"The available tool options for Crop can be accessed by double clicking the "
-"Crop tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede acceder a las opciones de herramientas disponibles para recortar "
-"pulsando dos veces en el icono de la herramienta. <placeholder-1/>"
+#: src/toolbox/tool-crop.xml:148(title)
+#, fuzzy
+#| msgid "Tool Options for the Clone tool"
+msgid "Tool Options for the <quote>Crop</quote> tool"
+msgstr "Opciones de la herramienta para clonar"
 
-#: src/toolbox/tool-crop.xml:178(term)
+#: src/toolbox/tool-crop.xml:160(term)
 msgid "Current Layer Only"
 msgstr "Solo la capa activa"
 
-#: src/toolbox/tool-crop.xml:180(para)
+#: src/toolbox/tool-crop.xml:162(para)
 msgid "This option will make crop affect only the active layer."
 msgstr ""
 "Esta opciÃ³n harÃ¡, que recortar o redimensionar, afecte, solo, a la capa "
 "activa."
 
-#: src/toolbox/tool-crop.xml:186(term)
+#: src/toolbox/tool-crop.xml:168(term)
 msgid "Allow Growing"
 msgstr "Permitir agrandar"
 
-#: src/toolbox/tool-crop.xml:188(para)
+#: src/toolbox/tool-crop.xml:170(para)
 msgid ""
-"This option allows the crop or resize to take place outside the image or "
-"layer boundary."
+"This option allows the crop or resize to take place outside the image (or "
+"layer), and even the canvas. So, you can give the size you want to the "
+"resulting image. Transparency will be used if there is no material to crop."
 msgstr ""
-"Esta opciÃ³n permite que el recorte o redimensionamiento ocupen parte "
-"exterior de los contornos de la imagen o capa"
 
-#: src/toolbox/tool-crop.xml:194(phrase)
+#: src/toolbox/tool-crop.xml:177(title)
 msgid "Example for <quote>Allow Growing</quote>"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:203(para)
-msgid ""
-"The option is checked: you can draw the crop rectangle outside the image "
-"border."
+#: src/toolbox/tool-crop.xml:183(para)
+msgid "An image on a big canvas"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:214(para)
-msgid ""
-"The resulting image has the same size as the crop rectangle. The area "
-"outside the original image limit is transparent."
+#: src/toolbox/tool-crop.xml:191(para)
+msgid "The option is checked. The crop rectangle extends outside the canvas."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:225(term)
+#: src/toolbox/tool-crop.xml:202(para)
+#, fuzzy
+#| msgid "The result"
+msgid "The resulting image."
+msgstr "El resultado"
+
+#: src/toolbox/tool-crop.xml:209(term)
 msgid "Expand from Center"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:227(para)
+#: src/toolbox/tool-crop.xml:211(para)
 msgid ""
 "When this option is checked, the crop rectangle expands from the first pixel "
 "you clicked taken for center. You can toggle this option with <keycap>Ctrl</"
 "keycap> while drawing the crop rectangle."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:238(para)
+#: src/toolbox/tool-crop.xml:222(para)
 msgid ""
 "You can also access this option by holding down the <keycap>Ctrl</keycap> "
 "key while drawing the crop rectangle. This option offers you several to make "
@@ -8657,23 +8122,23 @@ msgstr ""
 "Con esta opciÃ³n, el recorte mantendrÃ¡ la proporciÃ³n entre la anchura y la "
 "altura."
 
-#: src/toolbox/tool-crop.xml:246(para)
+#: src/toolbox/tool-crop.xml:230(para)
 msgid ""
 "<guilabel>Aspect ratio</guilabel>: That's the default possibility. Width and "
 "Height keep the same ratio they have in the original image, when drawing the "
 "crop rectangle."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:252(para)
+#: src/toolbox/tool-crop.xml:237(para)
 msgid ""
-"<guilabel>Width / Height</guilabel>: only Width or Height will remain fixed. "
+"<guilabel>Width / Height</guilabel>: Only Width or Height will remain fixed. "
 "The value of this dimension can be set in the text box below; it defaults to "
 "100 pixels."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:258(para)
+#: src/toolbox/tool-crop.xml:244(para)
 msgid ""
-"<guilabel>Size</guilabel>: both Width and Height will be fixed. Their values "
+"<guilabel>Size</guilabel>: Both Width and Height will be fixed. Their values "
 "can be set in the text box below, in the form <quote>150x100</quote> for "
 "example. The crop rectangle will adopt this values as soon as you click the "
 "image. On the right, two buttons let you choose a <guibutton>Landscape</"
@@ -8681,11 +8146,11 @@ msgid ""
 "for the crop rectangle."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:272(term)
+#: src/toolbox/tool-crop.xml:259(term)
 msgid "Position"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:274(para)
+#: src/toolbox/tool-crop.xml:261(para)
 msgid ""
 "These two text boxes show the position (horizontal on the left, vertical on "
 "the right) of the upper left corner of the crop rectangle in real time and "
@@ -8695,7 +8160,7 @@ msgid ""
 "the image)."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:288(para)
+#: src/toolbox/tool-crop.xml:275(para)
 msgid ""
 "These two text boxes show the size (horizontal on the left, vertical on the "
 "right) of the crop-rectangle in real time and you can change it manually "
@@ -8703,95 +8168,80 @@ msgid ""
 "down list of the <guibutton>px</guibutton> button."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:300(para)
+#: src/toolbox/tool-crop.xml:287(para)
 msgid ""
 "This option toggles the dark outside area intended for highlighting the crop "
 "rectangle."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:309(para)
+#: src/toolbox/tool-crop.xml:296(para)
 msgid ""
 "All kinds of guides are described in <xref linkend=\"gimp-tool-rect-select\"/"
 ">"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:316(term)
+#: src/toolbox/tool-crop.xml:303(term)
 msgid "Autoshrink"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:318(para)
+#: src/toolbox/tool-crop.xml:305(para)
 msgid ""
 "The Auto Shrink button will attempt to locate a border, in the active layer, "
 "from which to draw dimensions from. This option only works well with "
 "isolated objects contrasting sharply with background."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:326(phrase)
+#: src/toolbox/tool-crop.xml:312(title)
 msgid "Example for <quote>Autoshrink</quote>"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:335(para)
+#: src/toolbox/tool-crop.xml:319(para)
 msgid "An image with a sharp limit in it and a crop rectangle."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:345(para)
+#: src/toolbox/tool-crop.xml:330(para)
 msgid ""
 "After clicking the Autoshrink button, the crop rectangle has been shrunk to "
 "fit the sharp limits."
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:355(term)
+#: src/toolbox/tool-crop.xml:340(term)
 msgid "Shrink Merged"
 msgstr ""
 
-#: src/toolbox/tool-crop.xml:357(para)
+#: src/toolbox/tool-crop.xml:342(para)
 msgid ""
 "This option works the same, with Auto Shrink or not. It uses the pixel "
 "information from all <emphasis>visible</emphasis> layers, rather than just "
 "from the active layer."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-convolve.xml:39(None)
-msgid "@@image: 'images/toolbox/toolbox-blur.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-convolve.xml:88(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-blur-22.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-convolve.xml:121(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-convolve.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-convolve.xml:18(date)
-msgid "2008-02-27"
-msgstr "2006-08-06"
-
-#: src/toolbox/tool-convolve.xml:24(phrase)
-msgid "Convolve (Blur/Sharpen)"
+#: src/toolbox/tool-convolve.xml:15(title)
+#: src/toolbox/tool-convolve.xml:18(secondary)
+#: src/toolbox/tool-convolve.xml:21(primary)
+#, fuzzy
+#| msgid "Convolve (Blur/Sharpen)"
+msgid "Blur/Sharpen"
 msgstr "ConvoluciÃ³n (desenfoque/enfoque)"
 
-#: src/toolbox/tool-convolve.xml:28(secondary)
-#: src/toolbox/tool-convolve.xml:31(primary)
-msgid "Convolve"
-msgstr ""
-
-#: src/toolbox/tool-convolve.xml:35(phrase)
-msgid "Convolve tool icon in the Toolbox"
-msgstr "La herramienta de convoluciÃ³n en la caja de herramientas"
+#: src/toolbox/tool-convolve.xml:26(phrase)
+#, fuzzy
+#| msgid "Eraser tool icon in the Toolbox"
+msgid "Blur/Sharpen tool icon in the Toolbox"
+msgstr "La goma de borrar en la caja de herramientas"
 
-#: src/toolbox/tool-convolve.xml:43(para)
-msgid ""
-"The Convolve tool uses the current brush to locally blur or sharpen your "
+#: src/toolbox/tool-convolve.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "The Convolve tool uses the current brush to locally blur or sharpen your "
+#| "image. Blurring with it can be useful if some element of your image "
+#| "stands out too much, and you would like to soften it. If you want to blur "
+#| "a whole layer, or a large part of one, you will probably be better off "
+#| "using one of the <link linkend=\"filters-blur\">Blur Filters</link>. The "
+#| "direction of a brushstroke has no effect: if you want directional "
+#| "blurring, use the Smudge tool."
+msgid ""
+"The Blur/Sharpen tool uses the current brush to locally blur or sharpen your "
 "image. Blurring with it can be useful if some element of your image stands "
 "out too much, and you would like to soften it. If you want to blur a whole "
 "layer, or a large part of one, you will probably be better off using one of "
@@ -8807,7 +8257,7 @@ msgstr ""
 "desenfoque</link>. La direcciÃ³n del trazo no afecta el resultado: si desea "
 "desenfocar con movimiento utilize la herramienta para borronear."
 
-#: src/toolbox/tool-convolve.xml:52(para)
+#: src/toolbox/tool-convolve.xml:43(para)
 msgid ""
 "In <quote>Sharpen</quote> mode, the tool works by increasing the contrast "
 "where the brush is applied. A little bit of this may be useful, but over-"
@@ -8822,7 +8272,7 @@ msgstr ""
 "para realzar, en particular el denominado mÃ¡scara de desenfoque, realizan un "
 "trabajo mucho mÃ¡s limpio para enfocar Ã¡reas de una capa."
 
-#: src/toolbox/tool-convolve.xml:60(para)
+#: src/toolbox/tool-convolve.xml:53(para)
 msgid ""
 "You can create a more sophisticated sharpening brush using the Clone tool. "
 "To do this, start by duplicating the layer you want to work on, and run a "
@@ -8843,7 +8293,7 @@ msgstr ""
 "la imagen origen. Si ahora pinta sobre la capa original combinarÃ¡ ambas "
 "imÃ¡genes, la enfocada y la desenfocada."
 
-#: src/toolbox/tool-convolve.xml:72(para)
+#: src/toolbox/tool-convolve.xml:66(para)
 msgid ""
 "Both blurring and sharpening work incrementally: moving the brush repeatedly "
 "over an area will increase the effect with each additional pass. The Rate "
@@ -8859,22 +8309,42 @@ msgstr ""
 "desenfoque producido por un trazo, aÃºn cuando se realicen muchas pasadas "
 "sobre la misma Ã¡rea."
 
-#: src/toolbox/tool-convolve.xml:84(para)
+#: src/toolbox/tool-convolve.xml:82(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"The Convolve tool can be activated from an image menu as "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</"
-"guisubmenu><guimenuitem>Convolve</guimenuitem></menuchoice>; from the "
-"Toolbox by clicking on the tool icon <placeholder-1/>; or from the keyboard "
-"using the shortcut <keycombo><keycap>Shift </keycap><keycap>U</keycap></"
-"keycombo>."
+"From the image-menu: <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint "
+"tools</guisubmenu><guimenuitem>Blur/Sharpen</guimenuitem></menuchoice>."
 msgstr ""
-"La herramienta de convoluciÃ³n puede activarse desde el menÃº de la imagen: "
 "<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
-"pintura</guisubmenu><guimenuitem>ConvoluciÃ³n</guimenuitem></menuchoice>; "
-"tambiÃ©n puede activarse clicando en el icono: <placeholder-1/>; o desde el "
-"teclado usando el atajo <keycap>V</keycap>."
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
+
+#: src/toolbox/tool-convolve.xml:91(para)
+#, fuzzy
+#| msgid ""
+#| "You can also call it by clicking the tool icon: <guiicon><placeholder-1/> "
+#| "in the Toolbox, </guiicon>"
+msgid ""
+"The Tool can also be called by clicking the tool icon: "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-blur-22.png\"/></"
+"guiicon> in the Toolbox."
+msgstr ""
+"La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/>"
+
+#: src/toolbox/tool-convolve.xml:101(para)
+#, fuzzy
+#| msgid "By using the keyboard shortcut <keycap>R</keycap>."
+msgid ""
+"By using the keyboard shortcut <keycap>Shift</keycap><keycap>U</keycap>."
+msgstr "Empleando el atajo de teclado <keycap>R</keycap>."
 
-#: src/toolbox/tool-convolve.xml:97(para)
+#: src/toolbox/tool-convolve.xml:110(para)
 msgid ""
 "See the <link linkend=\"gimp-tool-brush\">Brush Tools Overview</link> for a "
 "description of key modifiers that have the same effect on all brush tools."
@@ -8883,7 +8353,7 @@ msgstr ""
 "\">herramientas de brocha</link> para obtener informaciÃ³n sobre las opciones "
 "que se aplican a todas o a varias de estas herramientas."
 
-#: src/toolbox/tool-convolve.xml:104(para)
+#: src/toolbox/tool-convolve.xml:117(para)
 msgid ""
 "<keycap>Ctrl</keycap>: Holding down the Ctrl key toggles between Blur and "
 "Sharpen modes; it reverses the setting shown in the Tool Options."
@@ -8892,21 +8362,26 @@ msgstr ""
 "cambia entre enfoque y desenfoque, invirtiendo la opciÃ³n elegida de las "
 "opciones de herramientas."
 
-#: src/toolbox/tool-convolve.xml:117(phrase)
-msgid "Tool Options for the Convolve tool"
-msgstr "Opciones de la herramienta de convoluciÃ³n"
+#: src/toolbox/tool-convolve.xml:128(title)
+#, fuzzy
+#| msgid "Tool Options for the Eraser tool"
+msgid "Tool Options for the Blur/Sharpen tool"
+msgstr "Opciones de herramienta para la goma"
 
-#: src/toolbox/tool-convolve.xml:127(term)
+#: src/toolbox/tool-convolve.xml:141(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
+#| "edges"
 msgid ""
-"Opacity; Brush; Scale; Pressure Sensitivity; Fade Out; Apply Jitter; Hard "
-"Edges"
-msgstr ""
+"Opacity; Brush; Scale; Brush Dynamics; Fade Out; Apply Jitter; Hard Edges"
+msgstr "Opacidad"
 
-#: src/toolbox/tool-convolve.xml:136(term)
+#: src/toolbox/tool-convolve.xml:150(term)
 msgid "Convolve Type"
 msgstr "Tipo de convoluciÃ³n"
 
-#: src/toolbox/tool-convolve.xml:138(para)
+#: src/toolbox/tool-convolve.xml:152(para)
 msgid ""
 "<emphasis>Blur</emphasis> mode causes each pixel affected by the brush to be "
 "blended with neighboring pixels, thereby increasing the similarity of pixels "
@@ -8924,78 +8399,154 @@ msgstr ""
 "Ã¡rea del trazo. Puede seleccionar la opciÃ³n inversa a la escogida aquÃ \"al "
 "vuelo\", manteniendo presionada la tecla Ctrl."
 
-#: src/toolbox/tool-convolve.xml:148(para)
+#: src/toolbox/tool-convolve.xml:162(para)
 msgid "<quote>Convolve</quote> refers to a mathematical method using matrices."
 msgstr ""
 
-#: src/toolbox/tool-convolve.xml:154(term)
-#: src/toolbox/tool-brush.xml:552(term)
-#: src/toolbox/tool-airbrush.xml:124(term)
+#: src/toolbox/tool-convolve.xml:168(term)
+#: src/toolbox/tool-brush.xml:386(term)
+#: src/toolbox/tool-airbrush.xml:121(term)
 msgid "Rate"
 msgstr "Tasa"
 
-#: src/toolbox/tool-convolve.xml:156(para)
+#: src/toolbox/tool-convolve.xml:170(para)
+#, fuzzy
+#| msgid ""
+#| "The <guilabel>Rate</guilabel> slider sets the strength of the convolve "
+#| "effect."
 msgid ""
-"The <guilabel>Rate</guilabel> slider sets the strength of the convolve "
+"The <guilabel>Rate</guilabel> slider sets the strength of the Blur/Sharpen "
 "effect."
 msgstr ""
 "El deslizador <guilabel>tasa</guilabel> ajusta la intensidad del efecto de "
 "la herramienta de convoluciÃ³n."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-color-picker.xml:47(None)
+#: src/toolbox/tool-colorize.xml:14(title)
+#: src/toolbox/tool-colorize.xml:17(secondary)
+#: src/toolbox/tool-colorize.xml:21(secondary)
+#: src/toolbox/tool-colorize.xml:24(primary)
+msgid "Colorize"
+msgstr "Colorear"
+
+#: src/toolbox/tool-colorize.xml:26(para)
 msgid ""
-"@@image: 'images/toolbox/toolbox-eyedropper.png'; md5=THIS FILE DOESN'T EXIST"
+"The Colorize tool renders the active layer or selection into a greyscale "
+"image seen through a colored glass. You can use it to give a <quote> Sepia</"
+"quote> effect to your image. See <xref linkend=\"glossary-colormodel\"/> for "
+"Hue, Saturation, Luminosity."
 msgstr ""
+"La herramienta colorear convierte la capa activa o selecciÃ³n en una imagen "
+"en escala de grises vista a travÃ©s de un cristal coloreado. Mire, en <link "
+"linkend=\"glossary-colormodel\">Modo de color HSV</link>, Tono, SaturaciÃ³n y "
+"luminosisdad"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-color-picker.xml:76(None)
-#: src/toolbox/tool-color-picker.xml:167(None)
+#: src/toolbox/tool-colorize.xml:33(title)
+#, fuzzy
+msgid "Activating tool"
+msgstr ""
+"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Activar herramienta\n"
+"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Activar la herramienta\n"
+"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta\n"
+"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta\n"
+"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"ActivaciÃ³n de la herramienta"
+
+#: src/toolbox/tool-colorize.xml:34(para)
+#, fuzzy
+#| msgid "You can get to the Hue-Saturation tool in two ways :"
+msgid "You can get to the Colorize tool in two ways :"
+msgstr "Puede obtener la herramienta colorizar de dos maneras:"
+
+#: src/toolbox/tool-colorize.xml:39(para)
+#, fuzzy
+#| msgid ""
+#| "In the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Curves</"
+#| "guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
+#| "guimenu><guimenuitem>Curves</guimenuitem></menuchoice>."
 msgid ""
-"@@image: 'images/toolbox/stock-tool-color-picker-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"In the the image-menu through: <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Colorize</"
+"guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
+"guimenu><guimenuitem>Colorize</guimenuitem></menuchoice>,"
 msgstr ""
+"En el meÃº de la imagen <guimenuitem><accel>H</accel>erramientas</"
+"guimenuitem>/ <guimenuitem>Herramientas de <accel>c</accel>olor</"
+"guimenuitem>/ <guimenuitem><accel>C</accel>urvas. </guimenuitem>"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-color-picker.xml:153(None)
+#: src/toolbox/tool-colorize.xml:54(para)
+#, fuzzy
+#| msgid ""
+#| "or by clicking the tool icon: <placeholder-1/> in Toolbox, provided that "
+#| "you have installed color tools in Toolbox. For this, go to <link linkend="
+#| "\"gimp-tools-dialog\">Tools Dialog</link>."
+msgid ""
+"or by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-colorize-22.png\"/></guiicon> in Toolbox, provided that "
+"you have installed color tools in Toolbox. For this, go to <link linkend="
+"\"gimp-tools-dialog\">Tools Dialog</link>."
+msgstr ""
+"Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
+"herramientas, si ya la ha instalado. Para esto, ir a <link linkend=\"gimp-"
+"tools-dialog\">DiÃ¡logo de herramientas</link>."
+
+#: src/toolbox/tool-colorize.xml:71(title)
+msgid "Colorize options"
+msgstr "Opciones de colorear"
+
+#: src/toolbox/tool-colorize.xml:122(term)
+msgid "Select Color"
+msgstr ""
+
+#: src/toolbox/tool-colorize.xml:126(para)
 msgid ""
-"@@image: 'images/toolbox/color-picker-options.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+"<guilabel>Hue</guilabel>: The slider and the numeric text box allow you to "
+"select a hue in the HSV color circle (0 - 360)."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-color-picker.xml:258(None)
+#: src/toolbox/tool-colorize.xml:132(para)
 msgid ""
-"@@image: 'images/menus/color-picker-info.png'; md5=THIS FILE DOESN'T EXIST"
+"<guilabel>Saturation</guilabel>: The slider and the input box allows you to "
+"select a saturation: 0 through 100."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:19(date)
-msgid "2008-01-29"
+#: src/toolbox/tool-colorize.xml:138(para)
+msgid ""
+"<guilabel>Lightness</guilabel> : The slider and the text box allow you to "
+"select a value: -100 (dark) through 100 (light)."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:25(phrase)
-#: src/toolbox/tool-color-picker.xml:29(secondary)
-#: src/toolbox/tool-color-picker.xml:32(primary)
+#: src/toolbox/tool-colorize.xml:149(para)
+msgid ""
+"The Preview button makes all changes dynamically so that they can be viewed "
+"immediately."
+msgstr ""
+"La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
+"Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
+
+#: src/toolbox/tool-color-picker.xml:16(title)
+#: src/toolbox/tool-color-picker.xml:19(secondary)
+#: src/toolbox/tool-color-picker.xml:22(primary)
 msgid "Color Picker"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:35(primary)
+#: src/toolbox/tool-color-picker.xml:25(primary)
 msgid "Eye Dropper"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:39(secondary)
+#: src/toolbox/tool-color-picker.xml:29(secondary)
 msgid "Grab color"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:43(phrase)
+#: src/toolbox/tool-color-picker.xml:32(title)
 msgid "Eye dropper"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:51(para)
+#: src/toolbox/tool-color-picker.xml:39(para)
 msgid ""
 "The Color Picker Tool is used to select a color on any image opened on your "
 "screen. By clicking a point on an image, you can change the active color to "
@@ -9006,21 +8557,34 @@ msgid ""
 "<guilabel>Info window</guilabel> opens when you click on the image."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:65(para)
+#: src/toolbox/tool-color-picker.xml:51(para)
 msgid "You can get to this tool in several ways :"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:68(para)
+#: src/toolbox/tool-color-picker.xml:54(para)
+#, fuzzy
+#| msgid ""
+#| "In the image menu through <menuchoice><guimenu><accel>T</accel>ools</"
+#| "guimenu><guisubmenu><accel>P</accel>aths</guisubmenu></menuchoice>,"
 msgid ""
-"In the image menu through <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu>C<accel>o</accel>lor Picker.</guisubmenu></menuchoice>,"
+"In the image menu through <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Picker.</guisubmenu></menuchoice>,"
 msgstr ""
+"desde el menÃº de la imagen siguiendo, <menuchoice><guimenu><accel>H</"
+"accel>erramientas</guimenu><guisubmenu><accel>R</accel>utas</guisubmenu></"
+"menuchoice>"
 
-#: src/toolbox/tool-color-picker.xml:81(para)
+#: src/toolbox/tool-color-picker.xml:63(para)
+msgid ""
+"by clicking the tool icon <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-color-picker-22.png\"/></guiicon> in Toolbox,"
+msgstr ""
+
+#: src/toolbox/tool-color-picker.xml:72(para)
 msgid "by pressing the <keycap>O</keycap> keyboard shortcut,"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:86(para)
+#: src/toolbox/tool-color-picker.xml:77(para)
 msgid ""
 "by pressing the <keycap>Ctrl</keycap> key while using a paint tool. The "
 "Color-picker dialog is not opened during this operation and the tool remains "
@@ -9028,11 +8592,7 @@ msgid ""
 "using the <link linkend=\"gimp-pointer-info-dialog\">Pointer window</link>."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:104(para)
-msgid "The <keycap>o</keycap> key will activate the Color Picker tool."
-msgstr ""
-
-#: src/toolbox/tool-color-picker.xml:112(para)
+#: src/toolbox/tool-color-picker.xml:94(para)
 msgid ""
 "If the pick mode is set to <guilabel>Set foreground color</guilabel>, then "
 "pressing the <keycap>Ctrl</keycap> key switches the tool into the "
@@ -9042,33 +8602,24 @@ msgid ""
 "<guilabel>Pick only</guilabel>, the key doesn't do anything."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:127(para)
+#: src/toolbox/tool-color-picker.xml:109(para)
 msgid ""
 "By pressing the <keycap>Shift</keycap> key, the <guilabel>Color Picker "
 "Information window</guilabel> is opened when you click on a pixel."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:133(para)
+#: src/toolbox/tool-color-picker.xml:115(para)
 msgid ""
 "The <link linkend=\"gimp-pointer-info-dialog\">Pointer window</link> gives "
 "you the same information permanently. But be weary it defaults to "
 "<guilabel>Sample merged</guilabel>."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:149(phrase)
+#: src/toolbox/tool-color-picker.xml:129(title)
 msgid "Color Picker Options"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:161(para)
-#, fuzzy
-msgid ""
-"The available tool options for the Color Picker can be accessed by double "
-"clicking the Color Picker tool icon <placeholder-1/>."
-msgstr ""
-"Se puede acceder a las opciones de herramientas disponibles para recortar "
-"pulsando dos veces en el icono de la herramienta. <placeholder-1/>"
-
-#: src/toolbox/tool-color-picker.xml:177(para)
+#: src/toolbox/tool-color-picker.xml:143(para)
 msgid ""
 "The Sample Merged check-box when enabled will take color information as a "
 "composite from all the visible layers. Further information regarding Sample "
@@ -9076,7 +8627,7 @@ msgid ""
 "samplemerge\">Sample Merge</link>."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:189(para)
+#: src/toolbox/tool-color-picker.xml:155(para)
 msgid ""
 "The <guilabel>Radius</guilabel> slider adjusts the size of the square area "
 "that is used to determine an average color for the final selection. When you "
@@ -9084,189 +8635,74 @@ msgid ""
 "radius."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:198(term)
+#: src/toolbox/tool-color-picker.xml:164(term)
 msgid "Pick Mode"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:202(term)
+#: src/toolbox/tool-color-picker.xml:168(term)
 msgid "Pick Only"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:204(para)
+#: src/toolbox/tool-color-picker.xml:170(para)
 msgid ""
 "The color of the selected pixel will be shown in an Information Dialog, but "
 "not otherwise used."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:211(term)
+#: src/toolbox/tool-color-picker.xml:177(term)
 msgid "Set Foreground Color"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:213(para)
+#: src/toolbox/tool-color-picker.xml:179(para)
 msgid ""
 "The Foreground color, as shown in the Toolbox Color Area, will be set to the "
 "color of the pixel you click on."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:221(term)
+#: src/toolbox/tool-color-picker.xml:187(term)
 msgid "Set Background Color"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:223(para)
+#: src/toolbox/tool-color-picker.xml:189(para)
 msgid ""
 "The Background color, as shown in the Toolbox Color Area, will be set to the "
 "color of the pixel you click on."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:231(term)
+#: src/toolbox/tool-color-picker.xml:197(term)
 msgid "Add to Palette"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:233(para)
+#: src/toolbox/tool-color-picker.xml:199(para)
 msgid ""
 "When this option box is checked, the picked color is sent to the active "
 "color palette. see <link linkend=\"gimp-palette-editor-dialog\">Palette "
 "Editor</link>"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:244(phrase)
+#: src/toolbox/tool-color-picker.xml:209(term)
 msgid "Use info window"
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:247(para)
+#: src/toolbox/tool-color-picker.xml:211(para)
 msgid ""
 "When this option is checked, the information window is opened automatically. "
 "The <keycap>Shift</keycap> key allows you to toggle this possibility "
 "temporarily."
 msgstr ""
 
-#: src/toolbox/tool-color-picker.xml:254(phrase)
+#: src/toolbox/tool-color-picker.xml:217(title)
 msgid "Color Picker Info Window"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-colorize.xml:61(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-colorize-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-colorize.xml:79(None)
-msgid ""
-"@@image: 'images/toolbox/tools-colorize.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-colorize.xml:17(date)
-#: src/toolbox/tool-brightness-contrast.xml:16(date)
-msgid "2008-01-16"
-msgstr "2007-04-14"
-
-#: src/toolbox/tool-colorize.xml:23(phrase)
-#: src/toolbox/tool-colorize.xml:27(secondary)
-#: src/toolbox/tool-colorize.xml:31(secondary)
-#: src/toolbox/tool-colorize.xml:34(primary)
-msgid "Colorize"
-msgstr "Colorear"
-
-#: src/toolbox/tool-colorize.xml:36(para)
-msgid ""
-"The Colorize tool renders the active layer or selection into a greyscale "
-"image seen through a colored glass. You can use it to give a <quote> Sepia</"
-"quote> effect to your image. See <xref linkend=\"glossary-colormodel\"/> for "
-"Hue, Saturation, Luminosity."
-msgstr ""
-"La herramienta colorear convierte la capa activa o selecciÃ³n en una imagen "
-"en escala de grises vista a travÃ©s de un cristal coloreado. Mire, en <link "
-"linkend=\"glossary-colormodel\">Modo de color HSV</link>, Tono, SaturaciÃ³n y "
-"luminosisdad"
-
-#: src/toolbox/tool-colorize.xml:46(para)
-msgid "You can get to the Hue-Saturation tool in two ways :"
-msgstr "Puede obtener la herramienta colorizar de dos maneras:"
-
-#: src/toolbox/tool-colorize.xml:51(para)
-msgid ""
-"In the the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>C</accel>olor Tools</"
-"guisubmenu><guimenuitem>Colori <accel>z</accel>e</guimenuitem></menuchoice> "
-"or <menuchoice><guimenu>Colors</guimenu><guimenuitem>Colorize</guimenuitem></"
-"menuchoice>,"
-msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>C</accel>olor</"
-"guisubmenu><guimenuitem>Colori<accel>z</accel>ar</guimenuitem></menuchoice>"
-
-#: src/toolbox/tool-colorize.xml:59(para)
-msgid ""
-"or by clicking the tool icon: <placeholder-1/> in Toolbox, provided that you "
-"have installed color tools in Toolbox. For this, go to <link linkend=\"gimp-"
-"tools-dialog\">Tools Dialog</link>."
-msgstr ""
-"Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
-"herramientas, si ya la ha instalado. Para esto, ir a <link linkend=\"gimp-"
-"tools-dialog\">DiÃ¡logo de herramientas</link>."
-
-#: src/toolbox/tool-colorize.xml:75(phrase)
-msgid "Colorize options"
-msgstr "Opciones de colorear"
-
-#: src/toolbox/tool-colorize.xml:85(term)
-msgid "Select Color"
-msgstr ""
-
-#: src/toolbox/tool-colorize.xml:89(para)
-msgid ""
-"<guilabel>Hue</guilabel>: The slider and the numeric text box allow you to "
-"select a hue in the HSV color circle (0 - 360)."
-msgstr ""
-
-#: src/toolbox/tool-colorize.xml:95(para)
-msgid ""
-"<guilabel>Saturation</guilabel>: The slider and the input box allows you to "
-"select a saturation: 0 through 100."
-msgstr ""
-
-#: src/toolbox/tool-colorize.xml:101(para)
-msgid ""
-"<guilabel>Lightness</guilabel> : The slider and the text box allow you to "
-"select a value: -100 (dark) through 100 (light)."
-msgstr ""
-
-#: src/toolbox/tool-colorize.xml:112(para)
-msgid ""
-"The Preview button makes all changes dynamically so that they can be viewed "
-"immediately."
-msgstr ""
-"La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
-"Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-color-balance.xml:59(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-color-balance-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-color-balance.xml:77(None)
-msgid ""
-"@@image: 'images/toolbox/tools-color-balance.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-color-balance.xml:23(phrase)
-#: src/toolbox/tool-color-balance.xml:27(secondary)
-#: src/toolbox/tool-color-balance.xml:31(secondary)
-#: src/toolbox/tool-color-balance.xml:34(primary)
+#: src/toolbox/tool-color-balance.xml:14(title)
+#: src/toolbox/tool-color-balance.xml:17(secondary)
+#: src/toolbox/tool-color-balance.xml:21(secondary)
+#: src/toolbox/tool-color-balance.xml:24(primary)
 msgid "Color Balance"
 msgstr "Balance de color"
 
-#: src/toolbox/tool-color-balance.xml:36(para)
+#: src/toolbox/tool-color-balance.xml:26(para)
 msgid ""
 "The color balance tool modifies the color balance of the active selection or "
 "layer. Changes are not drastic. This tool is suitable to correct predominant "
@@ -9275,32 +8711,52 @@ msgstr ""
 "La herramienta balance de color modifica el balance de color en la selecciÃ³n "
 "o capa activa."
 
-#: src/toolbox/tool-color-balance.xml:45(para)
+#: src/toolbox/tool-color-balance.xml:33(para)
 msgid "You can get to the Color balance tool in several ways :"
 msgstr "Puede obtener la herramienta balance de color de varias maneras:"
 
-#: src/toolbox/tool-color-balance.xml:50(para)
+#: src/toolbox/tool-color-balance.xml:38(para)
+#, fuzzy
+#| msgid ""
+#| "In the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Curves</"
+#| "guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
+#| "guimenu><guimenuitem>Curves</guimenuitem></menuchoice>."
 msgid ""
-"In the the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>C</accel>olor Tools</"
-"guisubmenu><guimenuitem>Color <accel>B</accel>alance</guimenuitem></"
-"menuchoice>, or <menuchoice><guimenu>Colors</guimenu><guimenuitem>Color "
-"Balance</guimenuitem></menuchoice>"
+"In the the image-menu through: <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Color Balance</"
+"guimenuitem></menuchoice>, or <menuchoice><guimenu>Colors</"
+"guimenu><guimenuitem>Color Balance</guimenuitem></menuchoice>,"
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
-"guisubmenu><guimenuitem><accel>B</accel>alance de color</guimenuitem></"
-"menuchoice>"
+"En el meÃº de la imagen <guimenuitem><accel>H</accel>erramientas</"
+"guimenuitem>/ <guimenuitem>Herramientas de <accel>c</accel>olor</"
+"guimenuitem>/ <guimenuitem><accel>C</accel>urvas. </guimenuitem>"
 
-#: src/toolbox/tool-color-balance.xml:73(phrase)
+#: src/toolbox/tool-color-balance.xml:52(para)
+#, fuzzy
+#| msgid ""
+#| "by clicking the tool icon: <placeholder-1/> in Toolbox, provided that you "
+#| "have installed color tools in Toolbox. For this, go to <link linkend="
+#| "\"gimp-tools-dialog\">Tools Dialog</link>."
+msgid ""
+"by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-color-balance-22.png\"/></guiicon> in Toolbox, provided that you "
+"have installed color tools in Toolbox. For this, go to <link linkend=\"gimp-"
+"tools-dialog\">Tools Dialog</link>."
+msgstr ""
+"Pulsando el icono de la herramienta: <placeholder-1/> en la caja de "
+"herramientas, si ya la tiene instalada. Para esto, ir a <link linkend=\"gimp-"
+"tools-dialog\">DiÃ¡logo de herramientas</link>."
+
+#: src/toolbox/tool-color-balance.xml:69(title)
 msgid "Color Balance options"
 msgstr "Opciones de balance de color"
 
-#: src/toolbox/tool-color-balance.xml:83(term)
+#: src/toolbox/tool-color-balance.xml:120(term)
 msgid "Select range to adjust"
 msgstr "Seleccionar el rango a modificar"
 
-#: src/toolbox/tool-color-balance.xml:85(para)
+#: src/toolbox/tool-color-balance.xml:122(para)
 msgid ""
 "Selecting one of these options will restrict the range of colors which are "
 "changed with the sliders or input boxes for Shadows (darkest pixels), "
@@ -9310,11 +8766,11 @@ msgstr ""
 "modificados con los deslizadores y con las casillas de sombras, tonos medios "
 "y puntos de luz."
 
-#: src/toolbox/tool-color-balance.xml:94(term)
+#: src/toolbox/tool-color-balance.xml:131(term)
 msgid "Adjust color levels"
 msgstr "Modificar los niveles de color en el rango seleccionado"
 
-#: src/toolbox/tool-color-balance.xml:96(para)
+#: src/toolbox/tool-color-balance.xml:133(para)
 msgid ""
 "Sliders and range from the three RGB colors to their complementary colors "
 "(CMY). The zero position corresponds to the current level value of pixels in "
@@ -9323,29 +8779,29 @@ msgid ""
 msgstr ""
 "Los deslizadores y las casillas permiten seleccionar el peso del color."
 
-#: src/toolbox/tool-color-balance.xml:106(term)
+#: src/toolbox/tool-color-balance.xml:143(term)
 msgid "Reset Range"
 msgstr "Reiniciar el rango"
 
-#: src/toolbox/tool-color-balance.xml:108(para)
+#: src/toolbox/tool-color-balance.xml:145(para)
 msgid ""
 "This button sets color levels of the selected range back to the zero "
 "position (original values)."
 msgstr ""
 "Este botÃ³n configura a cero los niveles de color en el rango seleccionado."
 
-#: src/toolbox/tool-color-balance.xml:115(term)
+#: src/toolbox/tool-color-balance.xml:152(term)
 msgid "Preserve Luminosity"
 msgstr "Conservar la luminosidad"
 
-#: src/toolbox/tool-color-balance.xml:117(para)
+#: src/toolbox/tool-color-balance.xml:154(para)
 msgid ""
 "This option ensures that brightness of the active layer or selection is "
 "maintained. The Value of brightest pixels is not changed."
 msgstr ""
 "Esta opciÃ³n hace que el brillo de la capa activa o selecciÃ³n se mantenga."
 
-#: src/toolbox/tool-color-balance.xml:127(para)
+#: src/toolbox/tool-color-balance.xml:164(para)
 msgid ""
 "The Preview checkbox toggles dynamic image updating. If this option is on, "
 "any change made to the RGB levels are immediately seen on the active "
@@ -9355,89 +8811,18 @@ msgstr ""
 "Si la casilla estÃ¡ marcada, los cambios hechos en los niveles en la "
 "selecciÃ³n o capa activa se ven, inmediatamente."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:36(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-clone.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:56(None)
-msgid "@@image: 'images/toolbox/clone-bad.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:89(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-clone-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:126(None)
-msgid "@@image: 'images/toolbox/clone-cross.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:142(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-clone.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:212(None)
-msgid "@@image: 'images/toolbox/clone-source.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:223(None)
-msgid "@@image: 'images/toolbox/clone-dest.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:252(None)
-msgid "@@image: 'images/toolbox/clone-none.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:285(None)
-msgid ""
-"@@image: 'images/toolbox/clone-aligned.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:325(None)
-msgid ""
-"@@image: 'images/toolbox/clone-registered.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-clone.xml:355(None)
-msgid "@@image: 'images/toolbox/clone-fixed.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-clone.xml:21(phrase)
-#: src/toolbox/tool-clone.xml:25(secondary)
-#: src/toolbox/tool-clone.xml:28(primary)
+#: src/toolbox/tool-clone.xml:22(title)
+#: src/toolbox/tool-clone.xml:26(secondary)
+#: src/toolbox/tool-clone.xml:29(primary)
+#: src/toolbox/tool-clone.xml:182(secondary)
 msgid "Clone"
 msgstr "Herramienta para clonar"
 
-#: src/toolbox/tool-clone.xml:32(phrase)
+#: src/toolbox/tool-clone.xml:33(title)
 msgid "Clone tool icon in the Toolbox"
 msgstr "La herramienta para clonar en la caja de herramientas"
 
-#: src/toolbox/tool-clone.xml:40(para)
+#: src/toolbox/tool-clone.xml:41(para)
 msgid ""
 "The Clone tool uses the current brush to copy from an image or pattern. It "
 "has many uses: one of the most important is to repair problem areas in "
@@ -9454,14 +8839,15 @@ msgstr ""
 "en las manos de un usuario capaz es muy poderosa. Otro uso importante es el "
 "de pintar patrones de lÃneas o curvas."
 
-#: src/toolbox/tool-clone.xml:50(para)
+#: src/toolbox/tool-clone.xml:51(para)
 #, fuzzy
 msgid ""
 "If you want to clone from an image, instead of a pattern, you must tell GIMP "
-"which image you want to copy from. You do this by holding down the Ctrl key "
-"and clicking in the desired source image. Until you have set the source in "
-"this way, you will not be able to paint with the Clone tool: the tool cursor "
-"tells you this by showing <placeholder-1/>."
+"which image you want to copy from. You do this by holding down the "
+"<keycap>Ctrl</keycap> key and clicking in the desired source image. Until "
+"you have set the source in this way, you will not be able to paint with the "
+"Clone tool: the tool cursor tells you this by showing "
+"<guiicon><inlinegraphic fileref=\"images/toolbox/clone-bad.png\"/></guiicon>."
 msgstr ""
 "Si desea clonar de una imagen en vez de un patrÃ³n, debe decirle al GIMP de "
 "cuÃ¡l imagen copiar. Esto se hace manteniendo presionada la tecla Ctrl y "
@@ -9470,7 +8856,7 @@ msgstr ""
 "para clonar: el cursor le avisarÃ¡ de esto mostrando un sÃmbolo de "
 "<quote>prohibido</quote>."
 
-#: src/toolbox/tool-clone.xml:58(para)
+#: src/toolbox/tool-clone.xml:61(para)
 msgid ""
 "If you clone from a pattern, the pattern is <emphasis>tiled</emphasis>; that "
 "is, when the point you are copying from moves past one of the edges, it "
@@ -9485,7 +8871,7 @@ msgstr ""
 "cada lado. Cuando clone desde una imagen esto no sucede: al salirse de los "
 "ejes de la imagen origen la herramienta deja de producir cambios."
 
-#: src/toolbox/tool-clone.xml:66(para)
+#: src/toolbox/tool-clone.xml:69(para)
 msgid ""
 "You can clone from any drawable (that is, any layer, layer mask, or channel) "
 "to any other drawable. You can even clone to or from the selection mask, by "
@@ -9502,11 +8888,7 @@ msgstr ""
 "mÃ¡scara de capa), entonces los colores son convertidos a la mejor "
 "aproximaciÃ³n posible."
 
-#: src/toolbox/tool-clone.xml:78(para)
-msgid "You can activate the Clone tool in several ways :"
-msgstr "La herramienta para clonar puede activarse desde el menÃº de la imagen:"
-
-#: src/toolbox/tool-clone.xml:81(para)
+#: src/toolbox/tool-clone.xml:83(para)
 msgid ""
 "From the image menu through <menuchoice><guimenu>Tools</"
 "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
@@ -9515,26 +8897,76 @@ msgstr ""
 "<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
 "pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
 "puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
-"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en GIMP-"
-"2.10."
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
+
+#: src/toolbox/tool-clone.xml:93(para)
+msgid ""
+"By clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-clone-22.png\"/></guiicon> in Toolbox."
+msgstr ""
+
+#: src/toolbox/tool-clone.xml:101(para)
+#, fuzzy
+#| msgid "or by using the <keycap>B</keycap> keyboard shortcut."
+msgid "By pressing the <keycap>C</keycap> keyboard shortcut."
+msgstr "o por medio del atajo de teclado <keycap>B</keycap>."
 
-#: src/toolbox/tool-clone.xml:87(para)
+#: src/toolbox/tool-clone.xml:109(title)
 #, fuzzy
-msgid "By clicking on the tool icon <placeholder-1/> in Toolbox."
+msgid "Key modifiers (default)"
 msgstr ""
+"#-#-#-#-#  tool-airbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-align.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (predefinidas)\n"
+"#-#-#-#-#  tool-blend.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-bucket-fill.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-by-color-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por defecto)\n"
+"#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (predefinidas)\n"
+"#-#-#-#-#  tool-dodge-burn.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras\n"
+"#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-fuzzy-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por defecto)\n"
+"#-#-#-#-#  tool-heal.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
 "#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/"
-">\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-iscissors.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por defecto)\n"
+"#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por defecto)\n"
+"#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-perspective-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
+"#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (predeterminadas)\n"
+"#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (perdefinidas)\n"
+"#-#-#-#-#  tool-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Teclas modificadoras (por omisiÃ³n)\n"
 "#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"TambiÃ©n puede activarse clicando en el icono: <placeholder-1/>"
-
-#: src/toolbox/tool-clone.xml:93(para)
-msgid "By pressing the <keycap>c</keycap> keyboard shortcut."
-msgstr ""
+"Teclas modificadoras (por omisiÃ³n)"
 
-#: src/toolbox/tool-clone.xml:103(para)
+#: src/toolbox/tool-clone.xml:110(para)
+#, fuzzy
+#| msgid ""
+#| "See the <link linkend=\"gimp-tools-brush-modifiers\">brush tools key "
+#| "modifiers</link> for a description of key modifiers that have the same "
+#| "effect on all brush tools."
 msgid ""
-"See the <link linkend=\"gimp-tools-brush-modifiers\">brush tools key "
+"See the <link linkend=\"gimp-tools-brush-modifiers\">Brush tools key "
 "modifiers</link> for a description of key modifiers that have the same "
 "effect on all brush tools."
 msgstr ""
@@ -9542,18 +8974,20 @@ msgstr ""
 "\">herramientas de brocha</link> para obtener informaciÃ³n sobre las opciones "
 "que se aplican a todas o a varias de estas herramientas."
 
-#: src/toolbox/tool-clone.xml:114(para)
+#: src/toolbox/tool-clone.xml:122(para)
 #, fuzzy
 msgid ""
-"The Ctrl key is used to select the source, if you are cloning from an image: "
-"it has no effect if you are cloning from a pattern. You can clone from any "
-"layer of any image, by clicking on the image display, with the Ctrl key held "
-"down, while the layer is active (as shown in the Layers dialog). If "
-"Alignment is set to <quote>None</quote>, <quote>Aligned</quote>, or "
-"<quote>Fixed</quote> in tool options, then the point you click on becomes "
-"the origin for cloning: the image data at that point will be used when you "
-"first begin painting with the Clone tool. In source-selection mode, the "
-"cursor changes to a reticle cross symbol <placeholder-1/>."
+"The <keycap>Ctrl</keycap> key is used to select the source, if you are "
+"cloning from an image: it has no effect if you are cloning from a pattern. "
+"You can clone from any layer of any image, by clicking on the image display, "
+"with the <keycap>Ctrl</keycap> key held down, while the layer is active (as "
+"shown in the Layers dialog). If Alignment is set to <guilabel>None</"
+"guilabel>, <guilabel>Aligned</guilabel>, or <keycap>Fixed</keycap> in tool "
+"options, then the point you click on becomes the origin for cloning: the "
+"image data at that point will be used when you first begin painting with the "
+"Clone tool. In source-selection mode, the cursor changes to a reticle cross "
+"symbol <guiicon><inlinegraphic fileref=\"images/toolbox/clone-cross.png\"/></"
+"guiicon>."
 msgstr ""
 "La tecla Ctrl se utiliza para seleccionar el origen si se clona desde una "
 "imagen. No tiene efecto si se clona desde un patrÃ³n. Puede clonar desde "
@@ -9565,45 +8999,73 @@ msgstr ""
 "punto serÃ¡n usados cuando comience a pintar con la herramienta para clonar. "
 "En el modo de selecciÃ³n del origen el sÃmbolo del cursor cambia a una cruz."
 
-#: src/toolbox/tool-clone.xml:138(phrase)
+#: src/toolbox/tool-clone.xml:147(title)
 msgid "Tool Options for the Clone tool"
 msgstr "Opciones de la herramienta para clonar"
 
-#: src/toolbox/tool-clone.xml:157(term)
+#: src/toolbox/tool-clone.xml:169(term)
+#, fuzzy
+#| msgid ""
+#| "Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply Jitter, Hard "
+#| "edges"
+msgid ""
+"Mode; Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply Jitter; Hard "
+"Edges"
+msgstr "Opacidad"
+
+#: src/toolbox/tool-clone.xml:178(term)
 msgid "Source"
 msgstr "Origen"
 
-#: src/toolbox/tool-clone.xml:160(primary)
-#: src/toolbox/toolbox-color-area.xml:109(primary)
-msgid "Patterns"
-msgstr ""
-
-#: src/toolbox/tool-clone.xml:161(secondary)
-msgid "Pattern as a source to clone"
-msgstr ""
-
-#: src/toolbox/tool-clone.xml:163(para)
+#: src/toolbox/tool-clone.xml:184(para)
 msgid ""
 "The choice you make here determines whether data will be copied from the "
 "pattern shown above, or from one of the images you have open."
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:172(para)
+#: src/toolbox/tool-clone.xml:193(para)
+#, fuzzy
+#| msgid ""
+#| "If you choose <quote>Image source</quote>, you must tell GIMP which layer "
+#| "to use as the source, by Ctrl-clicking on it, before you can paint with "
+#| "the tool."
 msgid ""
-"If you choose <quote>Image source</quote>, you must tell GIMP which layer to "
-"use as the source, by Ctrl-clicking on it, before you can paint with the "
-"tool."
+"If you choose <guilabel>Image source</guilabel>, you must tell "
+"<acronym>GIMP</acronym> which layer to use as the source, by <keycap>Ctrl</"
+"keycap>-clicking on it, before you can paint with the tool."
 msgstr ""
 "La elecciÃ³n que haga aquÃ determina si los datos serÃ¡n copiados desde el "
 "patrÃ³n descrito arriba, o desde una de las imÃ¡genes que se encuentren "
 "abiertas. Si escoge <quote>imagen origen</quote>, le debe decir al GIMP cuÃ¡l "
 "capa se tomarÃ¡ como origen, efectuando Ctrl-clic en la misma."
 
-#: src/toolbox/tool-clone.xml:180(term)
+#: src/toolbox/tool-clone.xml:199(para)
+#, fuzzy
+#| msgid ""
+#| "If <guilabel>Sample Merged</guilabel> is also enabled, then Auto Shrink "
+#| "will use the pixel information from the visible display of the image, "
+#| "rather than just from the active layer. For further information regarding "
+#| "Sample Merge, see the glossary entry <link linkend=\"glossary-samplemerge"
+#| "\">Sample Merge</link>."
+msgid ""
+"If you check <guilabel>Sample merged</guilabel> it's what you <quote>see</"
+"quote> (color made with all the layers of a multi-layer image) that's "
+"cloned. If it's unchecked, only the selected layer is cloned. For more "
+"information see the glossary entry <link linkend=\"glossary-samplemerge"
+"\">Sample Merge</link>."
+msgstr ""
+"Si ademÃ¡s se encuentra activa la opciÃ³n <guilabel>Muestra combinada</"
+"guilabel>, al encogerse la selecciÃ³n automÃ¡ticamente se tendrÃ¡ en cuenta la "
+"informaciÃ³n de los pÃxeles visibles de toda la imagen, en lugar de "
+"considerarse sÃ³lo la informaciÃ³n de la capa activa. Para mayor informaciÃ³n "
+"sobre la muestra combinada, dirÃjase a la entrada del glosario <link linkend="
+"\"glossary-samplemerge\">Muestra combinada</link>."
+
+#: src/toolbox/tool-clone.xml:210(term)
 msgid "Pattern"
 msgstr "PatrÃ³n"
 
-#: src/toolbox/tool-clone.xml:182(para)
+#: src/toolbox/tool-clone.xml:212(para)
 msgid ""
 "Clicking on the pattern symbol brings up the Patterns dialog, which you can "
 "use to select the pattern to paint with. This option is only relevant if you "
@@ -9613,7 +9075,7 @@ msgstr ""
 "cual puede seleccionar el patrÃ³n a pintar. Esta opciÃ³n sÃ³lo es relevante si "
 "desea clonar utilizando un patrÃ³n como origen."
 
-#: src/toolbox/tool-clone.xml:196(para)
+#: src/toolbox/tool-clone.xml:226(para)
 msgid ""
 "The Alignment mode defines the relation between the brush position and the "
 "source position."
@@ -9621,7 +9083,7 @@ msgstr ""
 "El modo de alineaciÃ³n determina la manera en que la posiciÃ³n origen se "
 "desfaza para cada trazo de brocha."
 
-#: src/toolbox/tool-clone.xml:200(para)
+#: src/toolbox/tool-clone.xml:230(para)
 msgid ""
 "In the following examples, we will use a source image where the sample to be "
 "cloned will be taken, and a destination image where the sample will be "
@@ -9631,32 +9093,23 @@ msgstr ""
 "cursor del mouse se muestra como un rectÃ¡ngulo rojo, y el punto de origen "
 "como una cruz negra."
 
-#: src/toolbox/tool-clone.xml:208(phrase)
+#: src/toolbox/tool-clone.xml:237(title)
 msgid "Original images for clone alignment"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:215(para)
+#: src/toolbox/tool-clone.xml:244(para)
 msgid ""
 "We will use the largest brush with the Pencil tool. The source is "
 "represented here with a ringed cross."
 msgstr "No alineado"
 
-#: src/toolbox/tool-clone.xml:226(para)
+#: src/toolbox/tool-clone.xml:256(para)
 msgid ""
 "An image with a solid background only. We shall draw three cloning strokes "
 "successively."
 msgstr "Alineado"
 
-#: src/toolbox/tool-clone.xml:235(term) src/toolbox/tool-brush.xml:727(para)
-#, fuzzy
-msgid "None"
-msgstr ""
-"#-#-#-#-#  tool-brush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Ninguno\n"
-"#-#-#-#-#  tool-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"No alineado"
-
-#: src/toolbox/tool-clone.xml:237(para)
+#: src/toolbox/tool-clone.xml:267(para)
 msgid ""
 "In this mode, each brushstroke is treated separately. For each stroke, the "
 "point where you first click is copied from the source origin; there is no "
@@ -9668,21 +9121,21 @@ msgstr ""
 "origen. No hay relaciÃ³n entre un trazo y otro. En este modo la imagen "
 "pintada puede cortarse si los trazos se intersectan."
 
-#: src/toolbox/tool-clone.xml:247(phrase)
-msgid "<quote>None</quote> clone alignment"
+#: src/toolbox/tool-clone.xml:275(para)
+msgid ""
+"Example below: At every new brush stroke, the source goes back to its first "
+"position. The same sample is always cloned."
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:255(para)
-msgid ""
-"At every new brush stroke, the source goes back to its first position. The "
-"same sample is always cloned."
+#: src/toolbox/tool-clone.xml:281(title)
+msgid "<quote>None</quote> clone alignment"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:265(term)
+#: src/toolbox/tool-clone.xml:292(term)
 msgid "Aligned"
 msgstr "Alineado"
 
-#: src/toolbox/tool-clone.xml:267(para)
+#: src/toolbox/tool-clone.xml:294(para)
 msgid ""
 "In this mode, the first click you make when painting sets the offset between "
 "the source origin and the cloned result, and all subsequent brushstrokes use "
@@ -9694,7 +9147,7 @@ msgstr ""
 "brocha subsecuentes usarÃ¡n el mismo desface. Con esto puede efectuar los "
 "trazos que desee, y Ã©stos se unirÃ¡n suavemente unos con otros."
 
-#: src/toolbox/tool-clone.xml:274(para)
+#: src/toolbox/tool-clone.xml:301(para)
 msgid ""
 "If you want to change the offset, select a new source origin by clicking "
 "with the <keycap>Ctrl</keycap> key pressed."
@@ -9703,23 +9156,23 @@ msgstr ""
 "luego pinte un trazo, y vuelva al modo alineado. Los trazos subsecuentes "
 "usarÃ¡n el mismo desface que el primer trazo que efectÃºe."
 
-#: src/toolbox/tool-clone.xml:280(phrase)
-msgid "<quote>Aligned</quote> clone alignment"
+#: src/toolbox/tool-clone.xml:305(para)
+msgid ""
+"In the example below, at every new brush stroke, the source keeps the same "
+"offset it had with the previous brush stroke. So, there is no cloning offset "
+"for the first brush stroke. Here, for the following strokes, the source ends "
+"up out of the source image canvas; hence the truncated aspect."
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:288(para)
-msgid ""
-"At every new brush stroke, the source keeps the same offset it had with the "
-"previous brush stroke. So, there is no cloning offset for the first brush "
-"stroke. Here, for the following strokes, the source ends up out of the "
-"source image canvas; hence the truncated aspect."
+#: src/toolbox/tool-clone.xml:313(title)
+msgid "<quote>Aligned</quote> clone alignment"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:302(term)
+#: src/toolbox/tool-clone.xml:324(term)
 msgid "Registered"
 msgstr "Registrado"
 
-#: src/toolbox/tool-clone.xml:304(para)
+#: src/toolbox/tool-clone.xml:326(para)
 msgid ""
 "The <quote>Registered</quote> mode is different from the other alignment "
 "modes. When you copy from an image, a Ctrl-click will register a source "
@@ -9735,46 +9188,39 @@ msgstr ""
 "los ejes izquierdo o superior del patrÃ³n se alineen precisamente con los "
 "ejes correspondientes a la capa objetivo."
 
-#: src/toolbox/tool-clone.xml:314(para)
+#: src/toolbox/tool-clone.xml:336(para)
 msgid ""
-"When you selected a pattern as source, imagine a new layer filled with this "
-"pattern as the registered source layer."
+"At every brush stroke, the source adopts the position of the mouse pointer "
+"in the destination layer. In the following example, the destination layer is "
+"smaller than the source layer; so, there is no truncated aspect."
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:320(phrase)
+#: src/toolbox/tool-clone.xml:343(title)
 msgid "<quote>Registered</quote> clone alignment"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:328(para)
-msgid ""
-"At every brush stroke, the source adopts the position of the mouse pointer "
-"in the destination layer. Here, the destination layer is smaller than the "
-"source layer; so, there is no truncated aspect."
-msgstr ""
-
-#: src/toolbox/tool-clone.xml:342(para)
+#: src/toolbox/tool-clone.xml:358(para)
 msgid ""
 "Using this mode you will paint with the source origin, unlike the modes "
 "<guilabel>None</guilabel> or <guilabel>Aligned</guilabel> even when drawing "
 "a line. The source will not be moved."
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:350(phrase)
-msgid "<quote>Fixed</quote> clone alignment"
+#: src/toolbox/tool-clone.xml:364(para)
+msgid ""
+"See that the source remains fixed. The same small sample is reproduced "
+"identically in a tightened way:"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:358(para)
-msgid ""
-"The source remains fixed. The same small sample is reproduced identically in "
-"a tightened way."
+#: src/toolbox/tool-clone.xml:369(title)
+msgid "<quote>Fixed</quote> clone alignment"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:374(phrase)
-#: src/toolbox/tool-brush.xml:767(phrase)
+#: src/toolbox/tool-clone.xml:386(title) src/toolbox/tool-brush.xml:842(title)
 msgid "Further Information"
 msgstr "InformaciÃ³n complementaria"
 
-#: src/toolbox/tool-clone.xml:380(para)
+#: src/toolbox/tool-clone.xml:391(para)
 msgid ""
 "The effects of the Clone tool on transparency are a bit complicated. You "
 "cannot clone transparency: if you try to clone from a transparent source, "
@@ -9788,23 +9234,23 @@ msgstr ""
 "desde un origen traslÃºcido, el efecto serÃ¡ determinado por la opacidad del "
 "orÃgen. AsÃ que asumiendo una opacidad del 100% y una brocha dura:"
 
-#: src/toolbox/tool-clone.xml:390(para)
+#: src/toolbox/tool-clone.xml:401(para)
 msgid "Cloning translucent black onto white produces gray."
 msgstr "Clonar un negro traslÃºcido sobre blanco produce gris."
 
-#: src/toolbox/tool-clone.xml:395(para)
+#: src/toolbox/tool-clone.xml:406(para)
 msgid "Cloning translucent black onto black produces black."
 msgstr "Clonar un negro traslÃºcido sobre negro produce negro."
 
-#: src/toolbox/tool-clone.xml:400(para)
+#: src/toolbox/tool-clone.xml:411(para)
 msgid "Cloning translucent white onto white produces white."
 msgstr "Clonar un blanco traslÃºcido sobre blanco produce blanco."
 
-#: src/toolbox/tool-clone.xml:405(para)
+#: src/toolbox/tool-clone.xml:416(para)
 msgid "Cloning translucent white onto black produces gray."
 msgstr "Clonar un blanco traslÃºcido sobre negro produce gris."
 
-#: src/toolbox/tool-clone.xml:410(para)
+#: src/toolbox/tool-clone.xml:421(para)
 msgid ""
 "Cloning can never increase transparency, but, unless <quote>keep "
 "transparency</quote> is turned on for the layer, it can reduce it. Cloning "
@@ -9816,22 +9262,38 @@ msgstr ""
 "opaca sobre un Ã¡rea traslÃºcida produce un resultado opaco. Y clonar un Ã¡rea "
 "traslÃºcida sobre otra Ã¡rea traslÃºcida causa un incremento en la opacidad."
 
-#: src/toolbox/tool-clone.xml:421(term)
+#: src/toolbox/tool-clone.xml:432(term)
 msgid "<quote>Filter</quote> brushes"
 msgstr "Brochas \"filtro\""
 
-#: src/toolbox/tool-clone.xml:423(para)
-msgid ""
-"<indexterm><primary>Brushes</primary><secondary><quote>Filter</quote> "
-"brushes</secondary></indexterm> There are a few non-obvious ways to use the "
-"Clone tool to obtain powerful effects. One thing you can do is to create "
-"<quote>Filter brushes</quote>, that is, create the effect of applying a "
-"filter with a brush. To do this, duplicate the layer you want to work on, "
-"and apply the filter to the copy. Then activate the Clone tool, setting "
-"Source to <quote>Image source</quote> and Alignment to <quote>Registered</"
-"quote>. Ctrl-click on the filtered layer to set it as the source, and paint "
-"on the original layer: you will then in effect be painting the filtered "
-"image data onto the original layer."
+#: src/toolbox/tool-clone.xml:436(secondary)
+#, fuzzy
+#| msgid "History brush"
+msgid "Filter brush"
+msgstr "Brocha historial"
+
+#: src/toolbox/tool-clone.xml:438(para)
+#, fuzzy
+#| msgid ""
+#| "<indexterm><primary>Brushes</primary><secondary><quote>Filter</quote> "
+#| "brushes</secondary></indexterm> There are a few non-obvious ways to use "
+#| "the Clone tool to obtain powerful effects. One thing you can do is to "
+#| "create <quote>Filter brushes</quote>, that is, create the effect of "
+#| "applying a filter with a brush. To do this, duplicate the layer you want "
+#| "to work on, and apply the filter to the copy. Then activate the Clone "
+#| "tool, setting Source to <quote>Image source</quote> and Alignment to "
+#| "<quote>Registered</quote>. Ctrl-click on the filtered layer to set it as "
+#| "the source, and paint on the original layer: you will then in effect be "
+#| "painting the filtered image data onto the original layer."
+msgid ""
+"There are a few non-obvious ways to use the Clone tool to obtain powerful "
+"effects. One thing you can do is to create <quote>Filter brushes</quote>, "
+"that is, create the effect of applying a filter with a brush. To do this, "
+"duplicate the layer you want to work on, and apply the filter to the copy. "
+"Then activate the Clone tool, setting Source to <quote>Image source</quote> "
+"and Alignment to <quote>Registered</quote>. Ctrl-click on the filtered layer "
+"to set it as the source, and paint on the original layer: you will then in "
+"effect be painting the filtered image data onto the original layer."
 msgstr ""
 "<indexterm><primary>Brochas</primary><secondary>Brochas \"filtro\"</"
 "secondary></indexterm> Hay unas pocas formas no tan obvias de utilizar esta "
@@ -9844,24 +9306,39 @@ msgstr ""
 "original. Con esto estarÃ¡ pintando los datos de la imagen filtrada sobre la "
 "capa original."
 
-#: src/toolbox/tool-clone.xml:438(term)
+#: src/toolbox/tool-clone.xml:453(term)
+#: src/toolbox/tool-clone.xml:457(secondary)
 msgid "History brush"
 msgstr "Brocha historial"
 
-#: src/toolbox/tool-clone.xml:440(para)
-msgid ""
-"<indexterm><primary>Brushes</primary><secondary>History brush</secondary></"
-"indexterm> You can use a similar approach to imitate Photoshop's "
-"<quote>History brush</quote>, which allows you to selectively undo or redo "
-"changes using a brush. To do this, start by duplicating the image; then, in "
-"the original, go back to the desired state in the image's history, either by "
-"undoing or by using the Undo History dialog. (This must be done in the "
-"original, not the copy, because duplicating an image does not duplicate the "
-"Undo history.) Now activate the Clone tool, setting Source to <quote>Image "
-"source</quote> and Alignment to <quote>Registered</quote>. Ctrl-click on a "
-"layer from one image, and paint on the corresponding layer from the other "
-"image. Depending on how you do it, this gives you either an <quote>undo "
-"brush</quote> or a <quote>redo brush</quote>."
+#: src/toolbox/tool-clone.xml:459(para)
+#, fuzzy
+#| msgid ""
+#| "<indexterm><primary>Brushes</primary><secondary>History brush</"
+#| "secondary></indexterm> You can use a similar approach to imitate "
+#| "Photoshop's <quote>History brush</quote>, which allows you to selectively "
+#| "undo or redo changes using a brush. To do this, start by duplicating the "
+#| "image; then, in the original, go back to the desired state in the image's "
+#| "history, either by undoing or by using the Undo History dialog. (This "
+#| "must be done in the original, not the copy, because duplicating an image "
+#| "does not duplicate the Undo history.) Now activate the Clone tool, "
+#| "setting Source to <quote>Image source</quote> and Alignment to "
+#| "<quote>Registered</quote>. Ctrl-click on a layer from one image, and "
+#| "paint on the corresponding layer from the other image. Depending on how "
+#| "you do it, this gives you either an <quote>undo brush</quote> or a "
+#| "<quote>redo brush</quote>."
+msgid ""
+"You can use a similar approach to imitate Photoshop's <quote>History brush</"
+"quote>, which allows you to selectively undo or redo changes using a brush. "
+"To do this, start by duplicating the image; then, in the original, go back "
+"to the desired state in the image's history, either by undoing or by using "
+"the Undo History dialog. (This must be done in the original, not the copy, "
+"because duplicating an image does not duplicate the Undo history.) Now "
+"activate the Clone tool, setting Source to <quote>Image source</quote> and "
+"Alignment to <quote>Registered</quote>. Ctrl-click on a layer from one "
+"image, and paint on the corresponding layer from the other image. Depending "
+"on how you do it, this gives you either an <quote>undo brush</quote> or a "
+"<quote>redo brush</quote>."
 msgstr ""
 "<indexterm><primary>Brochas</primary><secondary>Brocha historial</"
 "secondary></indexterm> Puede utilizar un mÃ©todo parecido para imitar la "
@@ -9877,52 +9354,21 @@ msgstr ""
 "sentido en que lo haga, tendrÃ¡ una \"brocha de deshacer\" o una \"brocha de "
 "rehacer\"."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-by-color-select.xml:45(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-selbycolor.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-by-color-select.xml:68(None)
-#: src/toolbox/tool-by-color-select.xml:128(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-by-color-select-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-by-color-select.xml:96(None)
-msgid ""
-"@@image: 'images/toolbox/by-color-selection.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-by-color-select.xml:122(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-selbycolor.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-by-color-select.xml:25(phrase)
+#: src/toolbox/tool-by-color-select.xml:15(title)
 msgid "Select By Color"
 msgstr "Herramienta Seleccionar por color"
 
-#: src/toolbox/tool-by-color-select.xml:29(secondary)
-#: src/toolbox/tool-by-color-select.xml:33(secondary)
-#: src/toolbox/tool-by-color-select.xml:37(secondary)
+#: src/toolbox/tool-by-color-select.xml:18(secondary)
+#: src/toolbox/tool-by-color-select.xml:22(secondary)
+#: src/toolbox/tool-by-color-select.xml:26(secondary)
 msgid "Selection by color"
 msgstr ""
 
-#: src/toolbox/tool-by-color-select.xml:41(phrase)
+#: src/toolbox/tool-by-color-select.xml:30(title)
 msgid "Select by Color tool icon in the Toolbox"
 msgstr "La herramienta Seleccionar por color en la caja de herramientas"
 
-#: src/toolbox/tool-by-color-select.xml:49(para)
+#: src/toolbox/tool-by-color-select.xml:38(para)
 msgid ""
 "The Select by Color tool is designed to select areas of an image based on "
 "color similarity. It works a lot like the Fuzzy Select tool (<quote>Magic "
@@ -9941,24 +9387,46 @@ msgstr ""
 "este Ãºltimo. AdemÃ¡s, la acciÃ³n de arrastrar el puntero luego de haber "
 "clicado no tiene efecto en esta herramienta."
 
-#: src/toolbox/tool-by-color-select.xml:63(para)
+#: src/toolbox/tool-by-color-select.xml:51(para)
+#, fuzzy
+#| msgid "You can access to the Selection Tool in different ways:"
+msgid "You can access to the Select by Color Tool in different ways:"
+msgstr "Puede acceder a esta herramienta de selecciÃ³n de varias maneras:"
+
+#: src/toolbox/tool-by-color-select.xml:56(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu bar <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>Rect Select</"
+#| "guimenuitem></menuchoice>;"
 msgid ""
-"You can activate the Select By Color Tool from an image menu through "
-"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
-"guisubmenu><guimenuitem>Select by Color</guimenuitem></menuchoice>; from the "
-"Toolbox by clicking on the <placeholder-1/> tool icon; or from the keyboard "
-"by using the <keycombo><keycap>Shift </keycap><keycap>O</keycap></keycombo> "
-"shortcut"
+"From the image menu bar <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Selection Tools</guisubmenu><guimenuitem>By Color "
+"Select</guimenuitem></menuchoice>,"
 msgstr ""
-"La herramienta \"Seleccionar por color\" puede ser activada desde el menÃº de "
-"la imagen siguiendo <menuchoice><guimenu>Herramientas</"
+"Desde el menÃº de la imagen <menuchoice><guimenu>Herramientas</"
 "guimenu><guisubmenu>Herramientas de selecciÃ³n</"
-"guisubmenu><guimenuitem>Seleccionar por color</guimenuitem></menuchoice>; o "
-"desde la caja de herramientas haciendo clic sobre su icono <placeholder-1/>; "
-"o por medio del atajo de teclado <keycombo><keycap>Shift </"
-"keycap><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>"
+"guisubmenu><guimenuitem>SelecciÃ³n rectangular</guimenuitem></menuchoice>."
+
+#: src/toolbox/tool-by-color-select.xml:66(para)
+msgid ""
+"by clicking on the tool icon <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-by-color-select-22.png\"/></guiicon> in the ToolBox,"
+msgstr ""
 
-#: src/toolbox/tool-by-color-select.xml:77(para)
+#: src/toolbox/tool-by-color-select.xml:75(para)
+#, fuzzy
+#| msgid ""
+#| "or by using the <keycombo><keycap>Shift</keycap><keycap>S</keycap></"
+#| "keycombo> key combination."
+msgid ""
+"by using the keyboard shortcut <keycombo><keycap>Shift </keycap><keycap>O</"
+"keycap></keycombo>."
+msgstr ""
+"o usando la combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>S</"
+"keycap></keycombo>."
+
+#: src/toolbox/tool-by-color-select.xml:85(para)
 msgid ""
 "The select by color tool does not have any special key modifiers, only the "
 "ones that affect all selection tools in the same way. See <link linkend="
@@ -9969,37 +9437,25 @@ msgstr ""
 "<link linkend=\"gimp-tool-select\">Herramientas de selecciÃ³n</link> para "
 "saber de Ã©stos."
 
-#: src/toolbox/tool-by-color-select.xml:86(phrase)
+#: src/toolbox/tool-by-color-select.xml:94(title)
 msgid "Handling tool"
 msgstr ""
 
-#: src/toolbox/tool-by-color-select.xml:90(phrase)
+#: src/toolbox/tool-by-color-select.xml:96(title)
 msgid "Using Select by Color tool: selected pixels are not only contiguous"
 msgstr ""
 
-#: src/toolbox/tool-by-color-select.xml:100(para)
+#: src/toolbox/tool-by-color-select.xml:105(para)
 msgid ""
 "As with fuzzy tool, the selection starts as soon as you click and the "
 "reference is the first clicked pixel. If you click and drag, you can change "
 "the threshold by the same way as with the fuzzy tool."
 msgstr ""
 
-#: src/toolbox/tool-by-color-select.xml:118(phrase)
+#: src/toolbox/tool-by-color-select.xml:121(title)
 msgid "Tool Options for the Select by Color tool"
 msgstr "Opciones para la herramienta"
 
-#: src/toolbox/tool-by-color-select.xml:126(para)
-msgid ""
-"You can find the Magic Wand options by double-clicking on the <placeholder-1/"
-"> icon in the Toolbox."
-msgstr ""
-"Puede hallar las opciones de la varita mÃ¡gica haciendo doble clic sobre el "
-"icono <placeholder-1/> de la caja de herramientas."
-
-#: src/toolbox/tool-by-color-select.xml:134(term)
-msgid "Modus; Antialias; Feather edges"
-msgstr ""
-
 #: src/toolbox/tool-by-color-select.xml:142(term)
 msgid "Similar colors"
 msgstr ""
@@ -10011,81 +9467,17 @@ msgid ""
 "> details."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:39(None)
-msgid "@@image: 'images/toolbox/toolbox-fill.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:89(None)
-#: src/toolbox/tool-bucket-fill.xml:135(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-bucket-fill-22.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:128(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-fill.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:321(None)
-msgid "@@image: 'images/toolbox/fill-by-0.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:329(None)
-msgid "@@image: 'images/toolbox/fill-by-1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:337(None)
-msgid "@@image: 'images/toolbox/fill-by-2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:345(None)
-msgid "@@image: 'images/toolbox/fill-by-3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:375(None)
-msgid ""
-"@@image: 'images/toolbox/fill-feathered-1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-bucket-fill.xml:383(None)
-msgid ""
-"@@image: 'images/toolbox/fill-feathered-2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-bucket-fill.xml:18(date)
-msgid "2008-02-20"
-msgstr ""
-
-#: src/toolbox/tool-bucket-fill.xml:24(phrase)
-#: src/toolbox/tool-bucket-fill.xml:28(secondary)
-#: src/toolbox/tool-bucket-fill.xml:31(primary)
+#: src/toolbox/tool-bucket-fill.xml:15(title)
+#: src/toolbox/tool-bucket-fill.xml:18(secondary)
+#: src/toolbox/tool-bucket-fill.xml:21(primary)
 msgid "Bucket Fill"
 msgstr "Relleno de cubeta"
 
-#: src/toolbox/tool-bucket-fill.xml:35(phrase)
+#: src/toolbox/tool-bucket-fill.xml:25(title)
 msgid "Toolbox Fill"
 msgstr "La herramienta de relleno en la caja de herramientas"
 
-#: src/toolbox/tool-bucket-fill.xml:43(para)
+#: src/toolbox/tool-bucket-fill.xml:33(para)
 msgid ""
 "This tool fills a selection with the current foreground color. If you Ctrl"
 "+click and use the Bucket tool, it will use the background color instead. "
@@ -10101,7 +9493,7 @@ msgstr ""
 "color cercano al del punto en donde haga clic. Las opciones tambiÃ©n afectan "
 "la forma en que la transparencia es tratada."
 
-#: src/toolbox/tool-bucket-fill.xml:51(para)
+#: src/toolbox/tool-bucket-fill.xml:41(para)
 msgid ""
 "The amount of fill depends on what Fill Threshold you have specified. The "
 "fill threshold determines how far the fill will spread (similar to the way "
@@ -10115,7 +9507,7 @@ msgstr ""
 "que se hace clic y se esparce hasta que el valor del color o del alfa se "
 "vuelve <quote>demasiado diferente</quote>."
 
-#: src/toolbox/tool-bucket-fill.xml:58(para)
+#: src/toolbox/tool-bucket-fill.xml:48(para)
 msgid ""
 "When you fill objects in a transparent layer (such as letters in a text "
 "layer) with a different color than before, you may find that a border of the "
@@ -10137,7 +9529,7 @@ msgstr ""
 "opacas de la capa serÃ¡n rellenadas, y si no utiliza el comando Seleccionar "
 "todos, sÃ³lo la <quote>isla opaca</quote> en la que haga clic serÃ¡ rellenada."
 
-#: src/toolbox/tool-bucket-fill.xml:66(para)
+#: src/toolbox/tool-bucket-fill.xml:56(para)
 msgid ""
 "If you want to fill areas that are totally transparent, you have to make "
 "sure that the <quote>Lock</quote> option (in the Layers dialog) is "
@@ -10145,43 +9537,47 @@ msgid ""
 "layer will be filled."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:74(phrase)
-msgid "Activate tool"
-msgstr "ActivaciÃ³n de la herramienta"
-
-#: src/toolbox/tool-bucket-fill.xml:78(para)
+#: src/toolbox/tool-bucket-fill.xml:67(para)
+#, fuzzy
+#| msgid ""
+#| "You can access this tool from the image-menu through: "
+#| "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</"
+#| "guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>."
 msgid ""
 "You can find the Bucket Fill tool from the image-menu through: "
-"<guimenuitem><accel>T</accel>ools</guimenuitem>/ <guimenuitem><accel>P</"
-"accel>aint Tools</guimenuitem>/<guimenuitem><accel>B</accel>ucket Fill.</"
-"guimenuitem>"
+"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</"
+"guisubmenu><guimenuitem>Bucket Fill</guimenuitem></menuchoice>"
 msgstr ""
-"El relleno de cubeta puede ser activado siguiendo el menÃº de imagen en el "
-"siguiente orden: <guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
-"<guimenuitem>Herramientas de <accel>p</accel>intura</guimenuitem>/"
-"<guimenuitem><accel>R</accel>elleno.</guimenuitem>"
+"En el menÃº de la imagen: <menuchoice><guimenu>Herramientas</"
+"guimenu><guisubmenu>Herramientas de transformaciÃ³n</"
+"guisubmenu><guimenuitem>Recortar y redimensionar</guimenuitem></menuchoice>."
 
-#: src/toolbox/tool-bucket-fill.xml:87(para)
+#: src/toolbox/tool-bucket-fill.xml:77(para)
+#, fuzzy
+#| msgid ""
+#| "You can also call it by clicking the tool icon: <guiicon><placeholder-1/> "
+#| "in the Toolbox, </guiicon>"
 msgid ""
-"You can also call it by clicking the tool icon: <guiicon><placeholder-1/> in "
-"the Toolbox, </guiicon>"
+"You can also call it by clicking the tool icon: <guiicon><inlinegraphic "
+"fileref=\"images/toolbox/stock-tool-bucket-fill-22.png\"/></guiicon> in the "
+"toolbox."
 msgstr ""
 "La herramienta tambiÃ©n puede activarse clicando en el Ãcono: <placeholder-1/>"
 
-#: src/toolbox/tool-bucket-fill.xml:94(para)
+#: src/toolbox/tool-bucket-fill.xml:87(para)
 msgid ""
 "or by pressing the <keycombo><keycap>Shift</keycap><keycap>B</keycap></"
 "keycombo> keys."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:107(para)
+#: src/toolbox/tool-bucket-fill.xml:99(para)
 msgid ""
 "<keycap>Ctrl</keycap> toggles the use of BG Color Fill or FG Color Fill on "
 "the fly."
 msgstr ""
 "<keycap>Ctrl</keycap> cambia el uso del color de fondo o del color de frente."
 
-#: src/toolbox/tool-bucket-fill.xml:112(para)
+#: src/toolbox/tool-bucket-fill.xml:104(para)
 msgid ""
 "<keycap>Shift</keycap> toggles the use of Fill Similar Color or Fill Whole "
 "Selection on the fly."
@@ -10190,75 +9586,67 @@ msgstr ""
 "similares</guilabel> a <guilabel>Rellenar la selecciÃ³n completamente</"
 "guilabel>."
 
-#: src/toolbox/tool-bucket-fill.xml:124(phrase)
+#: src/toolbox/tool-bucket-fill.xml:114(phrase)
 msgid "<quote>Bucket Fill</quote> tool options"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:132(para)
-msgid ""
-"The available tool options for the Fill Tool can be accessed by double "
-"clicking the Fill Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para la herramienta de Relleno pueden ser accedidas "
-"realizando doble clic en su Ãcono. <placeholder-1/>"
-
-#: src/toolbox/tool-bucket-fill.xml:141(para)
+#: src/toolbox/tool-bucket-fill.xml:128(para)
 msgid ""
 "See <link linkend=\"gimp-tool-brush\">Paint Tools</link> for help with "
 "options that are common to all these tools. Only options that are specific "
 "to the Bucket Fill tool are explained here."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:150(term)
+#: src/toolbox/tool-bucket-fill.xml:138(term)
 msgid "Fill Type"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:152(para)
+#: src/toolbox/tool-bucket-fill.xml:140(para)
 msgid "<acronym>GIMP</acronym> provides three fill types:"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:156(term)
+#: src/toolbox/tool-bucket-fill.xml:144(term)
 msgid "FG Color Fill"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:158(para)
+#: src/toolbox/tool-bucket-fill.xml:146(para)
 msgid "sets the fill color to the currently selected foreground color."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:165(term)
+#: src/toolbox/tool-bucket-fill.xml:153(term)
 msgid "BG Color Fill"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:167(para)
+#: src/toolbox/tool-bucket-fill.xml:155(para)
 msgid "sets the fill color to the currently selected background color."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:174(term)
+#: src/toolbox/tool-bucket-fill.xml:162(term)
 msgid "Pattern Fill"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:176(para)
+#: src/toolbox/tool-bucket-fill.xml:164(para)
 msgid ""
 "sets the fill color to the currently selected pattern. You can select the "
 "pattern to use in a drop down list."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:180(para)
+#: src/toolbox/tool-bucket-fill.xml:168(para)
 msgid ""
 "This drop-down list allows the user to select one of many fill patterns to "
 "use on the next fill operation. The manner in which the list is presented is "
 "controlled by the four buttons at the bottom of the selector."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:192(term)
+#: src/toolbox/tool-bucket-fill.xml:181(term)
 msgid "Affected Area"
 msgstr "Ã?rea afectada"
 
-#: src/toolbox/tool-bucket-fill.xml:196(term)
+#: src/toolbox/tool-bucket-fill.xml:185(term)
 msgid "Fill whole selection"
 msgstr "Rellenar la selecciÃ³n completamente"
 
-#: src/toolbox/tool-bucket-fill.xml:198(para)
+#: src/toolbox/tool-bucket-fill.xml:187(para)
 msgid ""
 "This option makes GIMP fill a pre-existent selection or the whole image. A "
 "quicker approach to do the same thing could be to click and drag the "
@@ -10269,11 +9657,11 @@ msgstr ""
 "alternativa mÃ¡s rÃ¡pida para realizar la misma tarea consiste en arrastrar el "
 "color de frente, de fondo o el patrÃ³n hasta la selecciÃ³n."
 
-#: src/toolbox/tool-bucket-fill.xml:207(term)
+#: src/toolbox/tool-bucket-fill.xml:196(term)
 msgid "Fill similar colors"
 msgstr "Rellenar colores similares"
 
-#: src/toolbox/tool-bucket-fill.xml:209(para)
+#: src/toolbox/tool-bucket-fill.xml:198(para)
 msgid ""
 "This is the default setting: the tool fills the area with a color near the "
 "pixel onto you have clicked. The color similarity is defined by a brightness "
@@ -10284,19 +9672,19 @@ msgstr ""
 "definida por el umbral de brillo, que puede cambiar dando un valor o dando "
 "una posiciÃ³n del cursor."
 
-#: src/toolbox/tool-bucket-fill.xml:223(para)
+#: src/toolbox/tool-bucket-fill.xml:213(para)
 msgid "Under this section you can find two options:"
 msgstr "Bajo esta secciÃ³n puede encontrar dos opciones:"
 
-#: src/toolbox/tool-bucket-fill.xml:226(term)
+#: src/toolbox/tool-bucket-fill.xml:216(term)
 msgid "Fill Transparent Areas"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:229(primary)
+#: src/toolbox/tool-bucket-fill.xml:219(primary)
 msgid "Fill transparent areas"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:231(para)
+#: src/toolbox/tool-bucket-fill.xml:221(para)
 msgid ""
 "The option <guilabel>Fill Transparent Areas</guilabel> offers the "
 "possibility of filling areas with low opacity."
@@ -10304,7 +9692,7 @@ msgstr ""
 "La opciÃ³n <guilabel>Rellenar Ã¡reas transparentes</guilabel> ofrece la "
 "posibilidad de rellenar Ã¡reas con baja opacidad."
 
-#: src/toolbox/tool-bucket-fill.xml:240(para)
+#: src/toolbox/tool-bucket-fill.xml:230(para)
 msgid ""
 "The option <guilabel>Sample Merged</guilabel> toggles the sampling from all "
 "layers. If Sample Merged is active, fills can be made on a lower layer, "
@@ -10318,7 +9706,7 @@ msgstr ""
 "determinar el Ã¡rea de relleno estÃ¡ en las capas superiores. Simplemente "
 "seleccione la capa baja y asegÃºrese de que una capa superior estÃ© visible."
 
-#: src/toolbox/tool-bucket-fill.xml:253(para)
+#: src/toolbox/tool-bucket-fill.xml:243(para)
 msgid ""
 "The Threshold slider sets the level at which color weights are measured for "
 "fill boundaries. A higher setting will fill more of a multi colored image "
@@ -10328,17 +9716,17 @@ msgstr ""
 "para rellenar el espacio. Un nivel alto rellenarÃ¡ Ã¡rea de una imagen con "
 "color mÃ¡s variado, mientras que un nivel bajo rellenarÃ¡ menos Ã¡rea."
 
-#: src/toolbox/tool-bucket-fill.xml:262(term)
+#: src/toolbox/tool-bucket-fill.xml:252(term)
 msgid "Fill by"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:264(para)
+#: src/toolbox/tool-bucket-fill.xml:254(para)
 msgid ""
 "With this option you can choose which component of the image GIMP shall use "
 "to calculate the similarity and to determine the borders of filling."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:269(para)
+#: src/toolbox/tool-bucket-fill.xml:259(para)
 msgid ""
 "The components you can choose from are <guimenuitem>Composite</guimenuitem>, "
 "<guimenuitem>Red</guimenuitem>, <guimenuitem>Green</guimenuitem>, "
@@ -10346,7 +9734,7 @@ msgid ""
 "<guimenuitem>Saturation</guimenuitem> and <guimenuitem>Value</guimenuitem>."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:279(para)
+#: src/toolbox/tool-bucket-fill.xml:269(para)
 msgid ""
 "This option is not easy to understand. You have chosen, for example, the Red "
 "channel. When you click on any pixel, the tool searches for contiguous "
@@ -10354,20 +9742,20 @@ msgid ""
 "pixel, according to the set threshold. Here is an example:"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:286(para)
+#: src/toolbox/tool-bucket-fill.xml:276(para)
 msgid ""
 "Original image: three strips with gradients of pure colors. Red (255;0;0), "
 "Green (0;255;0), Blue (0;0;255). We are going to use the Bucket-fill tool "
 "with the magenta color and a Threshold set to 15."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:292(para)
+#: src/toolbox/tool-bucket-fill.xml:282(para)
 msgid ""
 "Image 1: Fill By = Composite. We successively clicked in the three color "
 "strips. Every strip is filled according to the threshold."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:297(para)
+#: src/toolbox/tool-bucket-fill.xml:287(para)
 msgid ""
 "Image 2: Fill By = Red. We clicked in the red strip. The tool searches for "
 "contiguous pixels which have a similar value in the red channel, according "
@@ -10377,179 +9765,56 @@ msgid ""
 "color doesn't spread to them."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:307(para)
+#: src/toolbox/tool-bucket-fill.xml:297(para)
 msgid ""
 "Image 3: Fill By = Red. We clicked in the green strip. There, the value of "
 "the clicked pixel in the red channel is 0. All pixels in the green and the "
 "blue strips have the same red channel value (0): they are all painted."
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:315(phrase)
+#: src/toolbox/tool-bucket-fill.xml:305(phrase)
 msgid "Example for <quote>Fill By</quote>"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:332(para)
+#: src/toolbox/tool-bucket-fill.xml:322(para)
 msgid "Image 1"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:340(para)
+#: src/toolbox/tool-bucket-fill.xml:330(para)
 msgid "Image 2"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:348(para)
+#: src/toolbox/tool-bucket-fill.xml:338(para)
 msgid "Image 3"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:361(phrase)
+#: src/toolbox/tool-bucket-fill.xml:351(phrase)
 msgid "Fill a feathered selection"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:363(para)
+#: src/toolbox/tool-bucket-fill.xml:352(para)
 msgid ""
 "By clicking repeatedly in a selection with feathered edges, you "
 "progressively fill the feathered border:"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:369(phrase)
+#: src/toolbox/tool-bucket-fill.xml:357(title)
 msgid "Example for <quote>Fill a feathered Selection</quote>"
 msgstr ""
 
-#: src/toolbox/tool-bucket-fill.xml:386(para)
+#: src/toolbox/tool-bucket-fill.xml:371(para)
 msgid "After clicking 3 times more with the Bucket-Fill tool"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:34(None)
-msgid "@@image: 'images/toolbox/brush-tools.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:48(None)
-msgid ""
-"@@image: 'images/toolbox/brush-tools-box.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:229(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-brushcommon.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:273(None)
-msgid ""
-"@@image: 'images/toolbox/dissolve-mode-example.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:296(None)
-msgid ""
-"@@image: 'images/toolbox/mode-dissolve.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:329(None) src/toolbox/tool-brush.xml:394(None)
-msgid ""
-"@@image: 'images/glossary/modes-normal2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:334(None)
-msgid ""
-"@@image: 'images/glossary/modes-behind.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:362(None)
-msgid "@@image: 'images/toolbox/mode-behind.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:399(None)
-msgid ""
-"@@image: 'images/glossary/modes-colorerase.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:424(None)
-msgid "@@image: 'images/toolbox/mode-erase.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:618(None)
-msgid "@@image: 'images/menus/jitter.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:655(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-paint-gradient.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:716(None)
-msgid ""
-"@@image: 'images/tool-options/brush-gradient-normal.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:724(None)
-msgid ""
-"@@image: 'images/tool-options/brush-gradient-none.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:732(None)
-msgid ""
-"@@image: 'images/tool-options/brush-gradient-sawtooth.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:740(None)
-msgid ""
-"@@image: 'images/tool-options/brush-gradient-triangular.png'; md5=THIS FILE "
-"DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:22(primary)
+#: src/toolbox/tool-brush.xml:23(primary)
 msgid "Paint Tools"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:25(primary)
-#: src/toolbox/toolbox-color-area.xml:30(primary)
-#: src/toolbox/toolbox-color-area.xml:101(primary)
-#: src/toolbox/toolbox-color-area.xml:137(primary)
-#: src/toolbox/intro.xml:26(primary)
-msgid "Toolbox"
-msgstr "Caja de herramientas"
-
-#: src/toolbox/tool-brush.xml:30(phrase)
+#: src/toolbox/tool-brush.xml:31(title)
 msgid "The Paint Tools (Tools menu)"
 msgstr "Las herramientas de brocha"
 
-#: src/toolbox/tool-brush.xml:38(para)
+#: src/toolbox/tool-brush.xml:39(para)
 msgid ""
 "The GIMP Toolbox includes thirteen <quote>brush tools</quote>, all grouped "
 "together at the bottom (in the default arrangement)."
@@ -10565,11 +9830,11 @@ msgstr ""
 "convoluciÃ³n desenfoca o enfoca; la herramienta blanquear/ennegrecer aclara u "
 "oscurece; la herramienta para borronear difumina."
 
-#: src/toolbox/tool-brush.xml:44(phrase)
+#: src/toolbox/tool-brush.xml:44(title)
 msgid "The Paint Tools (Tools Box)"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:52(para)
+#: src/toolbox/tool-brush.xml:51(para)
 msgid ""
 "The feature they all have in common is that all of them are used by moving "
 "the pointer across the image display, creating brush-strokes. Four of them"
@@ -10596,7 +9861,7 @@ msgstr ""
 msgid "the <link linkend=\"gimp-tool-ink\">Ink tool</link>"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:78(para)
+#: src/toolbox/tool-brush.xml:79(para)
 msgid ""
 "behave like the intuitive notion of \"painting\" with a brush. The others "
 "use a brush to modify an image in some way rather than paint on it:"
@@ -10608,55 +9873,55 @@ msgstr ""
 "herramienta para borronear, etc, y cualquiera de las opciones que haya "
 "configurado para dicha herramienta serÃ¡n aplicadas."
 
-#: src/toolbox/tool-brush.xml:84(para)
+#: src/toolbox/tool-brush.xml:85(para)
 msgid ""
 "the <link linkend=\"gimp-tool-bucket-fill\">Bucket Fill</link> fills with "
 "color or pattern;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:90(para)
+#: src/toolbox/tool-brush.xml:91(para)
 msgid ""
 "the <link linkend=\"gimp-tool-blend\">Gradient</link> fills with gradients;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:96(para)
+#: src/toolbox/tool-brush.xml:97(para)
 msgid "the <link linkend=\"gimp-tool-eraser\">Eraser</link> erases;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:101(para)
+#: src/toolbox/tool-brush.xml:102(para)
 msgid ""
 "the <link linkend=\"gimp-tool-clone\">Clone tool</link> copies from a "
 "pattern, or image;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:107(para)
+#: src/toolbox/tool-brush.xml:108(para)
 msgid ""
 "the <link linkend=\"gimp-tool-perspective-clone\">Perspective Clone</link> "
 "tool copies into a changed perspective;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:113(para)
+#: src/toolbox/tool-brush.xml:114(para)
 msgid ""
 "the <link linkend=\"gimp-tool-heal\">Heal tool</link> corrects small defects;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:119(para)
+#: src/toolbox/tool-brush.xml:120(para)
 msgid ""
 "the <link linkend=\"gimp-tool-convolve\">Convolve tool</link> blurs or "
 "sharpens;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:125(para)
+#: src/toolbox/tool-brush.xml:126(para)
 msgid "the <link linkend=\"gimp-tool-smudge\">Smudge tool</link> smears;"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:130(para)
+#: src/toolbox/tool-brush.xml:131(para)
 msgid ""
 "and the <link linkend=\"gimp-tool-dodge-burn\">Dodge/Burn tool</link> "
 "lightens or darkens."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:136(para)
+#: src/toolbox/tool-brush.xml:138(para)
 msgid ""
 "The advantages of using GIMP with a tablet instead of a mouse probably show "
 "up more clearly for brush tools than anywhere else: the gain in fine control "
@@ -10664,7 +9929,7 @@ msgid ""
 "quote> options that are only usable with a tablet."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:143(para)
+#: src/toolbox/tool-brush.xml:145(para)
 msgid ""
 "In addition to the more common <quote>hands-on</quote> method, it is "
 "possible to apply brush tools in an automated way, by creating a selection "
@@ -10675,17 +9940,29 @@ msgid ""
 "more information."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:161(para)
+#: src/toolbox/tool-brush.xml:162(para)
+#, fuzzy
+#| msgid ""
+#| "Holding down the <keycap>Ctrl</keycap> key has a special effect on every "
+#| "brush tool . For the Pencil, Paintbrush, Airbrush, Ink Tool, Eraser, and "
+#| "Smudge tools, it switches them into <quote>color picker</quote> mode, so "
+#| "that clicking on an image pixel causes GIMP's foreground to be set to the "
+#| "active layer's color at that point (or, for the Eraser, GIMP's background "
+#| "color). For the Clone tool, the <keycap>Ctrl</keycap> key switches it "
+#| "into a mode where clicking sets the reference point for copying. For the "
+#| "Convolve tool, the <keycap>Ctrl</keycap> key switches between blur and "
+#| "sharpen modes; the the Dodge/Burn tool, it switches between dodging and "
+#| "burning."
 msgid ""
 "Holding down the <keycap>Ctrl</keycap> key has a special effect on every "
-"brush tool . For the Pencil, Paintbrush, Airbrush, Ink Tool, Eraser, and "
-"Smudge tools, it switches them into <quote>color picker</quote> mode, so "
-"that clicking on an image pixel causes GIMP's foreground to be set to the "
-"active layer's color at that point (or, for the Eraser, GIMP's background "
-"color). For the Clone tool, the <keycap>Ctrl</keycap> key switches it into a "
-"mode where clicking sets the reference point for copying. For the Convolve "
-"tool, the <keycap>Ctrl</keycap> key switches between blur and sharpen modes; "
-"the the Dodge/Burn tool, it switches between dodging and burning."
+"brush tool . For the Pencil, Paintbrush, Airbrush, Ink Tool, and Eraser "
+"tools, it switches them into <quote>color picker</quote> mode, so that "
+"clicking on an image pixel causes GIMP's foreground to be set to the active "
+"layer's color at that point (or, for the Eraser, GIMP's background color). "
+"For the Clone tool, the <keycap>Ctrl</keycap> key switches it into a mode "
+"where clicking sets the reference point for copying. For the Convolve tool, "
+"the <keycap>Ctrl</keycap> key switches between blur and sharpen modes; for "
+"the Dodge/Burn tool, it switches between dodging and burning."
 msgstr ""
 "Manteniendo presionada la tecla Ctrl se alterna la funcionalidad de las "
 "herramientas de brocha, con la excepsiÃ³n de la de herramienta de entintado. "
@@ -10699,11 +9976,11 @@ msgstr ""
 "desenfocar. Para la herramienta blanquear/ennegrecer, se alterna entre ambos "
 "modos."
 
-#: src/toolbox/tool-brush.xml:183(primary)
+#: src/toolbox/tool-brush.xml:185(primary)
 msgid "Straight Line"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:185(para)
+#: src/toolbox/tool-brush.xml:187(para)
 msgid ""
 "Holding down the Shift key has the same effect on all brush tools: it places "
 "the tool into <emphasis>straight line</emphasis> mode. To create a straight "
@@ -10724,7 +10001,7 @@ msgstr ""
 "lÃnea recta serÃ¡ dibujada. Puede continuar este proceso para crear una serie "
 "de segmentos de lÃnea conectados entre sÃ."
 
-#: src/toolbox/tool-brush.xml:207(para)
+#: src/toolbox/tool-brush.xml:210(para)
 msgid ""
 "Holding down both keys puts the tool into <emphasis>constrained straight "
 "line</emphasis> mode. This is similar to the effect of the Shift key alone, "
@@ -10738,11 +10015,11 @@ msgstr ""
 "se restringe a mÃºltiplos de quince grados. Utilize Ã©ste cuando desee crear "
 "lÃneas horizontales, verticales, o diagonales con exactitud."
 
-#: src/toolbox/tool-brush.xml:225(phrase)
+#: src/toolbox/tool-brush.xml:226(title)
 msgid "Tool Options shared by all brush tools"
 msgstr "Opciones compartidas por todas las herramientas de brocha"
 
-#: src/toolbox/tool-brush.xml:233(para)
+#: src/toolbox/tool-brush.xml:235(para)
 msgid ""
 "Many tool options are shared by several brush tools: these are described "
 "here. Options that apply only to one specific tool, or to a small number of "
@@ -10752,11 +10029,11 @@ msgstr ""
 "brocha: Ã©stas se describen aquÃ. Las opciones especÃficas a cada herramienta "
 "se describen en las secciones dedicadas a las mismas."
 
-#: src/toolbox/tool-brush.xml:240(phrase)
-#: src/toolbox/tool-brush.xml:315(primary)
-#: src/toolbox/tool-brush.xml:380(primary)
-msgid "Paint Modes"
-msgstr ""
+#: src/toolbox/tool-brush.xml:241(variablelist:xreflabel)
+#, fuzzy
+#| msgid "Painting Tools"
+msgid "Painting Modes"
+msgstr "Herramientas de pintura"
 
 #: src/toolbox/tool-brush.xml:245(para)
 msgid ""
@@ -10783,159 +10060,23 @@ msgstr ""
 "especificado. Sin embargo, tres de los modos son especiales:"
 
 #: src/toolbox/tool-brush.xml:259(para)
-msgid "In this list, some modes are particular:"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:265(guilabel)
-msgid "Dissolve"
-msgstr "Disolver"
-
-#: src/toolbox/tool-brush.xml:269(phrase)
-msgid "Dissolve mode example"
-msgstr "Ejemplo del modo Disolver"
-
-#: src/toolbox/tool-brush.xml:276(para)
 msgid ""
-"Two brush-strokes made with the Airbrush, using the same fuzzy circular "
-"brush. Left: Normal mode. Right: Dissolve mode."
-msgstr ""
-"Dos trazos efectuados con el AerÃ³grafo, usando la misma brocha circular "
-"difusa. Izquierda: modo Normal. Derecha: modo Disolver."
-
-#: src/toolbox/tool-brush.xml:284(para)
-msgid ""
-"For any paint tool with opacity less than 100%, this very useful mode "
-"doesn't draw transparency but determines the probability of applying paint. "
-"This gives nice patterns of dots to paint-strokes or filling."
-msgstr ""
-"En este Ãºtil modo, para las brochas difusas el nivel de gris de la brocha "
-"determina no la densidad de pintura, sino la probabilidad de aplicar "
-"pintura. Proporciona una buena manera de crear brochadas de apariencia "
-"rugosa."
-
-#: src/toolbox/tool-brush.xml:292(phrase)
-msgid "Painting in Dissolve mode"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:299(para)
-msgid ""
-"This image has only the background layer and no Alpha channel. The "
-"background color is sky blue. Three strokes with Pencil and various "
-"opacities: 100%, 50%, 25%. Foreground color pixels are scattered along "
-"brushstroke."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:312(guilabel)
-#: src/toolbox/tool-brush.xml:316(secondary)
-msgid "Behind"
-msgstr ""
-"Este modo aplica pintura sÃ³lo a las Ã¡reas no opacas de la capa: a menor "
-"opacidad, mÃ¡s pintura es aplicada. Dado esto, pintar Ã¡reas completamente "
-"opacas no tiene efecto; pintar Ã¡reas completamente transparentes tiene el "
-"mismo efecto que el modo normal. El resultado es siempre un incremento en la "
-"opacidad. Por supuesto nada de esto tiene sentido para capas que no tienen "
-"canal alfa."
-
-#: src/toolbox/tool-brush.xml:319(primary)
-msgid "Behind (paint mode)"
+"In this list, some modes are particular and are described <link linkend="
+"\"gimp-paint-mode-examples\">below</link>."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:323(phrase)
-msgid "Example for layer mode <quote>Behind</quote>"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:338(para)
-msgid ""
-"This mode applies paint only to transparent areas of the layer: the lower "
-"the opacity, the more paint is applied. Thus, painting opaque areas has no "
-"effect; painting transparent areas has the same effect as normal mode. The "
-"result is always an increase in opacity. Of course none of this is "
-"meaningful for layers that lack an alpha channel."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:346(para)
-msgid ""
-"In the above example image, Wilber is on the top layer, surrounded by "
-"transparency. The lower layer is solid light blue. The Bucket Fill tool was "
-"used, with the <guilabel>Fill Whole Selection</guilabel> option checked and "
-"the entire layer was selected. A pattern was used to paint with the Bucket "
-"Fill tool."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:356(phrase)
-msgid "Painting in <quote>Behind</quote> mode"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:365(para)
-msgid ""
-"This image has two layers. The upper layer is active. Three brushtrokes with "
-"pencil, red color at 100%, 50%, 25% : only transparent or semi-transparent "
-"pixels of the layer are painted."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:377(guilabel)
-#: src/toolbox/tool-brush.xml:381(secondary)
-msgid "Color Erase"
-msgstr ""
-"Este modo borra el color de frente reemplazÃ¡ndolo con una transparencia "
-"parcial. ActÃºa como el filtro \"color a alfa\", aplicado al Ã¡rea bajo el "
-"trazo. Note que este modo sÃ³lo funciona en capas que poseen un canal alfa; "
-"de otra forma, este modo es idÃ©ntico al modo normal."
-
-#: src/toolbox/tool-brush.xml:384(primary)
-msgid "Color Erase (paint mode)"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:388(phrase)
-msgid "Example for layer mode <quote>Color erase</quote>"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:403(para)
-msgid ""
-"This mode erases the foreground color, replacing it with partial "
-"transparency. It acts like the <link linkend=\"plug-in-colortoalpha\">Color "
-"to Alpha</link> filter, applied to the area under the brushstroke. Note that "
-"this only works on layers that possess an alpha channel; otherwise, this "
-"mode is identical to Normal."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:411(para)
-msgid ""
-"In the above example image, the color of the Bucket Fill tool was white, so "
-"white parts of Wilber were erased and the blue background shows through."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:418(phrase)
-msgid "Painting in <quote>Color Erase</quote> mode"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:427(para)
-msgid ""
-"This image has only one layer, the background layer. Background color is sky "
-"blue. Three brushtrokes with pencil:"
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:434(para)
-msgid "With the exact color of the blue area: only this blue color is erased."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:440(para)
-msgid ""
-"With the exact color of the red area. Only this red color is erased, "
-"whatever its transparency. Erased areas are made transparent."
-msgstr ""
-
-#: src/toolbox/tool-brush.xml:447(para)
-msgid ""
-"With the sky blue color of the layer background: only this color is erased."
-msgstr ""
+#: src/toolbox/tool-brush.xml:271(secondary)
+#, fuzzy
+#| msgid "Opacity"
+msgid "Brush opacity"
+msgstr "Opacidad"
 
-#: src/toolbox/tool-brush.xml:465(secondary)
-#: src/toolbox/tool-brush.xml:469(secondary)
-msgid "The brush Opacity slider"
-msgstr ""
+#: src/toolbox/tool-brush.xml:275(secondary)
+#: src/toolbox/tool-brush.xml:293(term)
+msgid "Brush"
+msgstr "Brocha"
 
-#: src/toolbox/tool-brush.xml:471(para)
+#: src/toolbox/tool-brush.xml:277(para)
 msgid ""
 "The Opacity slider sets the transparency level for the brush operation. To "
 "understand how it works, imagine that instead of altering the active layer, "
@@ -10957,11 +10098,7 @@ msgstr ""
 "tornar un poco confusa: cuanta mayor sea la <quote>opacidad</quote>, se "
 "obtiene mayor transparencia."
 
-#: src/toolbox/tool-brush.xml:487(term)
-msgid "Brush"
-msgstr "Brocha"
-
-#: src/toolbox/tool-brush.xml:489(para)
+#: src/toolbox/tool-brush.xml:295(para)
 msgid ""
 "The brush determines how much of the image is affected by the tool, and how "
 "it is affected, when you trace out a brushstroke with the pointer. GIMP "
@@ -10983,20 +10120,45 @@ msgstr ""
 "pincel y el aerÃ³grafo. Para las demÃ¡s, sÃ³lo la distribuciÃ³n de intensidad de "
 "la brocha es relevante."
 
-#: src/toolbox/tool-brush.xml:507(para)
+#: src/toolbox/tool-brush.xml:314(para)
 msgid ""
 "This option lets you to modify precisely the size of the brush. You can use "
 "the arrow keys to vary by Â±0.01 or the Page-Up and Page-Down keys to vary by "
 "Â±0.05. You can obtain the same result if you have correctly set your mouse-"
 "wheel in the Preferences. See <link linkend=\"gimp-using-variable-size-brush"
-"\">How to vary the height of a brush</link>"
+"\">How to vary the size of a brush</link>"
+msgstr ""
+
+#: src/toolbox/tool-brush.xml:325(varlistentry:xreflabel)
+#: src/toolbox/tool-brush.xml:326(term)
+msgid "Brush Dynamics"
+msgstr ""
+
+#: src/toolbox/tool-brush.xml:329(title)
+msgid "The Brush Dynamics check box."
+msgstr ""
+
+#: src/toolbox/tool-brush.xml:337(para)
+msgid ""
+"Brush dynamics let you map different brush parameters, commonly at least "
+"size and opacity, to one or more of three input dynamics: pressure, velocity "
+"and random. They are mostly used with tablets, but Velocity and Random are "
+"also usable with a mouse. The Ink tool, that supported velocity before, has "
+"been overhauled and now handles velocity-dependent painting much better."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:518(term)
-msgid "Pressure Sensitivity"
-msgstr "Sensibilidad de presiÃ³n"
+#: src/toolbox/tool-brush.xml:345(para)
+msgid ""
+"A new option has been added in stroking paths. Stoke Path and Stroke "
+"Selection have now a check box for emulating brush dynamics when you stroke "
+"using a paint tool. That means that when you stoke, brush pressure and "
+"velocity are varying along the length of the stroke. Pressure starts with "
+"zero, ramps up to full pressure and then ramps down again to no pressure. "
+"Velocity starts from zero and ramps up to full speed by the end of the "
+"stroke."
+msgstr ""
 
-#: src/toolbox/tool-brush.xml:520(para)
+#: src/toolbox/tool-brush.xml:354(para)
 msgid ""
 "The Pressure Sensitivity section is only meaningful if you are using a "
 "tablet: it allows you to decide which aspects of the tool's action should be "
@@ -11016,15 +10178,15 @@ msgstr ""
 "desee. Para cada herramienta sÃ³lo las que tienen sentido son listadas. Esto "
 "es lo que hacen:"
 
-#: src/toolbox/tool-brush.xml:536(para)
+#: src/toolbox/tool-brush.xml:370(para)
 msgid "The effect of this option is described above."
 msgstr "El efecto de esta opciÃ³n fue descrito arriba."
 
-#: src/toolbox/tool-brush.xml:542(term)
+#: src/toolbox/tool-brush.xml:376(term)
 msgid "Hardness"
 msgstr "Dureza"
 
-#: src/toolbox/tool-brush.xml:544(para)
+#: src/toolbox/tool-brush.xml:378(para)
 msgid ""
 "This option applies to brushes with fuzzy edges. If it is enabled, the "
 "harder you press, the darker the fuzzy parts of the brush will appear."
@@ -11032,7 +10194,7 @@ msgstr ""
 "Esta opciÃ³n se aplica a brochas con bordes difusos. Si se activa, cuanto mÃ¡s "
 "se presione, los bordes difusos se imprimirÃ¡n mÃ¡s."
 
-#: src/toolbox/tool-brush.xml:554(para)
+#: src/toolbox/tool-brush.xml:388(para)
 msgid ""
 "This option applies to the Airbrush, Convolve tool, and Smudge tool, all of "
 "which have time-based effects. Pressing harder makes these tools act more "
@@ -11042,7 +10204,7 @@ msgstr ""
 "herramienta de Borronear, cada una de las cuales tienen efectos que dependen "
 "del tiempo. Presionando mÃ¡s hace que actÃºen mÃ¡s rÃ¡pido."
 
-#: src/toolbox/tool-brush.xml:564(para)
+#: src/toolbox/tool-brush.xml:398(para)
 msgid ""
 "This option applies to all of the pressure sensitive brush tools. If the "
 "option is checked, then pressing harder will increase the size of the area "
@@ -11054,7 +10216,7 @@ msgstr ""
 "paramÃ©trica, el presionar mÃ¡s sobre la tableta tiene el efecto de "
 "incrementar el tamaÃ±o del Ã¡rea afectada por la brocha."
 
-#: src/toolbox/tool-brush.xml:574(para)
+#: src/toolbox/tool-brush.xml:408(para)
 msgid ""
 "This option only applies to the painting tools: the Pencil, Paintbrush, and "
 "Airbrush; and only if you are using colors from a gradient. If these "
@@ -11066,11 +10228,11 @@ msgstr ""
 "gradiente. Si estas condiciones se cumplen, mientras mÃ¡s presiones el color "
 "se toma de un punto mÃ¡s alto en el gradiente."
 
-#: src/toolbox/tool-brush.xml:587(term)
+#: src/toolbox/tool-brush.xml:422(term)
 msgid "Fade Out"
 msgstr "Desvanecimiento"
 
-#: src/toolbox/tool-brush.xml:589(para)
+#: src/toolbox/tool-brush.xml:424(para)
 msgid ""
 "This option causes each stroke to fade out over the specified distance. It "
 "is easiest to visual for painting tools, but applies to all of the brush "
@@ -11085,15 +10247,15 @@ msgstr ""
 "que, al utilizar una tableta, esta opciÃ³n no modifica los efectos de la "
 "presiÃ³n de la brocha."
 
-#: src/toolbox/tool-brush.xml:600(term)
+#: src/toolbox/tool-brush.xml:435(term)
 msgid "Apply Jitter"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:603(primary)
+#: src/toolbox/tool-brush.xml:438(primary)
 msgid "Jitter"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:605(para)
+#: src/toolbox/tool-brush.xml:440(para)
 msgid ""
 "You know <quote>spacing</quote> in brush strokes: strokes are made of "
 "successive brush marks which, when they are very near, seem to draw a "
@@ -11102,19 +10264,19 @@ msgid ""
 "slider."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:614(phrase)
+#: src/toolbox/tool-brush.xml:448(title)
 msgid "<quote>Jitter</quote> example"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:621(para)
+#: src/toolbox/tool-brush.xml:454(para)
 msgid "From top to bottom: without jitter, jitter = 1, jitter = 4."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:630(term)
+#: src/toolbox/tool-brush.xml:464(term)
 msgid "Incremental"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:632(para)
+#: src/toolbox/tool-brush.xml:466(para)
 msgid ""
 "The Incremental check-box activates incremental mode for the tool. If it is "
 "deactivated, the maximum effect of a single stroke is determined by the "
@@ -11136,15 +10298,15 @@ msgstr ""
 "el control de <quote>tasa</quote>, el cual implica un efecto incremental con "
 "el tiempo."
 
-#: src/toolbox/tool-brush.xml:647(term)
+#: src/toolbox/tool-brush.xml:482(term)
 msgid "Color from Gradient"
 msgstr "Degradado"
 
-#: src/toolbox/tool-brush.xml:651(phrase)
+#: src/toolbox/tool-brush.xml:485(title)
 msgid "Gradient options for painting tools."
 msgstr "Opciones de degradado para las herramientas de pintura."
 
-#: src/toolbox/tool-brush.xml:659(para)
+#: src/toolbox/tool-brush.xml:493(para)
 msgid ""
 "Instead of using the foreground color (as shown in the Color Area of the "
 "Toolbox), by checking the \"Use color from gradient\" option you can choose "
@@ -11157,7 +10319,7 @@ msgstr ""
 "degradado</quote> puede pintar con los colores de un degradado. El color "
 "cambia gradualmente a lo largo de la trayetoria pintada."
 
-#: src/toolbox/tool-brush.xml:667(para)
+#: src/toolbox/tool-brush.xml:501(para)
 msgid ""
 "You have several options to control what gradient is used and how it is laid "
 "out:"
@@ -11165,20 +10327,7 @@ msgstr ""
 "Dispone de varias opciones para controlar quÃ© degradado es empleado y de quÃ© "
 "forma:"
 
-#: src/toolbox/tool-brush.xml:673(term)
-#: src/toolbox/toolbox-color-area.xml:113(primary)
-#: src/toolbox/tool-blend.xml:164(term)
-#, fuzzy
-msgid "Gradient"
-msgstr ""
-"#-#-#-#-#  tool-blend.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Degradado\n"
-"#-#-#-#-#  toolbox-color-area.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Caja de herramientas\n"
-"#-#-#-#-#  tool-brush.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Degradado"
-
-#: src/toolbox/tool-brush.xml:675(para)
+#: src/toolbox/tool-brush.xml:509(para)
 msgid ""
 "Here you see a display of the current gradient. Clicking on it brings up a "
 "Gradient Selector, which will allow you to choose a different gradient."
@@ -11187,11 +10336,11 @@ msgstr ""
 "en la misma aparece un selector de degradado, el que permite escoger uno "
 "entre los diferentes proporcionados."
 
-#: src/toolbox/tool-brush.xml:683(term)
+#: src/toolbox/tool-brush.xml:517(term)
 msgid "Reverse"
 msgstr "Invertido"
 
-#: src/toolbox/tool-brush.xml:685(para)
+#: src/toolbox/tool-brush.xml:519(para)
 msgid ""
 "Normally a brushstroke starts with colors from the left side of the "
 "gradient, and progresses rightward. If \"Reverse\" is checked, the stroke "
@@ -11202,11 +10351,11 @@ msgstr ""
 "quote> es activada, la brocha empieza tomando colores desde el extremo "
 "derecho, y avanza hacia la izquierda."
 
-#: src/toolbox/tool-brush.xml:694(term)
+#: src/toolbox/tool-brush.xml:528(term)
 msgid "Length"
 msgstr "Largo"
 
-#: src/toolbox/tool-brush.xml:696(para)
+#: src/toolbox/tool-brush.xml:530(para)
 msgid ""
 "This option sets the distance corresponding to one complete cycle through "
 "the gradient colors. The default units are pixels, but you can choose a "
@@ -11217,11 +10366,11 @@ msgstr ""
 "por omisiÃ³n es el pixel, pero puede escoger una de las diferentes unidades "
 "desde el menÃº adjunto."
 
-#: src/toolbox/tool-brush.xml:705(term) src/toolbox/tool-blend.xml:421(term)
+#: src/toolbox/tool-brush.xml:539(term) src/toolbox/tool-blend.xml:409(term)
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/toolbox/tool-brush.xml:709(phrase)
+#: src/toolbox/tool-brush.xml:543(phrase)
 msgid ""
 "Illustration of the effects of the three gradient-repeat options, for the "
 "<quote>Abstract 2</quote> gradient."
@@ -11229,475 +10378,395 @@ msgstr ""
 "IlustraciÃ³n de los efectos de los tres valores de la opciÃ³n \"repetir\", "
 "para el degradado llamado <quote>Abstract 2</quote>."
 
-#: src/toolbox/tool-brush.xml:719(para)
+#: src/toolbox/tool-brush.xml:554(para)
 msgid "Abstract2 Gradient"
 msgstr "Degradado Abstract2"
 
-#: src/toolbox/tool-brush.xml:735(para)
+#: src/toolbox/tool-brush.xml:572(para)
 msgid "Sawtooth"
 msgstr "Dientes de sierra"
 
-#: src/toolbox/tool-brush.xml:743(para)
+#: src/toolbox/tool-brush.xml:581(para)
 msgid "Triangular"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:747(para)
+#: src/toolbox/tool-brush.xml:585(para)
 msgid ""
 "This option determines what happens if a brushstroke extends farther than "
-"the Length specified above. There are three possibilities: \"None\" means "
-"that the color from the end of the gradient will be used throughout the "
-"remainder of the stroke; \"Sawtooth wave\" means that the gradient will be "
-"restarted from the beginning, which will often produce a color "
-"discontinuity; \"Triangular wave\" means that the gradient will be traversed "
-"in reverse, afterwards bouncing back and forth until the end of the "
-"brushstroke."
+"the Length specified above. There are three possibilities:"
 msgstr ""
-"Esta opciÃ³n determina quÃ© sucede si un trazo se excede el largo especificado "
-"arriba. Hay tres posibilidades: <guilabel>Ninguno</guilabel> significa que "
-"el color del final del degradado serÃ¡ usado a lo largo del resto del trazo; "
-"<guilabel>Onda de dientes de sierra</guilabel> significa que el degradado "
-"saltarÃ¡ al principio y volverÃ¡ a ser recorrido, lo que usualmente produce "
-"una discontinuidad en el color; <guilabel>Onda triangular</guilabel> "
-"significa que el gradiente serÃ¡ vuelto a recorrer en reversa, llendo y "
-"viniendo hasta el final del trazo."
 
-#: src/toolbox/tool-brush.xml:769(para)
+#: src/toolbox/tool-brush.xml:592(para)
 msgid ""
-"Advanced users may be interested to know that brush tools actually operate "
-"at a sub-pixel level, in order to avoid producing jagged-looking results. "
-"One consequence of this is that even if you work with a hard-edged brush, "
-"such as one of the Circle brushes, pixels on the edge of the brushstroke "
-"will only be partially affected. If you need to have all-or-nothing effects "
-"(which may be necessary for getting a good selection, or for cutting and "
-"pasting, or for operating pixel-by-pixel at a high zoom level), use the "
-"Pencil tool, which makes all brushes perfectly hard and disables sub-pixel "
-"anti-aliasing."
+"<guilabel>None</guilabel> means that the color from the end of the gradient "
+"will be used throughout the remainder of the stroke;"
 msgstr ""
-"Los usuarios avanzados pueden estar interesados en saber cÃ³mo estas "
-"herramientas actÃºan a nivel de subpÃxel, para evitar obtener resultados no "
-"deseados. Una consecuencia de esto es que hasta cuando se trabaja con "
-"brochas de bordes duros, como alguna de las circulares, los pÃxeles del "
-"borde de la pincelada sÃ³lo se verÃ¡n parcialmente afectados. Si necesita "
-"obtener efectos de \"todo o nada\" (por ejemplo para realizar una selecciÃ³n "
-"perfecta, cortar y pegar, u operar pÃxel a pÃxel), hay dos formas de "
-"lograrlo: (1) para pintar, utilize el lÃ¡piz, el que da a todas las brochas "
-"bordes perfectos y desactiva el antidentado de subpÃxel, o (2) para las "
-"otras herramientas, active la opciÃ³n de <quote>bordes duros</quote>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brightness-contrast.xml:64(None)
+#: src/toolbox/tool-brush.xml:599(para)
 msgid ""
-"@@image: 'images/toolbox/stock-tool-brightness-contrast-22.png'; md5=THIS "
-"FILE DOESN'T EXIST"
+"<guilabel>Sawtooth wave</guilabel> means that the gradient will be restarted "
+"from the beginning, which will often produce a color discontinuity;"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brightness-contrast.xml:82(None)
+#: src/toolbox/tool-brush.xml:606(para)
 msgid ""
-"@@image: 'images/toolbox/tools-brightness.png'; md5=THIS FILE DOESN'T EXIST"
+"<guilabel>Triangular wave</guilabel> means that the gradient will be "
+"traversed in reverse, afterwards bouncing back and forth until the end of "
+"the brushstroke."
 msgstr ""
 
-#: src/toolbox/tool-brightness-contrast.xml:22(phrase)
-msgid "Brightness-Contrast tool"
-msgstr "Brillo-Contraste"
-
-#: src/toolbox/tool-brightness-contrast.xml:26(secondary)
-msgid "Brightness-Contrast"
-msgstr ""
+#: src/toolbox/tool-brush.xml:622(title)
+#, fuzzy
+#| msgid "Painting example"
+msgid "Paint Mode Examples"
+msgstr "Ejemplos de trazos"
 
-#: src/toolbox/tool-brightness-contrast.xml:28(para)
+#: src/toolbox/tool-brush.xml:624(para)
 msgid ""
-"The Brightness-Contrast tool adjusts the brightness and contrast levels for "
-"the active layer or selection. This tool is easy to use, but relatively "
-"unsophisticated. The Levels and Curve tools allow you to make the same types "
-"of adjustments, but also give you the ability to treat bright colors "
-"differently from darker colors. Generally speaking, the BC tool is great for "
-"doing a \"quick and dirty\" adjustment in a few seconds, but if the image is "
-"important and you want it to look as good as possible, you will use one of "
-"the other tools."
+"The following examples demonstrate some of <acronym>GIMP</acronym>'s paint "
+"modes:"
 msgstr ""
-"La herramienta brillo-contraste ajusta los niveles de brillo y contraste de "
-"la capa activa o selecciÃ³n. Esta herramienta es fÃ¡cil de usar. Los niveles y "
-"las curvas permiten hacer el mismo tipo de ajustes, pero permiten tratar los "
-"colores brillantes y los oscuros, de manera independiente."
 
-#: src/toolbox/tool-brightness-contrast.xml:38(para)
-msgid ""
-"In GIMP 2.4, a new way of operating this tool has been added: by clicking "
-"the mouse inside the image, and dragging while keeping the left mouse button "
-"down. Moving the mouse vertically changes the brightness; moving "
-"horizontally changes the contrast. When you are satisfied with the result, "
-"you can either press the \"OK\" button on the dialog, or hit the Return key "
-"on your keyboard."
-msgstr ""
-"En el GIMP 2.4, se aÃ±ade una nueva manera para operar con la herramienta: "
-"pulsando dentro de la imagen, y arrastrando con el botÃ³n izquierdo del ratÃ³n "
-"pulsado. Moviendo el ratÃ³n verticalmente cambia el brillo; moviendolo "
-"horizontalmente cambia el contraste. Cuando estÃ© satisfecho con el "
-"resultado, pulse el botÃ³n \"OK\" en el diÃ¡logo, o pulse la tecla enter."
+#: src/toolbox/tool-brush.xml:630(term)
+msgid "Dissolve"
+msgstr "Disolver"
 
-#: src/toolbox/tool-brightness-contrast.xml:50(para)
-msgid "You can get to the Brightness-Contrast tool in two ways :"
-msgstr "Puede obtener la herramienta brillo-contraste de dos maneras:"
+#: src/toolbox/tool-brush.xml:633(title)
+msgid "Dissolve mode example"
+msgstr "Ejemplo del modo Disolver"
 
-#: src/toolbox/tool-brightness-contrast.xml:55(para)
+#: src/toolbox/tool-brush.xml:640(para)
 msgid ""
-"In the the image-menu through: <menuchoice><guimenu>Tools</"
-"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Brightness-"
-"Contrast</guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
-"guimenu><guimenuitem>Brightness-Contrast</guimenuitem></menuchoice>,"
+"Two brush-strokes made with the Airbrush, using the same fuzzy circular "
+"brush. Left: Normal mode. Right: Dissolve mode."
 msgstr ""
-"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
-"guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
-"guisubmenu><guimenuitem><accel>B</accel>rillo-Contraste</guimenuitem></"
-"menuchoice>"
+"Dos trazos efectuados con el AerÃ³grafo, usando la misma brocha circular "
+"difusa. Izquierda: modo Normal. Derecha: modo Disolver."
 
-#: src/toolbox/tool-brightness-contrast.xml:62(para)
+#: src/toolbox/tool-brush.xml:648(para)
 msgid ""
-"by clicking the tool icon: <placeholder-1/> in Toolbox, provided that you "
-"have installed color tools in Toolbox. For this, go to <link linkend=\"gimp-"
-"tools-dialog\">Tools Dialog</link>."
+"For any paint tool with opacity less than 100%, this very useful mode "
+"doesn't draw transparency but determines the probability of applying paint. "
+"This gives nice patterns of dots to paint-strokes or filling."
 msgstr ""
-"Pulsando el icono de la herramienta: <placeholder-1/> en la caja de "
-"herramientas, si ya la tiene instalada. Para esto, ir a <link linkend=\"gimp-"
-"tools-dialog\">DiÃ¡logo de herramientas</link>."
-
-#: src/toolbox/tool-brightness-contrast.xml:78(phrase)
-msgid "Brightness-Contrast options dialog"
-msgstr "Opciones de la herramienta brillo-contraste"
-
-#: src/toolbox/tool-brightness-contrast.xml:88(term)
-msgid "Brightness"
-msgstr "Brillo"
+"En este Ãºtil modo, para las brochas difusas el nivel de gris de la brocha "
+"determina no la densidad de pintura, sino la probabilidad de aplicar "
+"pintura. Proporciona una buena manera de crear brochadas de apariencia "
+"rugosa."
 
-#: src/toolbox/tool-brightness-contrast.xml:90(para)
-msgid ""
-"This slider sets a negative (to darken) or positive (to brighten) value for "
-"the brightness, decreasing or increasing bright tones."
+#: src/toolbox/tool-brush.xml:655(title)
+msgid "Painting in Dissolve mode"
 msgstr ""
-"Este deslizador selecciona un valor, negativo ( mÃ¡s oscuro) o positivo ( mÃ¡s "
-"claro), para el brillo, variando el brillo de los tonos."
 
-#: src/toolbox/tool-brightness-contrast.xml:97(term)
-msgid "Contrast"
-msgstr "Contraste"
-
-#: src/toolbox/tool-brightness-contrast.xml:99(para)
+#: src/toolbox/tool-brush.xml:662(para)
 msgid ""
-"This slider sets a negative (to decrease) or positive (to increase) value "
-"for the contrast."
+"This image has only the background layer and no Alpha channel. The "
+"background color is sky blue. Three strokes with Pencil and various "
+"opacities: 100%, 50%, 25%. Foreground color pixels are scattered along "
+"brushstroke."
 msgstr ""
-"Este deslizador selecciona un valor, negativo ( decrece) o positivo "
-"( incrementa) para el contraste."
 
-#: src/toolbox/tool-brightness-contrast.xml:108(para)
-msgid ""
-"The Preview check-box makes all changes to the brightness and contrast "
-"dynamically so that the new level settings can be viewed immediately."
+#: src/toolbox/tool-brush.xml:675(term)
+#: src/toolbox/tool-brush.xml:679(secondary)
+msgid "Behind"
 msgstr ""
-"La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
-"Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
+"Este modo aplica pintura sÃ³lo a las Ã¡reas no opacas de la capa: a menor "
+"opacidad, mÃ¡s pintura es aplicada. Dado esto, pintar Ã¡reas completamente "
+"opacas no tiene efecto; pintar Ã¡reas completamente transparentes tiene el "
+"mismo efecto que el modo normal. El resultado es siempre un incremento en la "
+"opacidad. Por supuesto nada de esto tiene sentido para capas que no tienen "
+"canal alfa."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/toolbox-color-area.xml:50(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-palette.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-brush.xml:678(primary)
+#: src/toolbox/tool-brush.xml:756(primary)
+msgid "Paint Modes"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/toolbox-color-area.xml:122(None)
-msgid "@@image: 'images/toolbox/toolbox-bpg.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-brush.xml:682(primary)
+msgid "Behind (paint mode)"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/toolbox-color-area.xml:146(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-image.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-brush.xml:685(title)
+msgid "Example for layer mode <quote>Behind</quote>"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/toolbox-color-area.xml:168(None)
-msgid "@@image: 'images/toolbox/XDS.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/toolbox/tool-brush.xml:692(para) src/toolbox/tool-brush.xml:770(para)
+msgid "Wilber over a blue background layer"
 msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:17(date)
-msgid "2007-11-15"
-msgstr "2007-04-18"
-
-#: src/toolbox/toolbox-color-area.xml:23(phrase)
-msgid "Color and Indicator Area"
-msgstr "Ã?reas de indicaciones y de colores"
-
-#: src/toolbox/toolbox-color-area.xml:27(phrase)
-#: src/toolbox/toolbox-color-area.xml:31(secondary)
-#: src/toolbox/toolbox-color-area.xml:34(primary)
-msgid "Color Area"
-msgstr "Ã?rea de colores"
-
-#: src/toolbox/toolbox-color-area.xml:37(primary)
-msgid "Foreground color"
+#: src/toolbox/tool-brush.xml:701(para)
+msgid "Layers dialog"
 msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:40(primary)
-msgid "Background color"
+#: src/toolbox/tool-brush.xml:710(para)
+msgid "Filled with pattern"
 msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:44(phrase)
-msgid "Color area in the Toolbox Palette"
-msgstr "El Ã¡rea de colores en la caja de herramientas"
-
-#: src/toolbox/toolbox-color-area.xml:56(term)
-msgid "Color area"
-msgstr "Ã?rea de colores"
-
-#: src/toolbox/toolbox-color-area.xml:58(para)
+#: src/toolbox/tool-brush.xml:714(para)
 msgid ""
-"This area shows GIMP's basic palette, consisting of two colors, the "
-"Foreground and Background, used for painting, filling, and many other "
-"operations. Clicking on either of the color displays brings up a Color "
-"Editor dialog, which permits you to change it."
+"This mode applies paint only to transparent areas of the layer: the lower "
+"the opacity, the more paint is applied. Thus, painting opaque areas has no "
+"effect; painting transparent areas has the same effect as normal mode. The "
+"result is always an increase in opacity. Of course none of this is "
+"meaningful for layers that lack an alpha channel."
 msgstr ""
-"Este Ã¡rea muestra la paleta bÃ¡sica del GIMP, que consiste de dos colores, el "
-"color de frente y el color de fondo. Estos colores se utilizan al pintar, "
-"rellenar, y en muchas otras operaciones. Al hacer clic en cualquiera de "
-"ellos aparece el diÃ¡logo editor de colores, que permite modificarlo."
-
-#: src/toolbox/toolbox-color-area.xml:67(term)
-msgid "Default colors"
-msgstr "Colores predeterminados"
 
-#: src/toolbox/toolbox-color-area.xml:70(para)
+#: src/toolbox/tool-brush.xml:722(para)
 msgid ""
-"Clicking on this small symbol resets the Foreground and Background colors to "
-"black and white, respectively. Pressing the <keycap>D</keycap> key has the "
-"same effect."
+"In the above example image, Wilber is on the top layer, surrounded by "
+"transparency. The lower layer is solid light blue. The Bucket Fill tool was "
+"used, with the <guilabel>Fill Whole Selection</guilabel> option checked and "
+"the entire layer was selected. A pattern was used to paint with the Bucket "
+"Fill tool."
 msgstr ""
-"Al hacer clic en este pequeÃ±o sÃmbolo, se vuelven los colores de frente y "
-"fondo a negro y blanco, respectivamente."
-
-#: src/toolbox/toolbox-color-area.xml:78(term)
-msgid "Swap FG/BG colors"
-msgstr "Intercambiar los colores de frente y fondo"
 
-#: src/toolbox/toolbox-color-area.xml:81(para)
+#: src/toolbox/tool-brush.xml:730(para)
 msgid ""
-"Clicking on the small curved line with two arrowheads causes the Foreground "
-"and Background colors to be swapped. Pressing the <keycap>X</keycap> key has "
-"the same effect."
+"The next image (below) has two layers. The upper layer is active. Three "
+"brushtrokes with pencil, red color at 100%, 50%, 25%: only transparent or "
+"semi-transparent pixels of the layer are painted."
 msgstr ""
-"Al hacer clic sobre la pequeÃ±a flecha curva, los colores de frente y fondo "
-"se intercambian. Presionar la tecla <keycap>X</keycap> surte el mismo efecto."
 
-#: src/toolbox/toolbox-color-area.xml:87(para)
-msgid ""
-"You can click-and-drag one of these colors directly into a layer: it will "
-"fill the whole layer."
+#: src/toolbox/tool-brush.xml:736(title)
+msgid "Painting in <quote>Behind</quote> mode"
 msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:98(phrase)
-#: src/toolbox/toolbox-color-area.xml:102(secondary)
-msgid "Indicator Area"
-msgstr "Ã?rea de indicaciones"
-
-#: src/toolbox/toolbox-color-area.xml:105(primary)
-msgid "Brushes"
+#: src/toolbox/tool-brush.xml:743(para)
+msgid "Painting with 100%, 50%, 25% transparency (from left to right)"
 msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:106(secondary)
-#: src/toolbox/toolbox-color-area.xml:110(secondary)
-#: src/toolbox/toolbox-color-area.xml:114(secondary)
-msgid "Toolbox Indicator Area"
-msgstr "Ã?rea de indicaciones"
-
-#: src/toolbox/toolbox-color-area.xml:118(phrase)
-msgid "Active tool indicator area"
-msgstr "Ã?rea de indicaciones de la herramienta activa"
-
-#: src/toolbox/toolbox-color-area.xml:126(para)
-msgid ""
-"This part of the Toolbox shows the currently selected brush, pattern, and "
-"gradient. Clicking on any of them brings up a dialog that allows you to "
-"change it."
+#: src/toolbox/tool-brush.xml:753(term)
+#: src/toolbox/tool-brush.xml:757(secondary)
+msgid "Color Erase"
 msgstr ""
-"Esta parte de la caja de herramientas muestra la brocha actualmente "
-"seleccionada, el patrÃ³n activo, y el degradado activo. Al hacer clic sobe "
-"cualquiera de ellos, aparece un diÃ¡logo que le permite cambiarlo."
-
-#: src/toolbox/toolbox-color-area.xml:134(phrase)
-msgid "Active image Area"
-msgstr "Ã?rea de la imagen activa"
+"Este modo borra el color de frente reemplazÃ¡ndolo con una transparencia "
+"parcial. ActÃºa como el filtro \"color a alfa\", aplicado al Ã¡rea bajo el "
+"trazo. Note que este modo sÃ³lo funciona en capas que poseen un canal alfa; "
+"de otra forma, este modo es idÃ©ntico al modo normal."
 
-#: src/toolbox/toolbox-color-area.xml:138(secondary)
-msgid "Active image area"
-msgstr "Ã?rea de la imagen activa"
+#: src/toolbox/tool-brush.xml:760(primary)
+msgid "Color Erase (paint mode)"
+msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:142(phrase)
-msgid "Current image in the toolbox"
-msgstr "La imagen activa en la caja de herramientas"
+#: src/toolbox/tool-brush.xml:763(title)
+msgid "Example for layer mode <quote>Color erase</quote>"
+msgstr ""
 
-#: src/toolbox/toolbox-color-area.xml:156(para)
-msgid "See <xref linkend=\"bibliography-online-xds\"/>."
-msgstr "<xref linkend=\"bibliography-online-xds\"/>."
+#: src/toolbox/tool-brush.xml:779(para)
+#, fuzzy
+#| msgid "The foreground is roughly selected"
+msgid "White foreground color erased"
+msgstr "El frente se selecciona aproximadamente"
 
-#: src/toolbox/toolbox-color-area.xml:150(para)
+#: src/toolbox/tool-brush.xml:783(para)
 msgid ""
-"A thumbnail of the active image can be displayed in this area if the "
-"<quote>Display Active Image</quote> option is checked in Preferences/"
-"Toolbox. If you click on this thumbnail, the <quote>Images</quote> dialog is "
-"opened, useful if you have many images on your screen. You can also click "
-"and drag this thumbnail to an enabled XDS<placeholder-1/> file manager to "
-"directly save the corresponding image; this opens a dialog where you can "
-"enter a name for the image:"
+"This mode erases the foreground color, replacing it with partial "
+"transparency. It acts like the <link linkend=\"plug-in-colortoalpha\">Color "
+"to Alpha</link> filter, applied to the area under the brushstroke. Note that "
+"this only works on layers that possess an alpha channel; otherwise, this "
+"mode is identical to Normal."
 msgstr ""
-"Puede hacer que se muestre una miniatura de la imagen activa en este Ã¡rea si "
-"se activa la opciÃ³n <quote>Mostrar imagen activa</quote> en Preferencias/"
-"Caja de herramientas. <placeholder-1/>"
 
-#: src/toolbox/toolbox-color-area.xml:164(phrase)
-msgid "A Direct Save Protocol (XDS) dialog"
+#: src/toolbox/tool-brush.xml:791(para)
+msgid ""
+"In the above example image, the color of the Bucket Fill tool was white, so "
+"white parts of Wilber were erased and the blue background shows through."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:49(None)
+#: src/toolbox/tool-brush.xml:796(para)
 msgid ""
-"@@image: 'images/toolbox/toolbox-gradient.png'; md5=THIS FILE DOESN'T EXIST"
+"This image below has only one layer, the background layer. Background color "
+"is sky blue. Three brushtrokes with pencil:"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:108(None) src/toolbox/tool-blend.xml:154(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-blend-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+#: src/toolbox/tool-brush.xml:803(para)
+msgid "With the exact color of the blue area: only this blue color is erased."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:147(None)
+#: src/toolbox/tool-brush.xml:809(para)
 msgid ""
-"@@image: 'images/toolbox/blend-tool-options.png'; md5=THIS FILE DOESN'T EXIST"
+"With the exact color of the red area. Only this red color is erased, "
+"whatever its transparency. Erased areas are made transparent."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:194(None)
+#: src/toolbox/tool-brush.xml:816(para)
 msgid ""
-"@@image: 'images/toolbox/blend-tool-offset.png'; md5=THIS FILE DOESN'T EXIST"
+"With the sky blue color of the layer background: only this color is erased."
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:219(None)
-msgid ""
-"@@image: 'images/tool-options/gradient-linear.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+#: src/toolbox/tool-brush.xml:823(title)
+msgid "Painting in <quote>Color Erase</quote> mode"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:227(None)
-msgid ""
-"@@image: 'images/tool-options/gradient-bilinear.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+#: src/toolbox/tool-brush.xml:830(para)
+msgid "Painted with 1. blue; 2. red; 3. background color"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:235(None)
+#: src/toolbox/tool-brush.xml:843(para)
 msgid ""
-"@@image: 'images/tool-options/gradient-radial.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+"Advanced users may be interested to know that brush tools actually operate "
+"at a sub-pixel level, in order to avoid producing jagged-looking results. "
+"One consequence of this is that even if you work with a hard-edged brush, "
+"such as one of the Circle brushes, pixels on the edge of the brushstroke "
+"will only be partially affected. If you need to have all-or-nothing effects "
+"(which may be necessary for getting a good selection, or for cutting and "
+"pasting, or for operating pixel-by-pixel at a high zoom level), use the "
+"Pencil tool, which makes all brushes perfectly hard and disables sub-pixel "
+"anti-aliasing."
 msgstr ""
+"Los usuarios avanzados pueden estar interesados en saber cÃ³mo estas "
+"herramientas actÃºan a nivel de subpÃxel, para evitar obtener resultados no "
+"deseados. Una consecuencia de esto es que hasta cuando se trabaja con "
+"brochas de bordes duros, como alguna de las circulares, los pÃxeles del "
+"borde de la pincelada sÃ³lo se verÃ¡n parcialmente afectados. Si necesita "
+"obtener efectos de \"todo o nada\" (por ejemplo para realizar una selecciÃ³n "
+"perfecta, cortar y pegar, u operar pÃxel a pÃxel), hay dos formas de "
+"lograrlo: (1) para pintar, utilize el lÃ¡piz, el que da a todas las brochas "
+"bordes perfectos y desactiva el antidentado de subpÃxel, o (2) para las "
+"otras herramientas, active la opciÃ³n de <quote>bordes duros</quote>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:285(None)
-msgid ""
-"@@image: 'images/tool-options/gradient-square.png'; md5=THIS FILE DOESN'T "
-"EXIST"
+#: src/toolbox/tool-brightness-contrast.xml:14(title)
+msgid "Brightness-Contrast tool"
+msgstr "Brillo-Contraste"
+
+#: src/toolbox/tool-brightness-contrast.xml:17(secondary)
+msgid "Brightness-Contrast"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:293(None)
+#: src/toolbox/tool-brightness-contrast.xml:19(para)
 msgid ""
-"@@image: 'images/tool-options/gradient-ang-shapeburst.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"The Brightness-Contrast tool adjusts the brightness and contrast levels for "
+"the active layer or selection. This tool is easy to use, but relatively "
+"unsophisticated. The Levels and Curve tools allow you to make the same types "
+"of adjustments, but also give you the ability to treat bright colors "
+"differently from darker colors. Generally speaking, the BC tool is great for "
+"doing a \"quick and dirty\" adjustment in a few seconds, but if the image is "
+"important and you want it to look as good as possible, you will use one of "
+"the other tools."
 msgstr ""
+"La herramienta brillo-contraste ajusta los niveles de brillo y contraste de "
+"la capa activa o selecciÃ³n. Esta herramienta es fÃ¡cil de usar. Los niveles y "
+"las curvas permiten hacer el mismo tipo de ajustes, pero permiten tratar los "
+"colores brillantes y los oscuros, de manera independiente."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:303(None)
+#: src/toolbox/tool-brightness-contrast.xml:29(para)
+#, fuzzy
+#| msgid ""
+#| "In GIMP 2.4, a new way of operating this tool has been added: by clicking "
+#| "the mouse inside the image, and dragging while keeping the left mouse "
+#| "button down. Moving the mouse vertically changes the brightness; moving "
+#| "horizontally changes the contrast. When you are satisfied with the "
+#| "result, you can either press the \"OK\" button on the dialog, or hit the "
+#| "Return key on your keyboard."
 msgid ""
-"@@image: 'images/tool-options/gradient-spher-shapeburst.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"In GIMP 2.4, a new way of operating this tool has been added: by clicking "
+"the mouse inside the image, and dragging while keeping the left mouse button "
+"down. Moving the mouse vertically changes the brightness; moving "
+"horizontally changes the contrast. When you are satisfied with the result, "
+"you can either press the <guilabel>OK</guilabel> button on the dialog, or "
+"hit the <keycap>Return</keycap> key on your keyboard."
 msgstr ""
+"En el GIMP 2.4, se aÃ±ade una nueva manera para operar con la herramienta: "
+"pulsando dentro de la imagen, y arrastrando con el botÃ³n izquierdo del ratÃ³n "
+"pulsado. Moviendo el ratÃ³n verticalmente cambia el brillo; moviendolo "
+"horizontalmente cambia el contraste. Cuando estÃ© satisfecho con el "
+"resultado, pulse el botÃ³n \"OK\" en el diÃ¡logo, o pulse la tecla enter."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:313(None)
+#: src/toolbox/tool-brightness-contrast.xml:41(para)
+#, fuzzy
+#| msgid "You can get to the Brightness-Contrast tool in two ways :"
+msgid "You can get to the Brightness-Contrast tool in two ways:"
+msgstr "Puede obtener la herramienta brillo-contraste de dos maneras:"
+
+#: src/toolbox/tool-brightness-contrast.xml:46(para)
 msgid ""
-"@@image: 'images/tool-options/gradient-dim-shapeburst.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"In the the image-menu through: <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Brightness-"
+"Contrast</guimenuitem></menuchoice> or <menuchoice><guimenu>Colors</"
+"guimenu><guimenuitem>Brightness-Contrast</guimenuitem></menuchoice>,"
 msgstr ""
+"En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
+"guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
+"guisubmenu><guimenuitem><accel>B</accel>rillo-Contraste</guimenuitem></"
+"menuchoice>"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:348(None)
+#: src/toolbox/tool-brightness-contrast.xml:60(para)
+#, fuzzy
+#| msgid ""
+#| "by clicking the tool icon: <placeholder-1/> in Toolbox, provided that you "
+#| "have installed color tools in Toolbox. For this, go to <link linkend="
+#| "\"gimp-tools-dialog\">Tools Dialog</link>."
 msgid ""
-"@@image: 'images/tool-options/gradient-sym-conical.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"by clicking the tool icon: <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-brightness-contrast-22.png\"/></guiicon> in Toolbox, provided "
+"that you have installed color tools in Toolbox. For this, go to <link "
+"linkend=\"gimp-tools-dialog\">Tools Dialog</link>."
 msgstr ""
+"Pulsando el icono de la herramienta: <placeholder-1/> en la caja de "
+"herramientas, si ya la tiene instalada. Para esto, ir a <link linkend=\"gimp-"
+"tools-dialog\">DiÃ¡logo de herramientas</link>."
+
+#: src/toolbox/tool-brightness-contrast.xml:77(title)
+msgid "Brightness-Contrast options dialog"
+msgstr "Opciones de la herramienta brillo-contraste"
+
+#: src/toolbox/tool-brightness-contrast.xml:128(term)
+msgid "Brightness"
+msgstr "Brillo"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:358(None)
+#: src/toolbox/tool-brightness-contrast.xml:130(para)
 msgid ""
-"@@image: 'images/tool-options/gradient-asym-conical.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"This slider sets a negative (to darken) or positive (to brighten) value for "
+"the brightness, decreasing or increasing bright tones."
 msgstr ""
+"Este deslizador selecciona un valor, negativo ( mÃ¡s oscuro) o positivo ( mÃ¡s "
+"claro), para el brillo, variando el brillo de los tonos."
+
+#: src/toolbox/tool-brightness-contrast.xml:137(term)
+msgid "Contrast"
+msgstr "Contraste"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:391(None)
+#: src/toolbox/tool-brightness-contrast.xml:139(para)
 msgid ""
-"@@image: 'images/tool-options/gradient-clock-spiral.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"This slider sets a negative (to decrease) or positive (to increase) value "
+"for the contrast."
+msgstr ""
+"Este deslizador selecciona un valor, negativo ( decrece) o positivo "
+"( incrementa) para el contraste."
+
+#: src/toolbox/tool-brightness-contrast.xml:146(term)
+msgid "Edit these settings as Levels"
 msgstr ""
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-blend.xml:401(None)
+#: src/toolbox/tool-brightness-contrast.xml:148(para)
 msgid ""
-"@@image: 'images/tool-options/gradient-anticlock-spiral.png'; md5=THIS FILE "
-"DOESN'T EXIST"
+"To make your work easier, this button lets you turn to the <link linkend="
+"\"gimp-tool-levels\">Levels</link> tool with the same settings."
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:25(authorinitials)
-msgid "alex falappa"
+#: src/toolbox/tool-brightness-contrast.xml:158(para)
+msgid ""
+"The Preview check-box makes all changes to the brightness and contrast "
+"dynamically so that the new level settings can be viewed immediately."
 msgstr ""
+"La casilla de vista previa conmuta la actualizaciÃ³n dinÃ¡mica de la imagen. "
+"Si la casilla estÃ¡ marcada, los cambios se ven, inmediatamente."
 
-#: src/toolbox/tool-blend.xml:30(phrase)
-#: src/toolbox/tool-blend.xml:33(primary)
-#: src/toolbox/tool-blend.xml:36(primary)
-#: src/toolbox/tool-blend.xml:41(secondary)
+#: src/toolbox/tool-blend.xml:21(title) src/toolbox/tool-blend.xml:23(primary)
+#: src/toolbox/tool-blend.xml:26(primary)
+#: src/toolbox/tool-blend.xml:31(secondary)
 msgid "Blend"
 msgstr "Herramienta de mezcla"
 
-#: src/toolbox/tool-blend.xml:45(phrase)
-msgid "The Blend tool in Toolbox."
+#: src/toolbox/tool-blend.xml:35(title)
+#, fuzzy
+#| msgid "The Blend tool in Toolbox."
+msgid "The Blend tool in Toolbox"
 msgstr ""
 "Esta herramienta rellena el Ã¡rea seleccionada con un degradado que por "
 "omisiÃ³n va desde el color de frente hasta el color de fondo"
 
-#: src/toolbox/tool-blend.xml:53(para)
+#: src/toolbox/tool-blend.xml:43(para)
 msgid ""
 "This tool fills the selected area with a gradient blend of the foreground "
 "and background colors by default, but there are many options. To make a "
@@ -11713,7 +10782,7 @@ msgstr ""
 "ratÃ³n. La suavidad de la gradaciÃ³n depende de la distancia en que haya "
 "arrastrado el cursor. A menor distancia, la gradaciÃ³n es menos suave."
 
-#: src/toolbox/tool-blend.xml:61(para)
+#: src/toolbox/tool-blend.xml:51(para)
 msgid ""
 "There are an astonishing number of things you can do with this tool, and the "
 "possibilities may seem a bit overwhelming at first. The two most important "
@@ -11732,7 +10801,7 @@ msgstr ""
 "uno de los que el GIMP proporciona, y puede ademÃ¡s construÃr y guardar "
 "degradados nuevos."
 
-#: src/toolbox/tool-blend.xml:72(para)
+#: src/toolbox/tool-blend.xml:62(para)
 msgid ""
 "For Shape, there are 11 options: Linear, Bilinear, Radial, Square, Conical "
 "(symmetric), Conical (asymmetric), Shaped (angular), Shaped (spherical), "
@@ -11756,7 +10825,7 @@ msgstr ""
 "selecciÃ³n, mover el ratÃ³n y soltarlo, pero el resultado para estas formas "
 "serÃ¡ el mismo sin importar para dÃ³nde o cuÃ¡nto se mueva el cursor."
 
-#: src/toolbox/tool-blend.xml:85(para)
+#: src/toolbox/tool-blend.xml:75(para)
 msgid ""
 "Check out the Difference option in the Mode menu, where doing the same thing "
 "(even with full opacity) will result in fantastic swirling patterns, "
@@ -11766,29 +10835,35 @@ msgstr ""
 "acciÃ³n (incluso con total opacidad) se crearÃ¡n patrones muy curiosos y "
 "alienados, cambiando cada vez."
 
-#: src/toolbox/tool-blend.xml:100(para)
+#: src/toolbox/tool-blend.xml:89(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"From the image-menu: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint Tools</"
-"guisubmenu><guimenuitem>Blen<accel>d</accel></guimenuitem></menuchoice>."
+"From the image-menu: <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint "
+"Tools</guisubmenu><guimenuitem>Blend</guimenuitem></menuchoice>."
 msgstr ""
-"La herramienta de mezcla puede activarse siguiendo el menÃº de imagen en el "
-"siguiente orden: <guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
-"<guimenuitem>Herramientas de <accel>p</accel>intura</guimenuitem>/ "
-"<guimenuitem><accel>M</accel>ezcla</guimenuitem>."
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-blend.xml:106(para)
-msgid "By clicking the tool icon <placeholder-1/>."
+#: src/toolbox/tool-blend.xml:99(para)
+msgid ""
+"By clicking the tool icon <guiicon><inlinegraphic fileref=\"images/toolbox/"
+"stock-tool-blend-22.png\"/></guiicon>."
 msgstr ""
-"La herramienta tambiÃ©n puede activarse clicando en el icono: <placeholder-1/>"
 
-#: src/toolbox/tool-blend.xml:112(para)
+#: src/toolbox/tool-blend.xml:107(para)
 msgid "By clicking on the <keycap>L</keycap> keyboard shortcut."
 msgstr ""
 "La tecla <keycap>L</keycap> cambia la herramienta activa al relleno de "
 "mezcla."
 
-#: src/toolbox/tool-blend.xml:130(para)
+#: src/toolbox/tool-blend.xml:124(para)
 msgid ""
 "<keycap>Ctrl</keycap> is used to create straight lines that are constrained "
 "to 15 degree absolute angles."
@@ -11796,19 +10871,11 @@ msgstr ""
 "<keycap>Ctrl</keycap> es usado para crear lÃneas rectas restringidas a "
 "Ã¡ngulos mÃºltiplos de 15 grados."
 
-#: src/toolbox/tool-blend.xml:143(phrase)
+#: src/toolbox/tool-blend.xml:134(title)
 msgid "<quote>Blend</quote> tool options"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:151(para)
-msgid ""
-"The available tool options can be accessed by double clicking the Gradient "
-"Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para la herramienta de mezcla pueden ser accedidas "
-"realizando doble clic en su icono. <placeholder-1/>"
-
-#: src/toolbox/tool-blend.xml:166(para)
+#: src/toolbox/tool-blend.xml:154(para)
 msgid ""
 "A variety of gradient patterns can be selected from the drop-down list. The "
 "tool causes a shading pattern that transitions from foreground to background "
@@ -11823,7 +10890,7 @@ msgstr ""
 "intermedios. La opciÃ³n <guilabel>Invertido</guilabel> causa que la "
 "transiciÃ³n por los colores se realize a la inversa."
 
-#: src/toolbox/tool-blend.xml:179(term) src/toolbox/tool-align.xml:255(term)
+#: src/toolbox/tool-blend.xml:167(term) src/toolbox/tool-align.xml:235(term)
 #, fuzzy
 msgid "Offset"
 msgstr ""
@@ -11832,7 +10899,7 @@ msgstr ""
 "#-#-#-#-#  tool-blend.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Deslizar"
 
-#: src/toolbox/tool-blend.xml:181(para)
+#: src/toolbox/tool-blend.xml:169(para)
 msgid ""
 "The <guilabel>Offset</guilabel> value permits to increase the <quote>slope</"
 "quote> of the gradient. It determines how far from the clicked starting "
@@ -11841,15 +10908,15 @@ msgstr ""
 "El valor de <guilabel>Deslizar</guilabel> permite incrementar el "
 "<quote>lugar de arranque</quote> del degradado."
 
-#: src/toolbox/tool-blend.xml:189(phrase)
+#: src/toolbox/tool-blend.xml:177(phrase)
 msgid "<quote>Blend</quote> tool: Offset example"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:197(para)
+#: src/toolbox/tool-blend.xml:185(para)
 msgid "Top, Offset = 0 ; Bottom, Offset = 50%"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:206(para)
+#: src/toolbox/tool-blend.xml:194(para)
 msgid ""
 "The <acronym>GIMP</acronym> provides 11 shapes, which can be selected from "
 "the drop-down list. Details on each of the shapes are given below."
@@ -11858,23 +10925,19 @@ msgstr ""
 "seleccionarse desde la lista desplegable. A continuaciÃ³n se comenta sobre "
 "cada una en detalle."
 
-#: src/toolbox/tool-blend.xml:213(phrase)
+#: src/toolbox/tool-blend.xml:201(phrase)
 msgid "Examples of gradient shapes"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:222(para) src/toolbox/tool-blend.xml:244(term)
-msgid "Linear"
-msgstr "Lineal"
-
-#: src/toolbox/tool-blend.xml:230(para) src/toolbox/tool-blend.xml:254(term)
+#: src/toolbox/tool-blend.xml:218(para) src/toolbox/tool-blend.xml:242(term)
 msgid "Bi-Linear"
 msgstr "Bilineal"
 
-#: src/toolbox/tool-blend.xml:238(para) src/toolbox/tool-blend.xml:265(term)
+#: src/toolbox/tool-blend.xml:226(para) src/toolbox/tool-blend.xml:253(term)
 msgid "Radial"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:246(para)
+#: src/toolbox/tool-blend.xml:234(para)
 msgid ""
 "This gradient begins with the foreground color at the starting point of the "
 "drawn line and transitions linearly to the background color at the ending "
@@ -11884,7 +10947,7 @@ msgstr ""
 "el punto inicial de la lÃnea dibujada y varÃa linealmente hasta alcanzar el "
 "color de fondo en el punto final."
 
-#: src/toolbox/tool-blend.xml:256(para)
+#: src/toolbox/tool-blend.xml:244(para)
 msgid ""
 "This shape proceeds in both directions from the starting point, for a "
 "distance determined by the length of the drawn line. It is useful, for "
@@ -11895,7 +10958,7 @@ msgstr ""
 "largo de la lÃnea dibujada. Es Ãºtil, por ejemplo, para dar la apariencia de "
 "un tubo o cilindro."
 
-#: src/toolbox/tool-blend.xml:267(para)
+#: src/toolbox/tool-blend.xml:255(para)
 msgid ""
 "This gradient gives a circle, with foreground color at the center and "
 "background color outside the circle. It gives the appearance of a sphere "
@@ -11906,31 +10969,31 @@ msgstr ""
 "el color de fondo. Llena con el color de fondo el exterior del cÃrculo. Se "
 "puede crear la apariencia de una esfera con luz frontal."
 
-#: src/toolbox/tool-blend.xml:275(term)
+#: src/toolbox/tool-blend.xml:263(term)
 msgid "Square; Shaped"
 msgstr "Cuadrado"
 
-#: src/toolbox/tool-blend.xml:279(phrase)
+#: src/toolbox/tool-blend.xml:267(phrase)
 msgid "Square-shaped gradient examples"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:288(para)
+#: src/toolbox/tool-blend.xml:276(para)
 msgid "Square"
 msgstr "Cuadrado"
 
-#: src/toolbox/tool-blend.xml:296(para)
+#: src/toolbox/tool-blend.xml:284(para)
 msgid "Shaped (angular)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:306(para)
+#: src/toolbox/tool-blend.xml:294(para)
 msgid "Shaped (spherical)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:316(para)
+#: src/toolbox/tool-blend.xml:304(para)
 msgid "Shaped (dimpled)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:322(para)
+#: src/toolbox/tool-blend.xml:310(para)
 msgid ""
 "There are four shapes that are some variant on a square: <guilabel>Square</"
 "guilabel>, <guilabel>Shaped (angular)</guilabel>, <guilabel>Shaped "
@@ -11949,23 +11012,23 @@ msgstr ""
 "maneras en que la gradaciÃ³n es calculada. Experimentar es la mejor forma de "
 "ver las diferencias."
 
-#: src/toolbox/tool-blend.xml:338(term)
+#: src/toolbox/tool-blend.xml:326(term)
 msgid "Conical (symmetric); Conical (asymmetric)"
 msgstr "CÃ³nica (simÃ©trica); CÃ³nica (asimÃ©trica)"
 
-#: src/toolbox/tool-blend.xml:342(phrase)
+#: src/toolbox/tool-blend.xml:330(phrase)
 msgid "Conical gradient examples"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:351(para)
+#: src/toolbox/tool-blend.xml:339(para)
 msgid "Conical (symmetrical)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:361(para)
+#: src/toolbox/tool-blend.xml:349(para)
 msgid "Conical (asymmetrical)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:367(para)
+#: src/toolbox/tool-blend.xml:355(para)
 msgid ""
 "The <guilabel>Conical (symmetrical)</guilabel> shape gives the sensation of "
 "looking down at the tip of a cone, which appears to be illuminated with the "
@@ -11976,7 +11039,7 @@ msgstr ""
 "un cono desde arriba, que parece ser iluminado por el color de fondo desde "
 "una direcciÃ³n determinada por la direcciÃ³n de la lÃnea dibujada."
 
-#: src/toolbox/tool-blend.xml:374(para)
+#: src/toolbox/tool-blend.xml:362(para)
 msgid ""
 "<guilabel>Conical (asymmetric)</guilabel> is similar to <guilabel>Conical "
 "(symmetric)</guilabel> except that the \"cone\" appears to have a ridge "
@@ -11986,23 +11049,23 @@ msgstr ""
 "<guilabel>CÃ³nica (asimÃ©trica)</guilabel> excepto que el supuesto cono parece "
 "tener una cresta donde la lÃnea fue dibujada."
 
-#: src/toolbox/tool-blend.xml:382(term)
+#: src/toolbox/tool-blend.xml:370(term)
 msgid "Spiral (clockwise); Spiral (counterclockwise)"
 msgstr "Espiral (sentido horario)"
 
-#: src/toolbox/tool-blend.xml:387(phrase)
+#: src/toolbox/tool-blend.xml:375(phrase)
 msgid "Spiral gradient examples"
 msgstr "Espiral (sentido horario)"
 
-#: src/toolbox/tool-blend.xml:394(para)
+#: src/toolbox/tool-blend.xml:382(para)
 msgid "Spiral (clockwise)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:404(para)
+#: src/toolbox/tool-blend.xml:392(para)
 msgid "Spiral (counterclockwise)"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:410(para)
+#: src/toolbox/tool-blend.xml:398(para)
 msgid ""
 "The <guilabel>Spiral</guilabel> shape provide spirals whose repeat width is "
 "determined by the length of the drawn line."
@@ -12011,7 +11074,7 @@ msgstr ""
 "ancho fijo en todas las repeticiones, determinado por el largo de la lÃnea "
 "dibujada."
 
-#: src/toolbox/tool-blend.xml:423(para)
+#: src/toolbox/tool-blend.xml:411(para)
 msgid ""
 "There are two repeat modes: <guilabel>Sawtooth Wave</guilabel> and "
 "<guilabel>Triangular Wave</guilabel>. The Sawtooth pattern is achieved by "
@@ -12027,11 +11090,11 @@ msgstr ""
 "comienza con el frente, varÃa gradualmente hasta el fondo, y luego vuelve a "
 "variar gradualmente hasta el frente."
 
-#: src/toolbox/tool-blend.xml:435(term)
+#: src/toolbox/tool-blend.xml:423(term)
 msgid "Dithering"
 msgstr "Difuminado"
 
-#: src/toolbox/tool-blend.xml:437(para)
+#: src/toolbox/tool-blend.xml:425(para)
 msgid ""
 "Dithering is fully explained in the <link linkend=\"glossary-dithering"
 "\">Glossary</link>"
@@ -12039,11 +11102,11 @@ msgstr ""
 "El difuminado se explica completamente en el <link linkend=\"glossary-"
 "dithering\">glosario</link>"
 
-#: src/toolbox/tool-blend.xml:444(term)
+#: src/toolbox/tool-blend.xml:432(term)
 msgid "Adaptive Supersampling"
 msgstr "Supermuestreo adaptativo"
 
-#: src/toolbox/tool-blend.xml:446(para)
+#: src/toolbox/tool-blend.xml:434(para)
 msgid ""
 "This a more sophisticated means of smoothing the \"jagged\" effect of a "
 "sharp transition of color along a slanted or curved line. Only tests can "
@@ -12053,84 +11116,17 @@ msgstr ""
 "sofisticada de suavizar el efecto <quote>escalonado</quote> de una "
 "transiciÃ³n de color a lo largo de una lÃnea diagonal o curva."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:38(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-align.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:69(None) src/toolbox/tool-align.xml:133(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-align-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:122(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-align.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:280(None)
-msgid "@@image: 'images/toolbox/align-ex1.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:296(None)
-msgid "@@image: 'images/toolbox/align-ex2.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:312(None)
-msgid "@@image: 'images/toolbox/align-ex3.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:330(None)
-msgid "@@image: 'images/toolbox/align-ex4.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:349(None)
-msgid "@@image: 'images/toolbox/align-ex5a.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-align.xml:361(None)
-msgid "@@image: 'images/toolbox/align-ex5b.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/tool-align.xml:17(date)
-msgid "2007-08-27"
-msgstr "2007-09-14"
-
-#: src/toolbox/tool-align.xml:18(authorinitials)
-msgid "ude"
-msgstr "AntI"
-
-#: src/toolbox/tool-align.xml:23(phrase)
-#: src/toolbox/tool-align.xml:26(primary)
-#: src/toolbox/tool-align.xml:30(secondary)
-#: src/toolbox/tool-align.xml:138(term)
+#: src/toolbox/tool-align.xml:13(title) src/toolbox/tool-align.xml:15(primary)
+#: src/toolbox/tool-align.xml:19(secondary)
+#: src/toolbox/tool-align.xml:120(term)
 msgid "Align"
 msgstr "Herramienta de alineaciÃ³n"
 
-#: src/toolbox/tool-align.xml:34(phrase)
+#: src/toolbox/tool-align.xml:23(title)
 msgid "The Align tool in the toolbox"
 msgstr "La herramiente de alineaciÃ³n en la caja de herramientas"
 
-#: src/toolbox/tool-align.xml:42(para)
+#: src/toolbox/tool-align.xml:30(para)
 msgid ""
 "The Align tool is useful to align the image layers with various image "
 "objects. When this tool is selected, the mouse pointer turns to a small "
@@ -12153,32 +11149,38 @@ msgstr ""
 "alineada la capa seleccionada. Este objeto se llama <emphasis>objetivo</"
 "emphasis>."
 
-#: src/toolbox/tool-align.xml:58(para)
+#: src/toolbox/tool-align.xml:45(para)
 msgid "You can activate the Align tool in several ways :"
 msgstr "Puede activar la herramienta de varias maneras :"
 
-#: src/toolbox/tool-align.xml:61(para)
+#: src/toolbox/tool-align.xml:48(para)
+#, fuzzy
+#| msgid ""
+#| "In the the image-menu through: <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Shear</"
+#| "guimenuitem></menuchoice>,"
 msgid ""
-"From the image-menu, through: <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>T</accel>ransform Tools</"
-"guisubmenu><guimenuitem><accel>A</accel>lign</guimenuitem></menuchoice>."
+"From the image-menu, through: <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Align</"
+"guimenuitem></menuchoice>,"
 msgstr ""
-"Desde el menÃº de la imagen, con: <menuchoice><guimenu><accel>H</"
-"accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>t</"
-"accel>ransformaciÃ³n</guisubmenu><guimenuitem><accel>A</accel>lineado</"
-"guimenuitem></menuchoice>."
+"En el menÃº de imagen: <menuchoice><guimenu><accel>H</accel>erramientas</"
+"guimenu><guisubmenu>Herramientas de <accel>T</accel>ransformaciÃ³n</"
+"guisubmenu><guimenuitem><accel>I</accel>nclinar</guimenuitem></menuchoice>,"
 
-#: src/toolbox/tool-align.xml:67(para)
-msgid "By clicking on the tool icon: <placeholder-1/> in the toolbox."
+#: src/toolbox/tool-align.xml:58(para)
+msgid ""
+"by clicking on the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-align-22.png\"/></guiicon> in the toolbox,"
 msgstr ""
-"Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
-"herramientas."
 
-#: src/toolbox/tool-align.xml:74(para)
-msgid "By using the <keycap>Q</keycap> keyboard shortcut."
-msgstr ""
+#: src/toolbox/tool-align.xml:68(para)
+#, fuzzy
+#| msgid "or by using the <keycap>B</keycap> keyboard shortcut."
+msgid "by using the <keycap>Q</keycap> keyboard shortcut."
+msgstr "o por medio del atajo de teclado <keycap>B</keycap>."
 
-#: src/toolbox/tool-align.xml:90(para)
+#: src/toolbox/tool-align.xml:81(para)
 msgid ""
 "You can select several layers by holding <keycap>Shift</keycap> when "
 "clicking the layers."
@@ -12186,7 +11188,7 @@ msgstr ""
 "Puede seleccionar varias capas manteniendo pulsado <keycap>Mayus</keycap> "
 "cuando pulsa sobre las capas."
 
-#: src/toolbox/tool-align.xml:95(para)
+#: src/toolbox/tool-align.xml:86(para)
 msgid ""
 "Sometimes it's easier to choose multiple layers using rubber-banding: click "
 "somewhere outside an imaginary rectangular region covering the layers you "
@@ -12200,7 +11202,7 @@ msgstr ""
 "soltando el botÃ³n. Ahora cada capa, que estÃ¡ completamente dentro de el "
 "rectÃ¡ngulo arrastrado, estÃ¡n seleccionadas."
 
-#: src/toolbox/tool-align.xml:103(para)
+#: src/toolbox/tool-align.xml:94(para)
 msgid ""
 "Note that now there is no target <quote>first item</quote> the selected "
 "layers can be aligned on."
@@ -12208,30 +11210,24 @@ msgstr ""
 "NotesÃ© que ahora no hay objetivo <quote>primer elemento</quote> sobre el que "
 "puedan alinearse las capas seleccionadas."
 
-#: src/toolbox/tool-align.xml:118(phrase)
-msgid "Align options"
-msgstr "Opciones de la herramienta de alineaciÃ³n"
-
-#: src/toolbox/tool-align.xml:130(para)
-msgid ""
-"The available tool options can be accessed by (double)-clicking the align "
-"Tool icon. <placeholder-1/>"
-msgstr ""
-"Se puede acceder a las opciones disponibles para esta herramienta mediante "
-"una doble pulsaciÃ³n sobre su icono. <placeholder-1/>"
+#: src/toolbox/tool-align.xml:107(title)
+#, fuzzy
+#| msgid "Tool Options for the Clone tool"
+msgid "Tool Options for the Align tool"
+msgstr "Opciones de la herramienta para clonar"
 
-#: src/toolbox/tool-align.xml:142(term)
+#: src/toolbox/tool-align.xml:124(term)
 msgid "Relative to:"
 msgstr "Relativo a:"
 
-#: src/toolbox/tool-align.xml:144(para)
+#: src/toolbox/tool-align.xml:126(para)
 msgid ""
 "This is the target - the image object the selected layer will be aligned on."
 msgstr ""
 "Este es el objetivo - el objeto de la imagen sobre el que se alinearÃ¡ la "
 "capa seleccionada."
 
-#: src/toolbox/tool-align.xml:150(para)
+#: src/toolbox/tool-align.xml:132(para)
 msgid ""
 "<guilabel>First item</guilabel>: the first selected item when selecting "
 "multiple layers holding the Shift key. Note that there is no <quote>first "
@@ -12242,11 +11238,11 @@ msgstr ""
 "<keycap>Mayus</keycap>. Notese que no hay <quote>primer elemento</quote> "
 "cuando se seleccionan mÃºltiples capas usando la selecciÃ³n elÃ¡stica."
 
-#: src/toolbox/tool-align.xml:157(para)
+#: src/toolbox/tool-align.xml:139(para)
 msgid "<guilabel>Image</guilabel>: the image is used as a target."
 msgstr "<guilabel>Imagen</guilabel>: se utiliza la imagen como un objetivo."
 
-#: src/toolbox/tool-align.xml:162(para) src/toolbox/tool-align.xml:167(para)
+#: src/toolbox/tool-align.xml:144(para)
 msgid ""
 "<guilabel>Selection</guilabel>: the minimal rectangular region covering the "
 "active selection."
@@ -12254,16 +11250,23 @@ msgstr ""
 "<guilabel>SelecciÃ³n</guilabel>:la regiÃ³n mÃnima rectangular que recubre la "
 "selecciÃ³n activa."
 
-#: src/toolbox/tool-align.xml:172(para)
+#: src/toolbox/tool-align.xml:149(para)
+#, fuzzy
+#| msgid "<guilabel>Active Channel</guilabel>:"
+msgid "<guilabel>Active layer</guilabel>:"
+msgstr "<guilabel>Canal activa</guilabel>:"
+
+#: src/toolbox/tool-align.xml:153(para)
 msgid "<guilabel>Active Channel</guilabel>:"
 msgstr "<guilabel>Canal activa</guilabel>:"
 
-#: src/toolbox/tool-align.xml:176(para)
-msgid "<guilabel>Active Path</guilabel>: This option is not yet handled."
-msgstr ""
-"<guilabel>Ruta activa</guilabel>: esta opciÃ³n no estÃ¡, todavia, activada."
+#: src/toolbox/tool-align.xml:157(para)
+#, fuzzy
+#| msgid "<guilabel>Active Channel</guilabel>:"
+msgid "<guilabel>Active Path</guilabel>:"
+msgstr "<guilabel>Canal activa</guilabel>:"
 
-#: src/toolbox/tool-align.xml:205(para)
+#: src/toolbox/tool-align.xml:185(para)
 msgid ""
 "These buttons become active when a layer is selected. When you click on one "
 "of these buttons, you align the selected layer with left edge, horizontal "
@@ -12274,11 +11277,11 @@ msgstr ""
 "centrado horizontal, borde derecho, borde superior, centrado vertical, o "
 "borde inferior del objetivo."
 
-#: src/toolbox/tool-align.xml:217(term)
+#: src/toolbox/tool-align.xml:197(term)
 msgid "Distribute"
 msgstr "Distribuir"
 
-#: src/toolbox/tool-align.xml:242(para)
+#: src/toolbox/tool-align.xml:222(para)
 msgid ""
 "These options seem to differ from the <quote>Related to </quote> options "
 "only by the possibility to set an offset. This offset is the distance which "
@@ -12295,7 +11298,7 @@ msgstr ""
 "izquierdo, centrado horizontal, borde derecho, borde superior, centrado "
 "vertical, o borde inferior del objetivo."
 
-#: src/toolbox/tool-align.xml:257(para)
+#: src/toolbox/tool-align.xml:237(para)
 msgid ""
 "This entry controls the amount of displacement that could be given to the "
 "desired alignment effect (in pixel) regarding the target. The default value "
@@ -12305,15 +11308,15 @@ msgstr ""
 "efecto de alineaciÃ³n deseado (en pÃxeles) relativo al objetivo. El valor "
 "predefinido es 0; puede ser positivo o negativo."
 
-#: src/toolbox/tool-align.xml:272(phrase)
+#: src/toolbox/tool-align.xml:251(title)
 msgid "Example for the <quote>Align</quote> command"
 msgstr "Ejemplo para el comando <quote>Alineado</quote>"
 
-#: src/toolbox/tool-align.xml:276(phrase)
+#: src/toolbox/tool-align.xml:253(title)
 msgid "Base image"
 msgstr "Imagen de base"
 
-#: src/toolbox/tool-align.xml:283(para)
+#: src/toolbox/tool-align.xml:259(para)
 msgid ""
 "This image has three layers with different sizes and a rectangular "
 "selection. The yellow layer is active."
@@ -12321,39 +11324,39 @@ msgstr ""
 "Esta imagen tiene tres capas con diferentes tamaÃ±os y una selecciÃ³n "
 "rectangular. La capa amarilla estÃ¡ activa."
 
-#: src/toolbox/tool-align.xml:292(phrase)
+#: src/toolbox/tool-align.xml:267(title)
 msgid "Red layer selected"
 msgstr "Capa roja seleccionada"
 
-#: src/toolbox/tool-align.xml:299(para)
+#: src/toolbox/tool-align.xml:273(para)
 msgid ""
 "Click on red: the red layer is selected, with a small square in every corner."
 msgstr ""
 "Pulsar sobre rojo: la capa roja estÃ¡ seleccionada, con un cuadrado pequeÃ±o "
 "en las esquinas."
 
-#: src/toolbox/tool-align.xml:308(phrase)
+#: src/toolbox/tool-align.xml:281(title)
 msgid "Red layer aligned"
 msgstr "Capa roja alineada"
 
-#: src/toolbox/tool-align.xml:315(para)
+#: src/toolbox/tool-align.xml:287(para)
 #, fuzzy
 msgid ""
 "We chose <quote>Selection</quote> as a target and we clicked on the "
 "<guiicon><inlinegraphic fileref=\"images/tool-options/stock-gravity-east-24."
-"png\"/></guiicon> button (Related to). The red layer is aligned with the "
-"right side of the selection."
+"png\"/></guiicon> button (Related to). The red layer alignes with the right "
+"side of the selection."
 msgstr ""
 "Elegimos una <quote>SelecciÃ³n</quote> como objetivo y pulsamos sobre el "
 "botÃ³n <guiicon><inlinegraphic fileref=\"../images/tool-options/stock-gravity-"
 "east-24.png\"/></guiicon> (Relativo a). La capa roja se alinea en el lado "
 "derecho de la selecciÃ³n."
 
-#: src/toolbox/tool-align.xml:326(phrase)
+#: src/toolbox/tool-align.xml:299(title)
 msgid "Distribute with offset"
 msgstr "Distribuir con desplazamiento"
 
-#: src/toolbox/tool-align.xml:333(para)
+#: src/toolbox/tool-align.xml:305(para)
 #, fuzzy
 msgid ""
 "We set Offset to -5, we chose <quote>Active layer</quote> as a target and we "
@@ -12367,11 +11370,11 @@ msgstr ""
 "La capa se alinea 5 pÃxeles antes del lado derecho de la capa amarilla "
 "activa."
 
-#: src/toolbox/tool-align.xml:345(phrase)
+#: src/toolbox/tool-align.xml:318(title)
 msgid "Align using rubber-band box"
 msgstr "Alineado usando la selecciÃ³n elÃ¡stica"
 
-#: src/toolbox/tool-align.xml:352(para)
+#: src/toolbox/tool-align.xml:324(para)
 msgid ""
 "We clicked left from and above the red layer, and dragged out a region "
 "covering the red and the yellow layer by moving the pointer towards the "
@@ -12381,12 +11384,12 @@ msgstr ""
 "regiÃ³n cubriendo las capas roja y amarilla, moviendo el puntero hacia abajo "
 "y a la derecha."
 
-#: src/toolbox/tool-align.xml:364(para)
+#: src/toolbox/tool-align.xml:336(para)
 #, fuzzy
 msgid ""
 "Again, <guilabel>Selection</guilabel> is the target. After a click on the "
 "<guiicon><inlinegraphic fileref=\"images/tool-options/stock-gravity-west-24."
-"png\"/></guiicon> button, both layers are aligned with the left side of the "
+"png\"/></guiicon> button, both layers aligne with the left side of the "
 "selection."
 msgstr ""
 "Otra vez, <guilabel>SelecciÃ³n</guilabel> es el objetivo. DespuÃ©s una "
@@ -12394,48 +11397,20 @@ msgstr ""
 "options/stock-gravity-west-24.png\"/></guiicon> , se alinean ambas capas en "
 "el lado izquierdo de la selecciÃ³n."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-airbrush.xml:39(None)
-msgid ""
-"@@image: 'images/toolbox/toolbox-airbrush.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-airbrush.xml:62(None)
-#: src/toolbox/tool-airbrush.xml:120(None)
-msgid ""
-"@@image: 'images/toolbox/stock-tool-airbrush-22.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-airbrush.xml:113(None)
-msgid ""
-"@@image: 'images/toolbox/tool-options-airbrush.png'; md5=THIS FILE DOESN'T "
-"EXIST"
-msgstr ""
-
-#: src/toolbox/tool-airbrush.xml:18(date)
-msgid "2006-02-05"
-msgstr "2006-08-06"
-
-#: src/toolbox/tool-airbrush.xml:24(phrase)
+#: src/toolbox/tool-airbrush.xml:15(title)
 msgid "Airbrush Tool"
 msgstr "El aerÃ³grafo"
 
-#: src/toolbox/tool-airbrush.xml:27(primary)
-#: src/toolbox/tool-airbrush.xml:31(secondary)
+#: src/toolbox/tool-airbrush.xml:17(primary)
+#: src/toolbox/tool-airbrush.xml:21(secondary)
 msgid "Airbrush"
 msgstr ""
 
-#: src/toolbox/tool-airbrush.xml:35(phrase)
+#: src/toolbox/tool-airbrush.xml:25(title)
 msgid "The Airbrush tool in Toolbox"
 msgstr "El aerÃ³grafo en la caja de herramientas"
 
-#: src/toolbox/tool-airbrush.xml:43(para)
+#: src/toolbox/tool-airbrush.xml:33(para)
 msgid ""
 "The Airbrush tool emulates a traditional airbrush. This tool is suitable for "
 "painting soft areas of color."
@@ -12443,38 +11418,45 @@ msgstr ""
 "La herramienta aerÃ³grafo emula a un aerÃ³grafo tradicional. Con esta "
 "herramienta se pueden pintar Ã¡reas de color suavemente."
 
-#: src/toolbox/tool-airbrush.xml:51(para)
+#: src/toolbox/tool-airbrush.xml:39(para)
 msgid "You can activate the Airbrush tool in several ways :"
 msgstr ""
 
-#: src/toolbox/tool-airbrush.xml:54(para)
+#: src/toolbox/tool-airbrush.xml:42(para)
+#, fuzzy
+#| msgid ""
+#| "From the image menu through <menuchoice><guimenu>Tools</"
+#| "guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Clone</"
+#| "guimenuitem></menuchoice>."
 msgid ""
-"From the image-menu, through : <menuchoice><guimenu><accel>T</accel>ools</"
-"guimenu><guisubmenu><accel>P</accel>aint Tools</"
-"guisubmenu><guimenuitem><accel>A</accel>irbrush</guimenuitem></menuchoice>"
+"From the image-menu, through : <menuchoice><guimenu>Tools</"
+"guimenu><guisubmenu>PaintTools</guisubmenu><guimenuitem>Airbrush</"
+"guimenuitem></menuchoice>"
 msgstr ""
-"El aerÃ³grafo puede activarse desde el menÃº de la imagen: "
-"<guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
-"<guimenuitem>Herramientas de <accel>p</accel>intura </guimenuitem>/"
-"<guimenuitem><accel>A</accel>erÃ³grafo. </guimenuitem>"
+"<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+"pintura</guisubmenu><guimenuitem>Clonar</guimenuitem></menuchoice>; tambiÃ©n "
+"puede activarse clicando en el icono: <guiicon-placeholder/>; o desde el "
+"teclado usando el atajo <keycap>c</keycap>, o <keycap>S</keycap> en "
+"GIMP-2.10."
 
-#: src/toolbox/tool-airbrush.xml:60(para)
-msgid "By clicking on the tool icon: <placeholder-1/> in the Toolbox,"
+#: src/toolbox/tool-airbrush.xml:52(para)
+msgid ""
+"By clicking on the tool icon: <guiicon><inlinegraphic fileref=\"images/"
+"toolbox/stock-tool-airbrush-22.png\"/></guiicon> in the Toolbox,"
 msgstr ""
-"La herramienta tambiÃ©n puede activarse clicando en el icono: <placeholder-1/>"
 
-#: src/toolbox/tool-airbrush.xml:67(para)
+#: src/toolbox/tool-airbrush.xml:61(para)
 msgid "By using the <keycap>A</keycap> keyboard shortcut."
 msgstr ""
 
-#: src/toolbox/tool-airbrush.xml:83(para)
+#: src/toolbox/tool-airbrush.xml:76(para)
 msgid ""
 "<keycap>Ctrl</keycap> changes the airbrush to a <link linkend=\"gimp-tool-"
 "color-picker\">Color Picker</link>."
 msgstr ""
 "<keycap>Ctrl</keycap> cambia del aerÃ³grafo a la herramienta Recoge color."
 
-#: src/toolbox/tool-airbrush.xml:93(para)
+#: src/toolbox/tool-airbrush.xml:86(para)
 msgid ""
 "<keycap>Shift</keycap> places the airbrush into straight line mode. Holding "
 "<keycap>Shift</keycap> while clicking <mousebutton>Button 1</mousebutton> "
@@ -12487,19 +11469,21 @@ msgstr ""
 "consecutivos continuarÃ¡n dibujando lÃneas rectas que se originarÃ¡n a partir "
 "del final de la lÃnea anterior."
 
-#: src/toolbox/tool-airbrush.xml:109(phrase)
+#: src/toolbox/tool-airbrush.xml:100(title)
 msgid "Airbrush options"
 msgstr "Opciones del aerÃ³grafo"
 
-#: src/toolbox/tool-airbrush.xml:117(para)
+#: src/toolbox/tool-airbrush.xml:112(term)
+#, fuzzy
+#| msgid ""
+#| "Mode; Opacity; Brush; Scale; Pressure Sensibility; Fade Out; Apply "
+#| "Jitter; use Color from Gradient"
 msgid ""
-"The available tool options can be accessed by double-clicking the airbrush "
-"Tool icon. <placeholder-1/>"
-msgstr ""
-"Las opciones disponibles para esta herramienta pueden ser accedidas "
-"realizando doble clic sobre su icono. <placeholder-1/>"
+"Mode; Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply Jitter; Use "
+"color from gradient"
+msgstr "Opacidad"
 
-#: src/toolbox/tool-airbrush.xml:126(para)
+#: src/toolbox/tool-airbrush.xml:123(para)
 msgid ""
 "The <guilabel>Rate</guilabel> slider adjusts the speed of color application "
 "that the airbrush paints. A higher setting will produce darker brush strokes "
@@ -12509,11 +11493,11 @@ msgstr ""
 "el color del aerÃ³grafo. Un valor alto producirÃ¡ trazos mÃ¡s oscuros en menos "
 "tiempo."
 
-#: src/toolbox/tool-airbrush.xml:135(term)
+#: src/toolbox/tool-airbrush.xml:132(term)
 msgid "Pressure"
 msgstr "PresiÃ³n"
 
-#: src/toolbox/tool-airbrush.xml:137(para)
+#: src/toolbox/tool-airbrush.xml:134(para)
 msgid ""
 "This slider controls the amount of color that the airbrush paints. A higher "
 "setting here will result in darker strokes."
@@ -12525,35 +11509,11 @@ msgstr ""
 msgid "Other"
 msgstr "Otras herramientas"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/intro.xml:132(None)
-msgid "@@image: 'images/toolbox/reg-button.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/intro.xml:154(None)
-msgid "@@image: 'images/toolbox/resto-button.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/intro.xml:176(None)
-msgid "@@image: 'images/toolbox/del-button.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/intro.xml:197(None)
-msgid "@@image: 'images/toolbox/reset-button.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-
-#: src/toolbox/intro.xml:23(phrase)
+#: src/toolbox/intro.xml:14(title)
 msgid "The Toolbox"
 msgstr "La caja de herramientas"
 
-#: src/toolbox/intro.xml:28(para)
+#: src/toolbox/intro.xml:20(para)
 msgid ""
 "The <acronym>GIMP</acronym> provides a comprehensive toolbox in order to "
 "quickly perform basic tasks such as making selections or drawing paths. The "
@@ -12565,6 +11525,20 @@ msgstr ""
 "dibujar rutas. Todas las herramientas contenidas en la caja del "
 "<acronym>GIMP</acronym> son discutidas en detalle aquÃ."
 
+#: src/toolbox/intro.xml:26(para)
+msgid ""
+"(In case you're curious, in GIMP lingo a \"tool\" is a way of acting on an "
+"image that requires access to its display, either to let you indicate what "
+"you want to do by moving the pointer around inside the display, or to show "
+"you interactively the results of changes that you have made. But if you want "
+"to think of a tool as a saw, and an image as a piece of wood, it probably "
+"won't do you a great deal of harm.)"
+msgstr ""
+"Por si acaso le interesa, en el dialecto del GIMP una \"herramienta\" es una "
+"forma de actuar sobre una imagen que requiere acceso a la pantalla, ya sea "
+"para que indique quÃ© quiere hacer moviendo el puntero, o para mostrar "
+"interactivamente los resultados de cambios que ha hecho."
+
 #: src/toolbox/intro.xml:34(para)
 msgid ""
 "GIMP has a diverse assortment of tools that let you perform a large variety "
@@ -12589,27 +11563,22 @@ msgstr ""
 "cuatro categorÃas anteriores."
 
 #: src/toolbox/intro.xml:46(para)
-msgid ""
-"(In case you're curious, in GIMP lingo a \"tool\" is a way of acting on an "
-"image that requires access to its display, either to let you indicate what "
-"you want to do by moving the pointer around inside the display, or to show "
-"you interactively the results of changes that you have made. But if you want "
-"to think of a tool as a saw, and an image as a piece of wood, it probably "
-"won't do you a great deal of harm.)"
-msgstr ""
-"Por si acaso le interesa, en el dialecto del GIMP una \"herramienta\" es una "
-"forma de actuar sobre una imagen que requiere acceso a la pantalla, ya sea "
-"para que indique quÃ© quiere hacer moviendo el puntero, o para mostrar "
-"interactivamente los resultados de cambios que ha hecho."
-
-#: src/toolbox/intro.xml:54(para)
+#, fuzzy
+#| msgid ""
+#| "Most tools can be activated by clicking on an icon in the Toolbox. Some, "
+#| "however (namely, the Color tools), are accessible only via the menus, "
+#| "either as <emphasis>Tools-&gt;Color Tools</emphasis> or as "
+#| "<emphasis>Layer-&gt;Colors</emphasis>. Every tool, in fact, can be "
+#| "activated from the <emphasis>Tools</emphasis> menu; also, every tool can "
+#| "be activated from the keyboard using an accelerator key."
 msgid ""
 "Most tools can be activated by clicking on an icon in the Toolbox. Some, "
 "however (namely, the Color tools), are accessible only via the menus, either "
-"as <emphasis>Tools-&gt;Color Tools</emphasis> or as <emphasis>Layer-&gt;"
-"Colors</emphasis>. Every tool, in fact, can be activated from the "
-"<emphasis>Tools</emphasis> menu; also, every tool can be activated from the "
-"keyboard using an accelerator key."
+"as <menuchoice><guimenu>Colors</guimenu></menuchoice> or as "
+"<menuchoice><guimenu>Tools</guimenu><guisubmenu>Colors</guisubmenu></"
+"menuchoice>. Every tool, in fact, can be activated from the <emphasis>Tools</"
+"emphasis> menu; also, every tool can be activated from the keyboard using an "
+"accelerator key."
 msgstr ""
 "La mayorÃa de las herramientas se pueden activar haciendo clic en la caja de "
 "herramientas. Algunas, sin embargo (las herramientas de color), son "
@@ -12644,23 +11613,32 @@ msgstr ""
 "barra de menÃº de la imagen."
 
 #: src/toolbox/intro.xml:74(para)
+#, fuzzy
+#| msgid ""
+#| "The shape of the cursor changes when it is inside an image, to one that "
+#| "indicates which tool is active (if in <guimenu>Preferences</guimenu> you "
+#| "have set <menuchoice><guimenu>Image Windows</guimenu><guisubmenu>Mouse "
+#| "Pointers</guisubmenu><guimenuitem>Pointer mode</"
+#| "guimenuitem><guimenuitem>Tool icon</guimenuitem></menuchoice> )."
 msgid ""
 "The shape of the cursor changes when it is inside an image, to one that "
 "indicates which tool is active (if in <guimenu>Preferences</guimenu> you "
 "have set <menuchoice><guimenu>Image Windows</guimenu><guisubmenu>Mouse "
 "Pointers</guisubmenu><guimenuitem>Pointer mode</"
-"guimenuitem><guimenuitem>Tool icon</guimenuitem></menuchoice> )."
+"guimenuitem><guimenuitem>Tool icon</guimenuitem></menuchoice>)."
 msgstr ""
 "La forma del cursor cambia cuando se estÃ¡ dentro de una imagen, a una que "
 "indica cuÃ¡l herramienta estÃ¡ activa."
 
-#: src/toolbox/intro.xml:87(phrase)
-msgid "Tool Options dialog for the Rectangle Select tool."
+#: src/toolbox/intro.xml:90(title)
+#, fuzzy
+#| msgid "Tool Options dialog for the Rectangle Select tool."
+msgid "Tool Options dialog for the Rectangle Select tool"
 msgstr ""
 "El diÃ¡logo de opciones de herramienta para la herramienta de selecciÃ³n "
 "rectangular."
 
-#: src/toolbox/intro.xml:97(para)
+#: src/toolbox/intro.xml:98(para)
 msgid ""
 "If you have things set up like most people do, activating a tool causes its "
 "Tool Options dialog to appear below the Toolbox. If you don't have things "
@@ -12673,11 +11651,19 @@ msgstr ""
 "deberÃa: es muy dificultoso usar herramientas de forma efectiva sin poder "
 "cambiar sus opciones."
 
-#: src/toolbox/intro.xml:104(para)
+#: src/toolbox/intro.xml:105(para)
+#, fuzzy
+#| msgid ""
+#| "The Tool Options appear beneath the Toolbox in the default setup. If you "
+#| "lose it somehow, you can get it back by creating a new Tool Options "
+#| "dialog using <menuchoice><guimenu>File</guimenu><guisubmenu>Dialogs</"
+#| "guisubmenu><guimenuitem>Tool Options</guimenuitem></menuchoice> and then "
+#| "docking it below the Toolbox. See the section on <link linkend=\"gimp-"
+#| "concepts-docks\">Dialogs and Docking</link> if you need help."
 msgid ""
 "The Tool Options appear beneath the Toolbox in the default setup. If you "
 "lose it somehow, you can get it back by creating a new Tool Options dialog "
-"using <menuchoice><guimenu>File</guimenu><guisubmenu>Dialogs</"
+"using <menuchoice><guimenu>Windows</guimenu><guisubmenu>Dockable Dialogs</"
 "guisubmenu><guimenuitem>Tool Options</guimenuitem></menuchoice> and then "
 "docking it below the Toolbox. See the section on <link linkend=\"gimp-"
 "concepts-docks\">Dialogs and Docking</link> if you need help."
@@ -12690,7 +11676,7 @@ msgstr ""
 "linkend=\"gimp-concepts-docks\">diÃ¡logos empotrables</link> si necesita "
 "ayuda sobre Ã©stos."
 
-#: src/toolbox/intro.xml:114(para)
+#: src/toolbox/intro.xml:119(para)
 msgid ""
 "Each tool has its own specific set of options. The choices you make for them "
 "are kept throughout the session, until you change them. In fact, the tool "
@@ -12709,17 +11695,17 @@ msgstr ""
 "recuerda que ha estado usando una opciÃ³n inusual la Ãºltima vez que trabajÃ³ "
 "con ella, dos semanas atrÃ¡s."
 
-#: src/toolbox/intro.xml:123(para)
+#: src/toolbox/intro.xml:128(para)
 msgid "At the bottom of the Tool Options dialog appear four buttons:"
 msgstr ""
 "En la parte inferior del diÃ¡logo de opciones de herramientas hay cuatro "
 "botones:"
 
-#: src/toolbox/intro.xml:136(phrase)
+#: src/toolbox/intro.xml:141(phrase)
 msgid "Save Options to"
 msgstr "Guardar opciones en"
 
-#: src/toolbox/intro.xml:139(para)
+#: src/toolbox/intro.xml:144(para)
 msgid ""
 "This button allows you to save the settings for the current tool, so that "
 "you can restore them later. It brings up a small dialog allowing you to give "
@@ -12734,11 +11720,11 @@ msgstr ""
 "tiene que preocuparse por incluir el nombre de la herramienta cuando asigne "
 "el nombre."
 
-#: src/toolbox/intro.xml:158(phrase)
+#: src/toolbox/intro.xml:163(phrase)
 msgid "Restore Options"
 msgstr "Recuperar opciones"
 
-#: src/toolbox/intro.xml:161(para)
+#: src/toolbox/intro.xml:166(para)
 msgid ""
 "This button allows you to restore a previously saved set of options for the "
 "active tool. If no option-sets have ever been saved for the active tool, the "
@@ -12752,11 +11738,11 @@ msgstr ""
 "aparecerÃ¡ un menÃº mostrando los nombres de los conjuntos de opciones "
 "guardados: escogendo una entrada del menÃº aplicarÃ¡ esas opciones."
 
-#: src/toolbox/intro.xml:180(phrase)
+#: src/toolbox/intro.xml:185(phrase)
 msgid "Delete Options"
 msgstr "Borrar las opciones guardadas"
 
-#: src/toolbox/intro.xml:183(para)
+#: src/toolbox/intro.xml:188(para)
 msgid ""
 "This button allows you to delete a previously saved set of options for the "
 "active tool. If no option-sets have ever been saved for the active tool, the "
@@ -12770,18 +11756,18 @@ msgstr ""
 "aparecerÃ¡ un menÃº mostrando los nombres de los conjuntos de opciones "
 "guardados: escogiendo una entrada del menÃº borrarÃ¡ esa configuraciÃ³n."
 
-#: src/toolbox/intro.xml:201(phrase)
+#: src/toolbox/intro.xml:206(phrase)
 msgid "Reset Options"
 msgstr "Reiniciar con los valores predephraseinados"
 
-#: src/toolbox/intro.xml:204(para)
+#: src/toolbox/intro.xml:209(para)
 msgid ""
 "This button resets the options for the active tool to their default values."
 msgstr ""
 "Este botÃ³n reinicia las opciones de la herramienta activa a sus valores por "
 "defecto."
 
-#: src/toolbox/about-common-transform-options.xml:16(para)
+#: src/toolbox/about-common-transform-options.xml:8(para)
 msgid ""
 "These options are described in <link linkend=\"gimp-tool-transform"
 "\">Transform tools common options</link>."
@@ -12789,7 +11775,7 @@ msgstr ""
 "Estas opciones estÃ¡n descritas en <link linkend=\"gimp-tool-transform"
 "\">Opciones comunes de las herramientas de transformaciÃ³n</link>."
 
-#: src/toolbox/about-common-select-options.xml:17(para)
+#: src/toolbox/about-common-select-options.xml:8(para)
 msgid ""
 "See <link linkend=\"gimp-tool-select\">Selection Tools</link> for help with "
 "options that are common to all these tools. Only options that are specific "
@@ -12800,7 +11786,7 @@ msgstr ""
 "herramientas de este grupo. AquÃ sÃ³lo se explican las opciones especÃficas a "
 "la herramienta de selecciÃ³n rectangular."
 
-#: src/toolbox/about-common-select-modifiers.xml:18(para)
+#: src/toolbox/about-common-select-modifiers.xml:8(para)
 msgid ""
 "See <link linkend=\"gimp-tool-select\">Selection Tools</link> for help with "
 "modifier keys that affect all these tools in the same way. Only effects "
@@ -12811,13 +11797,13 @@ msgstr ""
 "herramientas de la misma forma. SÃ³lo los efectos especÃficos a la "
 "herramienta de selecciÃ³n rectangular son explicados aquÃ."
 
-#: src/toolbox/about-common-painting-options.xml:16(para)
+#: src/toolbox/about-common-painting-options.xml:8(para)
 msgid ""
 "See the <link linkend=\"gimp-tool-painting\">Painting Tools Overview</link> "
 "for a description of tool options that apply to many or all painting tools."
 msgstr ""
 
-#: src/toolbox/about-common-brush-options.xml:18(para)
+#: src/toolbox/about-common-brush-options.xml:9(para)
 msgid ""
 "See the <link linkend=\"gimp-tool-brush-options\">Brush Tools Overview</"
 "link> for a description of tool options that apply to many or all brush "
@@ -12827,7 +11813,973 @@ msgstr ""
 "\">herramientas de brocha</link> para obtener informaciÃ³n sobre las opciones "
 "que se aplican a todas o a varias de estas herramientas."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: src/toolbox/about-common-brush-options.xml:0(None)
-msgid "translator-credits"
-msgstr ""
+#, fuzzy
+#~ msgid "j.h"
+#~ msgstr ""
+#~ "#-#-#-#-#  intro.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-airbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  toolbox-color-area.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuq\n"
+#~ "#-#-#-#-#  tool-brightness-contrast.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-color-balance.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-colorize.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-convolve.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-curves.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-dodge-burn.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-eraser.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-foreground-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-hue-saturation.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "m.q\n"
+#~ "#-#-#-#-#  tool-levels.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-move.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-paintbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuq\n"
+#~ "#-#-#-#-#  tool-pencil.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-posterize.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-shear.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI\n"
+#~ "#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tools-painting.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "manuelq\n"
+#~ "#-#-#-#-#  tool-threshold.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "AntI"
+
+#, fuzzy
+#~ msgid "Activate the Tool"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-airbrush.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-align.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-blend.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-brightness-contrast.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-color-balance.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-colorize.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar herramienta\n"
+#~ "#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-curves.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-dodge-burn.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-hue-saturation.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n la herramienta\n"
+#~ "#-#-#-#-#  tool-levels.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar herramienta\n"
+#~ "#-#-#-#-#  tool-move.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar herramienta\n"
+#~ "#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar\n"
+#~ "#-#-#-#-#  tool-posterize.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta\n"
+#~ "#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar\n"
+#~ "#-#-#-#-#  tool-shear.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar\n"
+#~ "#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-threshold.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Activar la herramienta"
+
+#~ msgid ""
+#~ "The <guilabel>Interpolation</guilabel> drop-down list lets you choose the "
+#~ "quality of the transformation. For more information about the different "
+#~ "methods that can be employed, see the glossary entry <link linkend="
+#~ "\"glossary-interpolation\">Interpolation</link>."
+#~ msgstr ""
+#~ "La lista desplegable de <guilabel>InterpolaciÃ³n</guilabel> permite elegir "
+#~ "la calidad de la transformaciÃ³n. Para mÃ¡s informaciÃ³n sobre los "
+#~ "diferentes mÃ©todos que se pueden emplear, mirar la entrada del glosario "
+#~ "<link linkend=\"glossary-interpolation\">InterpolaciÃ³n</link>."
+
+#~ msgid ""
+#~ "Preview is only for greater convenience. Whatever your choice, result "
+#~ "will be the same when you validate the transformation."
+#~ msgstr ""
+#~ "La vista previa estÃ¡ para mayor comodidad. Independientemente de su "
+#~ "elecciÃ³n, el resultado serÃ¡ el mismo que si pulsa sobre el botÃ³n "
+#~ "<emphasis>Rotar</emphasis> en el diÃ¡logo de informaciÃ³n de rotar."
+
+#~ msgid "2008-01-05"
+#~ msgstr "2007-04-15"
+
+#~ msgid ""
+#~ "You can access this tool from the image menu through "
+#~ "<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</"
+#~ "accel>olor Tools</guisubmenu><guimenuitem><accel>T</accel>hreshold,</"
+#~ "guimenuitem></menuchoice>,"
+#~ msgstr ""
+#~ "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</"
+#~ "accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>c</"
+#~ "accel>olor</guisubmenu><guimenuitem><accel>U</accel>mbral</guimenuitem></"
+#~ "menuchoice>"
+
+#, fuzzy
+#~ msgid "2006-02-18"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-scale.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-21\n"
+#~ "#-#-#-#-#  tools-painting.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2006-08-06"
+
+#~ msgid "2008-01-06"
+#~ msgstr "2006-08-06"
+
+#~ msgid ""
+#~ "Through <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>P</accel>aint Tools</"
+#~ "guisubmenu><guimenuitem><accel>S</accel>mudge.</guimenuitem></menuchoice> "
+#~ "in the image menu."
+#~ msgstr ""
+#~ "La herramienta para borronear puede activarse desde el menÃº de la imagen: "
+#~ "<menuchoice><guimenu><accel>H</accel>erramientas</"
+#~ "guimenu><guisubmenu>Herramientas de <accel>p</accel>intura</"
+#~ "guisubmenu><guimenuitem><accel>E</accel>mborronar.</guimenuitem></"
+#~ "menuchoice>"
+
+#, fuzzy
+#~ msgid "By clicking on the tool icon: <placeholder-1/> in Toolbox."
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "La herramienta tambiÃ©n puede activarse clicando en el Ãcono: "
+#~ "<placeholder-1/>\n"
+#~ "#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "TambiÃ©n puede activarse clicando en el icono: <placeholder-1/>"
+
+#~ msgid ""
+#~ "The available tool options for the Smudge Tool can be accessed by double "
+#~ "clicking the Smudge Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para la herramienta para borronear pueden "
+#~ "accederese haciendo doble clic en su Ãcono. <placeholder-1/>"
+
+#~ msgid "2008-03-02"
+#~ msgstr "2007-04-22"
+
+#~ msgid "You can get to Shear tool in several ways :"
+#~ msgstr "Puede seleccionar la herramienta de varias maneras:"
+
+#, fuzzy
+#~ msgid "By clicking the tool icon: <placeholder-1/> in Toolbox,"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
+#~ "herramientas,\n"
+#~ "#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "haciendo clic en el icono <placeholder-1/> de la caja de herramientas,\n"
+#~ "#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
+#~ "herramientas,\n"
+#~ "#-#-#-#-#  tool-shear.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Pulsando sobre el icono de la heramienta: <placeholder-1/> en la caja de "
+#~ "herramientas,"
+
+#~ msgid ""
+#~ "The available tool options for the Shear Tool can be accessed by double "
+#~ "clicking the Shear Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede acceder a las opciones disponibles de la herramienta inclinar "
+#~ "mediante una doble pulsaciÃ³n sobre el icono de la herramienta. "
+#~ "<placeholder-1/>"
+
+#~ msgid "Affect; Interpolation; Transform Direction; Clip Result; Preview"
+#~ msgstr ""
+#~ "Afectar; interpolaciÃ³n; direcciÃ³n de la transformaciÃ³n; supermuestreo; "
+#~ "resultado del recorte; vista previa"
+
+#~ msgid "Additional information"
+#~ msgstr "InformaciÃ³n adicional"
+
+#~ msgid ""
+#~ "When moving a selection beyond the boundaries of the image canvas, the "
+#~ "selection will be cropped to the image area. Selections can exist on the "
+#~ "visible canvas only. Selection movements and changes are, however, kept "
+#~ "in the undo buffer should you need to repair an error."
+#~ msgstr ""
+#~ "Al mover una selecciÃ³n mas allÃ¡ de los contornos de la imagen, la "
+#~ "selecciÃ³n serÃ¡ recortada al Ã¡rea de la imagen. Las selecciones pueden "
+#~ "existir solamente sobre el Ã¡rea visible. Sin embargo, los movimientos de "
+#~ "la selecciÃ³n y sus cambios se conservan en el historial de deshacer, en "
+#~ "caso de que se necesite revertir un error."
+
+#~ msgid ""
+#~ "You can access the Scale tool from the image-menu through: "
+#~ "<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</"
+#~ "accel>ransform Tools</guisubmenu><guimenuitem><accel>S</accel>cale</"
+#~ "guimenuitem></menuchoice>,"
+#~ msgstr ""
+#~ "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</accel>eramientas</"
+#~ "guimenu><guisubmenu>Herramientas de <accel>t</accel>ransformaciÃ³n</"
+#~ "guisubmenu><guimenuitem>E<accel>s</accel>calar</guimenuitem></menuchoice>"
+
+#~ msgid "or by clicking the tool icon: <placeholder-1/> in the Toolbox,"
+#~ msgstr "Pulsando sobre el icono de la herramienta: <placeholder-1/>"
+
+#~ msgid "Scale tool options"
+#~ msgstr "Opciones de la herramienta escalar"
+
+#~ msgid ""
+#~ "The available tool options for the Scale Tool can be accessed by double "
+#~ "clicking the Scale Tool icon <placeholder-1/> in Toolbox."
+#~ msgstr ""
+#~ "Se puede acceder a las opciones disponibles para la herramienta escalar "
+#~ "con una doble pulsaciÃ³n sobre el icono de la herramienta <placeholder-1/> "
+#~ "en la caja de herramientas."
+
+#, fuzzy
+#~ msgid "2008-01-13"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-color-balance.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-14\n"
+#~ "#-#-#-#-#  tool-perspective.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-22\n"
+#~ "#-#-#-#-#  tool-rotate.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-19"
+
+#~ msgid ""
+#~ "You can can access the Rotate tool from the image-menu through: "
+#~ "<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</"
+#~ "accel>ransform Tools</guisubmenu><guimenuitem><accel>R</accel>otate</"
+#~ "guimenuitem></menuchoice>,"
+#~ msgstr ""
+#~ "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</"
+#~ "accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>t</"
+#~ "accel>ransformaciÃ³n</guisubmenu><guimenuitem><accel>R</accel>otar</"
+#~ "guimenuitem></menuchoice>"
+
+#~ msgid "or by clicking the tool icon: <placeholder-1/> in the Toolbox."
+#~ msgstr ""
+#~ "Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
+#~ "herramientas."
+
+#~ msgid ""
+#~ "The available tool options for the Rotate Tool can be accessed by double "
+#~ "clicking the Rotate Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede acceder a las opciones de la herramienta rotar mediante una "
+#~ "doble pulsaciÃ³n sobre el icono de la herramienta. <placeholder-1/>"
+
+#~ msgid "2008-03-19"
+#~ msgstr "2006-10-13"
+
+#~ msgid "JPL"
+#~ msgstr "manuelq"
+
+#~ msgid ""
+#~ "If you want a rectangular selection with convex rounded corners, check "
+#~ "the option <guilabel>Rounded Corners</guilabel> ; you can choose radius "
+#~ "of rounded corners with the cursor. If you want concave rounded corners, "
+#~ "use <menuchoice><guimenu>Select</guimenu><guimenuitem>Rounded Rectangle</"
+#~ "guimenuitem></menuchoice> from the image menu, <guilabel>Concave</"
+#~ "guilabel> and choose radius of rounded corners with the cursor."
+#~ msgstr ""
+#~ "Si desea redondear las esquinas de una selecciÃ³n rectangular, el mÃ©todo "
+#~ "mÃ¡s fÃ¡cil es emplear <menuchoice><guimenu>Seleccionar</"
+#~ "guimenu><guimenuitem>RectÃ¡ngulo redondeado</guimenuitem></menuchoice> del "
+#~ "menÃº de la imagen."
+
+#, fuzzy
+#~ msgid "How to Activate"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-by-color-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-clone.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de herramienta\n"
+#~ "#-#-#-#-#  tool-convolve.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-ellipse-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-eraser.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-free-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-fuzzy-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-iscissors.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta\n"
+#~ "#-#-#-#-#  tool-rect-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "ActivaciÃ³n de la herramienta"
+
+#~ msgid "By clicking on the tool icon <placeholder-1/> in the ToolBox,"
+#~ msgstr "Clicando en el icono <placeholder-1/> de la caja de herramientas."
+
+#~ msgid "2008-01-28"
+#~ msgstr "2007-04-15"
+
+#~ msgid "You can get to the Perspective tool in several ways :"
+#~ msgstr "Puede seleccionar la herramienta perspectiva de varias maneras:"
+
+#~ msgid ""
+#~ "The available tool options for the Perspective Tool can be accessed by "
+#~ "double clicking the Perspective Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede accedder a las opciones disponibles para la herramienta "
+#~ "perspectiva mediante una doble pulsaciÃ³n sobre el icono de la "
+#~ "herramienta. <placeholder-1/>"
+
+#~ msgid "Activate Tool"
+#~ msgstr "ActivaciÃ³n de la herramienta"
+
+#~ msgid "2006-02-15"
+#~ msgstr "2006-06-08"
+
+#~ msgid ""
+#~ "The Pencil Tool can be called in the following order, from the image-"
+#~ "menu: <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>P</accel>aint Tools</"
+#~ "guisubmenu><guimenuitem>Pe<accel>n</accel>cil</guimenuitem></menuchoice>"
+#~ msgstr ""
+#~ "El lÃ¡piz puede ser activado siguiendo el menÃº de la imagen en el "
+#~ "siguiente orden: <menuchoice><guimenu><accel>H</accel>erramientas</"
+#~ "guimenu><guisubmenu>Herramientas de <accel>p</accel>intura</"
+#~ "guisubmenu><guimenuitem><accel>L</accel>Ã¡piz</guimenuitem></menuchoice>"
+
+#~ msgid ""
+#~ "The Tool can also be called by clicking the tool icon: <placeholder-1/>"
+#~ msgstr ""
+#~ "La herramienta tambiÃ©n puede activarse clicando en el Ãcono: "
+#~ "<placeholder-1/>"
+
+#~ msgid "Pencil Tool options"
+#~ msgstr "Opciones del lÃ¡piz"
+
+#~ msgid ""
+#~ "The available tool options can be accessed by double clicking the Pencil "
+#~ "Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para esta herramienta pueden ser accedidas "
+#~ "realizando doble clic sobre su icono. <placeholder-1/>"
+
+#~ msgid ""
+#~ "Mode; Opacity; Brush; Scale, Pressure Sensibility; Fade Out; Apply "
+#~ "Jitter, Use Color from Gradient"
+#~ msgstr "Modo"
+
+#, fuzzy
+#~ msgid "2008-01-11"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-18\n"
+#~ "#-#-#-#-#  tool-path.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-03-27"
+
+#~ msgid "You can get to Path tool in several ways :"
+#~ msgstr "Puede activar esta herramienta de varias formas:"
+
+#~ msgid ""
+#~ "The available tool options for the Path Tool can be accessed by double "
+#~ "clicking the Path Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para la herramienta Rutas pueden accederse "
+#~ "haciendo doble clic sobre el icono <placeholder-1/>"
+
+#~ msgid ""
+#~ "As with other tools, you can delete your changes by <keycap>Ctrl-Z</"
+#~ "keycap>."
+#~ msgstr ""
+#~ "Como en las demÃ¡s herramientas, puede deshacer los cambios presionando "
+#~ "<keycap>Ctrl-Z</keycap>."
+
+#~ msgid "2006-02-10"
+#~ msgstr "2006-06-08"
+
+#~ msgid ""
+#~ "The available tool options can be accessed by double clicking the "
+#~ "Paintbrush Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para esta herramienta pueden ser accedidas "
+#~ "realizando doble clic sobre su icono. <placeholder-1/>"
+
+#~ msgid "2008-03-01"
+#~ msgstr "2007-04-17"
+
+#~ msgid ""
+#~ "You can find this tool from the image menu through: "
+#~ "<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</"
+#~ "accel>ransform Tools</guisubmenu><guimenuitem><accel>M</accel>ove</"
+#~ "guimenuitem></menuchoice>,"
+#~ msgstr ""
+#~ "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</"
+#~ "accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>t</"
+#~ "accel>ransformaciÃ³n</guisubmenu><guimenuitem><accel>M</accel>over</"
+#~ "guimenuitem></menuchoice>"
+
+#~ msgid "or by clicking the tool icon: <placeholder-1/>,"
+#~ msgstr "Pulsando el icono de la herramienta: <placeholder-1/>"
+
+#~ msgid "or by the <keycap>M</keycap> keyboard shortcut."
+#~ msgstr "o mediante el atajo de teclado <keycap>M</keycap>."
+
+#~ msgid ""
+#~ "The available tool options for Move can be found by double clicking the "
+#~ "Move Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede acceder a las opciones disponibles de la herramienta pulsando "
+#~ "dos veces sobre el icono de la herramienta mover. <placeholder-1/>"
+
+#~ msgid ""
+#~ "<guilabel>Move the current layer</guilabel> : Only the current layer will "
+#~ "be moved."
+#~ msgstr ""
+#~ "<guilabel>Mover la capa activa</guilabel> : Solo se moverÃ¡ la capa activa"
+
+#~ msgid "If Move is on layer : <placeholder-1/>"
+#~ msgstr "Si afectar estÃ¡ sobre capas : <placeholder-1/>"
+
+#~ msgid "If Move is on Path : <placeholder-1/>"
+#~ msgstr "Si afectar estÃ¡ sobre rutas : <placeholder-1/>"
+
+#, fuzzy
+#~ msgid ""
+#~ "There is only one available option for the Measure Tool which can be "
+#~ "accessed by double clicking the Measure tool icon <placeholder-1/>."
+#~ msgstr ""
+#~ "Se puede acceder a las opciones disponibles de la herramienta inclinar "
+#~ "mediante una doble pulsaciÃ³n sobre el icono de la herramienta. "
+#~ "<placeholder-1/>"
+
+#~ msgid "2008-01-17"
+#~ msgstr "2007-04-15"
+
+#~ msgid ""
+#~ "You can get to the Level Tool in the image-menu through: "
+#~ "<menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</"
+#~ "accel>olor Tools</guisubmenu><guimenuitem><accel>L</accel>evels</"
+#~ "guimenuitem></menuchoice>, or <menuchoice><guimenu>Colors</"
+#~ "guimenu><guimenuitem>Levels</guimenuitem></menuchoice>,"
+#~ msgstr ""
+#~ "En el menÃº de la imagen <menuchoice><guimenu><accel>H</accel>erramientas</"
+#~ "guimenu><guisubmenu>Herramientas de <accel>c</accel>olor</"
+#~ "guisubmenu><guimenuitem><accel>N</accel>iveles</guimenuitem></menuchoice>"
+
+#~ msgid ""
+#~ "You can select the specific channel which will be modified by the tool: "
+#~ "<placeholder-1/>"
+#~ msgstr ""
+#~ "Puede seleccionar el canal especÃfico que serÃ¡ modificado por la "
+#~ "herramienta: Valor hace cambios en la intensidad de todos los pÃxeles. "
+#~ "Los canales de color permiten cambiar la saturaciÃ³n. Canal alfa sobre la "
+#~ "transparencia. <guilabel>Reiniciar el canal</guilabel> cancela los "
+#~ "cambios en el canal seleccionado. <placeholder-1/>"
+
+#~ msgid "2008-01-09"
+#~ msgstr "2007-04-18"
+
+#~ msgid "P.P"
+#~ msgstr "manuq"
+
+#~ msgid ""
+#~ "The Intelligent Scissors can be activated from an image menu as "
+#~ "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#~ "guisubmenu><guimenuitem>Intelligent Scissors</guimenuitem></menuchoice>; "
+#~ "from the Toolbox by clicking on the tool icon <placeholder-1/> ; or from "
+#~ "the keyboard using the shortcut <keycap>i</keycap>."
+#~ msgstr ""
+#~ "Las tijeras inteligentes se pueden activar desde el menÃº de la imagen "
+#~ "siguiendo <menuchoice><guimenu>Herramientas</"
+#~ "guimenu><guisubmenu>Herramientas de selecciÃ³n</"
+#~ "guisubmenu><guimenuitem>Tijeras inteligentes</guimenuitem></menuchoice>; "
+#~ "desde la caja de herramientas clicando en el icono <placeholder-1/>; o "
+#~ "desde el teclado mediante el atajo <keycap>i</keycap>."
+
+#~ msgid ""
+#~ "The Scissor tool does not have any special key modifiers, only the ones "
+#~ "that affect all selection tools in the same way. See <xref linkend=\"gimp-"
+#~ "tool-select\"/> for help with these."
+#~ msgstr ""
+#~ "Las tijeras inteligentes no tienen teclas modificadoras especiales, sÃ³lo "
+#~ "las que afectan a todas las herramientas de selecciÃ³n de la misma manera. "
+#~ "Ã?stas se explican en la secciÃ³n sobre <link linkend=\"gimp-tool-select"
+#~ "\">herramientas de selecciÃ³n</link>."
+
+#~ msgid "2006-02-09"
+#~ msgstr "2006-08-06"
+
+#~ msgid ""
+#~ "In the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>P</accel>aint Tools</"
+#~ "guisubmenu><guimenuitem>In<accel>k</accel></guimenuitem></menuchoice>."
+#~ msgstr ""
+#~ "La tinta puede activarse desde el menÃº de la imagen: "
+#~ "<guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
+#~ "<guimenuitem>Herramientas de <accel>p</accel>intura </guimenuitem>/"
+#~ "<guimenuitem><accel>T</accel>inta .</guimenuitem>"
+
+#~ msgid ""
+#~ "You can find tool options by double clicking on the ink tool icon. "
+#~ "<placeholder-1/> in Toolbox."
+#~ msgstr ""
+#~ "Las opciones disponibles para esta herramienta pueden ser accedidas "
+#~ "realizando doble clic sobre su icono. <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "2008-01-14"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-18\n"
+#~ "#-#-#-#-#  tool-hue-saturation.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-04-14"
+
+#~ msgid "You can get to the Hue-Saturationtool in two ways :"
+#~ msgstr "Puedes obtener la herramienta tono-saturaciÃ³n de dos maneras:"
+
+#, fuzzy
+#~ msgid "2007-12-22"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-by-color-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-03-27\n"
+#~ "#-#-#-#-#  tool-ellipse-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2006-10-13\n"
+#~ "#-#-#-#-#  tool-free-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-03-27\n"
+#~ "#-#-#-#-#  tool-fuzzy-select.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "2007-03-27"
+
+#~ msgid ""
+#~ "The Magic Wand Tool can be activated from an image menu as "
+#~ "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#~ "guisubmenu><guimenuitem>Fuzzy Select</guimenuitem></menuchoice>; from the "
+#~ "Toolbox by clicking on the tool icon <placeholder-1/>; or from the "
+#~ "keyboard using the shortcut <keycap>U</keycap>."
+#~ msgstr ""
+#~ "La varita mÃ¡gica se puede activar desde el menÃº de la imagen siguiendo "
+#~ "<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+#~ "selecciÃ³n</guisubmenu><guimenuitem>SelecciÃ³n borrosa</guimenuitem></"
+#~ "menuchoice>; o desde la caja de herramientas haciendo clic sobre el icono "
+#~ "<placeholder-1/>; o por medio del atajo de teclado <keycap>z</keycap>. La "
+#~ "\"Z\" es la inicial de \"Zauber\", tÃ©rmino que en alemÃ¡n significa magia."
+
+#~ msgid ""
+#~ "The Lasso Tool can be activated from an image menu as "
+#~ "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#~ "guisubmenu><guimenuitem>Free Select</guimenuitem></menuchoice>; from the "
+#~ "Toolbox by clicking on the tool icon <placeholder-1/>; or from the "
+#~ "keyboard using the shortcut <keycap>f</keycap>."
+#~ msgstr ""
+#~ "El lazo puede activarse desde el menÃº de la imagen siguiendo "
+#~ "<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+#~ "selecciÃ³n</guisubmenu><guimenuitem>SelecciÃ³n libre</guimenuitem></"
+#~ "menuchoice>; desde la caja de herramientas haciendo clic sobre el icono "
+#~ "<placeholder-1/>; o desde el teclado por medio del atajo <keycap>f</"
+#~ "keycap>."
+
+#~ msgid ""
+#~ "You can find the lasso options by double-clicking on the <placeholder-1/> "
+#~ "icon in the Toolbox."
+#~ msgstr ""
+#~ "Puede hallar las opciones del lazo haciendo doble clic sobre su icono "
+#~ "<placeholder-1/> en la caja de herramientas."
+
+#~ msgid "2007-07-26"
+#~ msgstr "2007-09-14"
+
+#~ msgid "By clicking on the tool icon <placeholder-1/> in the Toolbox."
+#~ msgstr ""
+#~ "Pulsando sobre el icono de la herramienta <placeholder-1/> en la caja de "
+#~ "herramientas."
+
+#~ msgid ""
+#~ "<guilabel>Feather Edges</guilabel> and <guilabel>Color Sensitivity </"
+#~ "guilabel> options have been checked."
+#~ msgstr ""
+#~ "Las opciones <guilabel>Difuminar los bordes</guilabel> y "
+#~ "<guilabel>Sensibilidad de color</guilabel> han sido marcadas."
+
+#~ msgid ""
+#~ "You can get the option dialog by double-clicking on the tool icon "
+#~ "<placeholder-1/> in the toolbox:"
+#~ msgstr ""
+#~ "Puede obtener el diÃ¡logo opciones mediante una doble pulsaciÃ³n sobre el "
+#~ "icono de la herramienta <placeholder-1/> en la caja de herramientas:"
+
+#~ msgid "You can get to the Flip tool in several ways :"
+#~ msgstr "Puede seleccionar la herramienta invertir de varias maneras:"
+
+#, fuzzy
+#~ msgid "Shortcut"
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-crop.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Atajos de teclado\n"
+#~ "#-#-#-#-#  tool-flip.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Atajos"
+
+#~ msgid ""
+#~ "The <keycombo><keycap>Shift</keycap><keycap>F</keycap></keycombo> key "
+#~ "combination will change the active tool to Flip."
+#~ msgstr ""
+#~ "La combinaciÃ³n de teclas <keycombo><keycap>Mayus</keycap><keycap>f</"
+#~ "keycap></keycombo> cambiarÃ¡ la herramienta actual a la herramienta "
+#~ "invertir."
+
+#~ msgid ""
+#~ "The available tool options for the Flip Tool can be accessed by double "
+#~ "clicking the Flip Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede acceder a las opciones disponibles para la herramienta invertir "
+#~ "mediante una doble pulsaciÃ³n sobre el icono de la herramienta. "
+#~ "<placeholder-1/>"
+
+#~ msgid "2006-06-04"
+#~ msgstr "2006-08-06"
+
+#~ msgid "You can activate the Eraser tool in several ways :"
+#~ msgstr ""
+#~ "La goma puede ser activada siguiendo el menÃº de imagen en el siguiente "
+#~ "orden: <menuchoice><guimenu>Herramientas</"
+#~ "guimenu><guisubmenu>Herramientas de pintura</guisubmenu><guimenuitem>Goma "
+#~ "de borrar</guimenuitem></menuchoice>; y tambiÃ©n puede activarse clicando "
+#~ "en el Ãcono: <placeholder-1/>; o presionando la tecla de atajo <keycap>E</"
+#~ "keycap>."
+
+#~ msgid ""
+#~ "An annoying feature: on a layer you have created with a transparent "
+#~ "background, using anti-erasing on non-painted areas paints with black!"
+#~ msgstr ""
+#~ "Una propiedad enojosa: al utilizar el anti-borrado sobre las Ã¡reas no "
+#~ "pintadas de una capa creada con un fondo transparente Â¡se pinta con negro!"
+
+#~ msgid ""
+#~ "The Ellipse Selection Tool can be activated from an image menu as "
+#~ "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#~ "guisubmenu><guimenuitem>Ellipse Select</guimenuitem></menuchoice>; from "
+#~ "the Toolbox by clicking on the tool icon <placeholder-1/>; or from the "
+#~ "keyboard by using the <keycap>e</keycap> shortcut."
+#~ msgstr ""
+#~ "La herramienta de selecciÃ³n elÃptica se puede activar seleccionando "
+#~ "<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+#~ "selecciÃ³n</guisubmenu><guimenuitem>SelecciÃ³n elÃptica</guimenuitem></"
+#~ "menuchoice> desde el menÃº de la imagen. O desde la caja de herramientas "
+#~ "haciendo clic sobre el icono <placeholder-1/>; o desde el teclado usando "
+#~ "el atajo <keycap>e</keycap>."
+
+#~ msgid ""
+#~ "You can access to the Ellipse Selection options by double-clicking on the "
+#~ "<placeholder-1/> icon."
+#~ msgstr ""
+#~ "Puede acceder a las opciones de esta herramienta efectuando doble clic "
+#~ "sobre el icono <placeholder-1/>."
+
+#~ msgid ""
+#~ "The available tool options for the Dodge or Burn Tool can be accessed by "
+#~ "double clicking the Dodge or Burn Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para la herramienta blanquear/ennegrecer pueden "
+#~ "accederese haciendo doble clic en su icono. <placeholder-1/>"
+
+#~ msgid "2008-01-23"
+#~ msgstr "2007-04-15"
+
+#~ msgid ""
+#~ "<guilabel>Open</guilabel>: This button allows you to select a file "
+#~ "holding curve settings."
+#~ msgstr ""
+#~ "<guilabel>Abrir</guilabel>: Este botÃ³n permite abrir un archivo de curva."
+
+#~ msgid ""
+#~ "<guilabel>Save</guilabel>: Allows you to save any curves you have set to "
+#~ "a file that can be loaded later."
+#~ msgstr ""
+#~ "<guilabel>Guardar</guilabel>: Permite guardar la configuraciÃ³n de una "
+#~ "curva."
+
+#~ msgid ""
+#~ "The Tool can also be called by clicking the tool icon: <placeholder-1/>,"
+#~ msgstr ""
+#~ "TambiÃ©n se puede seleccionar pulsando sobre el icono de la herramienta: "
+#~ "<placeholder-1/>"
+
+#~ msgid ""
+#~ "A different and quicker way to crop selections is using the "
+#~ "<menuchoice><guimenu><accel>I</accel>mage</guimenu><guimenuitem><accel>C</"
+#~ "accel>rop Image</guimenuitem></menuchoice> function in the Image menu."
+#~ msgstr ""
+#~ "Una manera rÃ¡pida y diferente para recortar selecciones es el uso de la "
+#~ "funciÃ³n <menuchoice><guimenu><accel>I</accel>magen</"
+#~ "guimenu><guimenuitem><accel>R</accel>ecortar la imagen</guimenuitem></"
+#~ "menuchoice> en el menÃº de la imagen."
+
+#~ msgid ""
+#~ "The <keycombo><keycap>Shift</keycap><keycap>C</keycap></keycombo> "
+#~ "shortcut will change the active tool to the Crop Tool."
+#~ msgstr ""
+#~ "El atajo <keycombo><keycap>Mayus</keycap><keycap>C</keycap></keycombo> "
+#~ "cambiarÃ¡ la herramienta activa a la herramienta recortar"
+
+#~ msgid "<quote>Crop</quote> tool options"
+#~ msgstr "Opciones de la herramienta <quote>Recortar y redimensionar</quote>"
+
+#~ msgid ""
+#~ "The available tool options for Crop can be accessed by double clicking "
+#~ "the Crop tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede acceder a las opciones de herramientas disponibles para recortar "
+#~ "pulsando dos veces en el icono de la herramienta. <placeholder-1/>"
+
+#~ msgid ""
+#~ "This option allows the crop or resize to take place outside the image or "
+#~ "layer boundary."
+#~ msgstr ""
+#~ "Esta opciÃ³n permite que el recorte o redimensionamiento ocupen parte "
+#~ "exterior de los contornos de la imagen o capa"
+
+#~ msgid "2008-02-27"
+#~ msgstr "2006-08-06"
+
+#~ msgid "Convolve tool icon in the Toolbox"
+#~ msgstr "La herramienta de convoluciÃ³n en la caja de herramientas"
+
+#~ msgid ""
+#~ "The Convolve tool can be activated from an image menu as "
+#~ "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</"
+#~ "guisubmenu><guimenuitem>Convolve</guimenuitem></menuchoice>; from the "
+#~ "Toolbox by clicking on the tool icon <placeholder-1/>; or from the "
+#~ "keyboard using the shortcut <keycombo><keycap>Shift </keycap><keycap>U</"
+#~ "keycap></keycombo>."
+#~ msgstr ""
+#~ "La herramienta de convoluciÃ³n puede activarse desde el menÃº de la imagen: "
+#~ "<menuchoice><guimenu>Herramientas</guimenu><guisubmenu>Herramientas de "
+#~ "pintura</guisubmenu><guimenuitem>ConvoluciÃ³n</guimenuitem></menuchoice>; "
+#~ "tambiÃ©n puede activarse clicando en el icono: <placeholder-1/>; o desde "
+#~ "el teclado usando el atajo <keycap>V</keycap>."
+
+#~ msgid "Tool Options for the Convolve tool"
+#~ msgstr "Opciones de la herramienta de convoluciÃ³n"
+
+#, fuzzy
+#~ msgid ""
+#~ "The available tool options for the Color Picker can be accessed by double "
+#~ "clicking the Color Picker tool icon <placeholder-1/>."
+#~ msgstr ""
+#~ "Se puede acceder a las opciones de herramientas disponibles para recortar "
+#~ "pulsando dos veces en el icono de la herramienta. <placeholder-1/>"
+
+#~ msgid "2008-01-16"
+#~ msgstr "2007-04-14"
+
+#~ msgid ""
+#~ "In the the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>C</accel>olor Tools</"
+#~ "guisubmenu><guimenuitem>Colori <accel>z</accel>e</guimenuitem></"
+#~ "menuchoice> or <menuchoice><guimenu>Colors</"
+#~ "guimenu><guimenuitem>Colorize</guimenuitem></menuchoice>,"
+#~ msgstr ""
+#~ "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</"
+#~ "accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>C</"
+#~ "accel>olor</guisubmenu><guimenuitem>Colori<accel>z</accel>ar</"
+#~ "guimenuitem></menuchoice>"
+
+#~ msgid ""
+#~ "In the the image-menu through: <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>C</accel>olor Tools</"
+#~ "guisubmenu><guimenuitem>Color <accel>B</accel>alance</guimenuitem></"
+#~ "menuchoice>, or <menuchoice><guimenu>Colors</guimenu><guimenuitem>Color "
+#~ "Balance</guimenuitem></menuchoice>"
+#~ msgstr ""
+#~ "En el menÃº de la imagen: <menuchoice><guimenu><accel>H</"
+#~ "accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>c</"
+#~ "accel>olor</guisubmenu><guimenuitem><accel>B</accel>alance de color</"
+#~ "guimenuitem></menuchoice>"
+
+#~ msgid "You can activate the Clone tool in several ways :"
+#~ msgstr ""
+#~ "La herramienta para clonar puede activarse desde el menÃº de la imagen:"
+
+#, fuzzy
+#~ msgid "By clicking on the tool icon <placeholder-1/> in Toolbox."
+#~ msgstr ""
+#~ "#-#-#-#-#  tool-ink.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "La herramienta tambiÃ©n puede activarse clicando en el Ãcono: "
+#~ "<placeholder-1/>\n"
+#~ "#-#-#-#-#  tool-smudge.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "TambiÃ©n puede activarse clicando en el icono: <placeholder-1/>"
+
+#~ msgid ""
+#~ "You can activate the Select By Color Tool from an image menu through "
+#~ "<menuchoice><guimenu>Tools</guimenu><guisubmenu>Selection Tools</"
+#~ "guisubmenu><guimenuitem>Select by Color</guimenuitem></menuchoice>; from "
+#~ "the Toolbox by clicking on the <placeholder-1/> tool icon; or from the "
+#~ "keyboard by using the <keycombo><keycap>Shift </keycap><keycap>O</"
+#~ "keycap></keycombo> shortcut"
+#~ msgstr ""
+#~ "La herramienta \"Seleccionar por color\" puede ser activada desde el menÃº "
+#~ "de la imagen siguiendo <menuchoice><guimenu>Herramientas</"
+#~ "guimenu><guisubmenu>Herramientas de selecciÃ³n</"
+#~ "guisubmenu><guimenuitem>Seleccionar por color</guimenuitem></menuchoice>; "
+#~ "o desde la caja de herramientas haciendo clic sobre su icono "
+#~ "<placeholder-1/>; o por medio del atajo de teclado "
+#~ "<keycombo><keycap>Shift </keycap><keycap>Ctrl</keycap><keycap>C</keycap></"
+#~ "keycombo>"
+
+#~ msgid ""
+#~ "You can find the Magic Wand options by double-clicking on the "
+#~ "<placeholder-1/> icon in the Toolbox."
+#~ msgstr ""
+#~ "Puede hallar las opciones de la varita mÃ¡gica haciendo doble clic sobre "
+#~ "el icono <placeholder-1/> de la caja de herramientas."
+
+#~ msgid "Activate tool"
+#~ msgstr "ActivaciÃ³n de la herramienta"
+
+#~ msgid ""
+#~ "You can find the Bucket Fill tool from the image-menu through: "
+#~ "<guimenuitem><accel>T</accel>ools</guimenuitem>/ <guimenuitem><accel>P</"
+#~ "accel>aint Tools</guimenuitem>/<guimenuitem><accel>B</accel>ucket Fill.</"
+#~ "guimenuitem>"
+#~ msgstr ""
+#~ "El relleno de cubeta puede ser activado siguiendo el menÃº de imagen en el "
+#~ "siguiente orden: <guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
+#~ "<guimenuitem>Herramientas de <accel>p</accel>intura</guimenuitem>/"
+#~ "<guimenuitem><accel>R</accel>elleno.</guimenuitem>"
+
+#~ msgid ""
+#~ "The available tool options for the Fill Tool can be accessed by double "
+#~ "clicking the Fill Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para la herramienta de Relleno pueden ser "
+#~ "accedidas realizando doble clic en su Ãcono. <placeholder-1/>"
+
+#~ msgid "Pressure Sensitivity"
+#~ msgstr "Sensibilidad de presiÃ³n"
+
+#~ msgid ""
+#~ "This option determines what happens if a brushstroke extends farther than "
+#~ "the Length specified above. There are three possibilities: \"None\" means "
+#~ "that the color from the end of the gradient will be used throughout the "
+#~ "remainder of the stroke; \"Sawtooth wave\" means that the gradient will "
+#~ "be restarted from the beginning, which will often produce a color "
+#~ "discontinuity; \"Triangular wave\" means that the gradient will be "
+#~ "traversed in reverse, afterwards bouncing back and forth until the end of "
+#~ "the brushstroke."
+#~ msgstr ""
+#~ "Esta opciÃ³n determina quÃ© sucede si un trazo se excede el largo "
+#~ "especificado arriba. Hay tres posibilidades: <guilabel>Ninguno</guilabel> "
+#~ "significa que el color del final del degradado serÃ¡ usado a lo largo del "
+#~ "resto del trazo; <guilabel>Onda de dientes de sierra</guilabel> significa "
+#~ "que el degradado saltarÃ¡ al principio y volverÃ¡ a ser recorrido, lo que "
+#~ "usualmente produce una discontinuidad en el color; <guilabel>Onda "
+#~ "triangular</guilabel> significa que el gradiente serÃ¡ vuelto a recorrer "
+#~ "en reversa, llendo y viniendo hasta el final del trazo."
+
+#~ msgid "2007-11-15"
+#~ msgstr "2007-04-18"
+
+#~ msgid "See <xref linkend=\"bibliography-online-xds\"/>."
+#~ msgstr "<xref linkend=\"bibliography-online-xds\"/>."
+
+#~ msgid ""
+#~ "From the image-menu: <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>P</accel>aint Tools</"
+#~ "guisubmenu><guimenuitem>Blen<accel>d</accel></guimenuitem></menuchoice>."
+#~ msgstr ""
+#~ "La herramienta de mezcla puede activarse siguiendo el menÃº de imagen en "
+#~ "el siguiente orden: <guimenuitem><accel>H</accel>erramientas</"
+#~ "guimenuitem>/ <guimenuitem>Herramientas de <accel>p</accel>intura</"
+#~ "guimenuitem>/ <guimenuitem><accel>M</accel>ezcla</guimenuitem>."
+
+#~ msgid "By clicking the tool icon <placeholder-1/>."
+#~ msgstr ""
+#~ "La herramienta tambiÃ©n puede activarse clicando en el icono: "
+#~ "<placeholder-1/>"
+
+#~ msgid ""
+#~ "The available tool options can be accessed by double clicking the "
+#~ "Gradient Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para la herramienta de mezcla pueden ser "
+#~ "accedidas realizando doble clic en su icono. <placeholder-1/>"
+
+#~ msgid "2007-08-27"
+#~ msgstr "2007-09-14"
+
+#~ msgid "ude"
+#~ msgstr "AntI"
+
+#~ msgid ""
+#~ "From the image-menu, through: <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>T</accel>ransform Tools</"
+#~ "guisubmenu><guimenuitem><accel>A</accel>lign</guimenuitem></menuchoice>."
+#~ msgstr ""
+#~ "Desde el menÃº de la imagen, con: <menuchoice><guimenu><accel>H</"
+#~ "accel>erramientas</guimenu><guisubmenu>Herramientas de <accel>t</"
+#~ "accel>ransformaciÃ³n</guisubmenu><guimenuitem><accel>A</accel>lineado</"
+#~ "guimenuitem></menuchoice>."
+
+#~ msgid "By clicking on the tool icon: <placeholder-1/> in the toolbox."
+#~ msgstr ""
+#~ "Pulsando sobre el icono de la herramienta: <placeholder-1/> en la caja de "
+#~ "herramientas."
+
+#~ msgid "Align options"
+#~ msgstr "Opciones de la herramienta de alineaciÃ³n"
+
+#~ msgid ""
+#~ "The available tool options can be accessed by (double)-clicking the align "
+#~ "Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Se puede acceder a las opciones disponibles para esta herramienta "
+#~ "mediante una doble pulsaciÃ³n sobre su icono. <placeholder-1/>"
+
+#~ msgid "<guilabel>Active Path</guilabel>: This option is not yet handled."
+#~ msgstr ""
+#~ "<guilabel>Ruta activa</guilabel>: esta opciÃ³n no estÃ¡, todavia, activada."
+
+#~ msgid "2006-02-05"
+#~ msgstr "2006-08-06"
+
+#~ msgid ""
+#~ "From the image-menu, through : <menuchoice><guimenu><accel>T</accel>ools</"
+#~ "guimenu><guisubmenu><accel>P</accel>aint Tools</"
+#~ "guisubmenu><guimenuitem><accel>A</accel>irbrush</guimenuitem></menuchoice>"
+#~ msgstr ""
+#~ "El aerÃ³grafo puede activarse desde el menÃº de la imagen: "
+#~ "<guimenuitem><accel>H</accel>erramientas</guimenuitem>/ "
+#~ "<guimenuitem>Herramientas de <accel>p</accel>intura </guimenuitem>/"
+#~ "<guimenuitem><accel>A</accel>erÃ³grafo. </guimenuitem>"
+
+#~ msgid "By clicking on the tool icon: <placeholder-1/> in the Toolbox,"
+#~ msgstr ""
+#~ "La herramienta tambiÃ©n puede activarse clicando en el icono: "
+#~ "<placeholder-1/>"
+
+#~ msgid ""
+#~ "The available tool options can be accessed by double-clicking the "
+#~ "airbrush Tool icon. <placeholder-1/>"
+#~ msgstr ""
+#~ "Las opciones disponibles para esta herramienta pueden ser accedidas "
+#~ "realizando doble clic sobre su icono. <placeholder-1/>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]