Syncing docs to grab color mixer/etc. updates

docs/en/README.txt

@@ -188,11 +188,19 @@ Main Screen
  [Colors - Black, White, Red, Pink, Orange, Yellow, Green, Cyan, Blue, Purple,
                                   Brown, Grey]
 
-               On the far right are two special color options, the "color
+               On the far right are three special color options:
-               picker", which has an outline of an eye-dropper, and allows
+                  * The "color picker" (which has an outline of an
-               you to pick a color found within your drawing, and the rainbow
+                    eye-dropper) allows you to pick a color found within your
-               palette, which allows you to pick a color from within a box
+                    drawing. A shortcut key is available to access this
-               containing thousands of colors.
+                    feature quickly; see below.
+                  * The rainbow palette allows you to pick a color from
+                    within a box containing thousands of colors.
+                  * The "color mixer" (which has silhouette of a paint
+                    palette) allows you to create colors by blending primary
+                    additive colors — red, yellow, and blue — along with
+                    white (to "tint"), grey (to "tone"), and black (to
+                    "shade"). The ratios of colors added are shown at the
+                    bottom.
 
                When the active tool supports colors, a shortcut may be used
                to access the "color picker" option more quickly. Hold the

docs/en/html/README.html

@@ -352,7 +352,11 @@
             </p>
 
             <p>
-              On the far right are two special color options, the "color picker", which has an outline of an eye-dropper, and allows you to pick a color found within your drawing, and the rainbow palette, which allows you to pick a color from within a box containing thousands of colors.            </p>
+              On the far right are three special color options:              <ul>
+                <li>The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.                <li>The rainbow palette allows you to pick a color from within a box containing thousands of colors.</li>
+                <li>The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors &mdash; red, yellow, and blue &mdash; along with white (to "tint"), grey (to "tone"), and black (to "shade").  The ratios of colors added are shown at the bottom.</li>
+              </ul>
+            </p>
 
             <p>
               When the active tool supports colors, a shortcut may be used to access the "color picker" option more quickly. Hold the <b><code>[Control]</code></b> key while clicking, and the color under the mouse cursor will be shown at the bottom. You may drag around to canvas to find the color you want. When you release the mouse button, the color under the cursor will be selected. If you release the mouse outside of the canvas (e.g., over the "Tools" area), the color selection will be left unchanged. (This is similar to clicking the"Back" button that's available when bringing up the "color picker" option via its button the color palette.)            </p>

docs/es_ES.UTF-8/README.txt

@@ -188,11 +188,19 @@ Main Screen
  [Colors - Black, White, Red, Pink, Orange, Yellow, Green, Cyan, Blue, Purple,
                                   Brown, Grey]
 
-               On the far right are two special color options, the "color
+               On the far right are three special color options:
-               picker", which has an outline of an eye-dropper, and allows
+                  * The "color picker" (which has an outline of an
-               you to pick a color found within your drawing, and the rainbow
+                    eye-dropper) allows you to pick a color found within your
-               palette, which allows you to pick a color from within a box
+                    drawing. A shortcut key is available to access this
-               containing thousands of colors.
+                    feature quickly; see below.
+                  * The rainbow palette allows you to pick a color from
+                    within a box containing thousands of colors.
+                  * The "color mixer" (which has silhouette of a paint
+                    palette) allows you to create colors by blending primary
+                    additive colors — red, yellow, and blue — along with
+                    white (to "tint"), grey (to "tone"), and black (to
+                    "shade"). The ratios of colors added are shown at the
+                    bottom.
 
                When the active tool supports colors, a shortcut may be used
                to access the "color picker" option more quickly. Hold the

docs/es_ES.UTF-8/html/README.html

@@ -352,7 +352,11 @@
             </p>
 
             <p>
-              On the far right are two special color options, the "color picker", which has an outline of an eye-dropper, and allows you to pick a color found within your drawing, and the rainbow palette, which allows you to pick a color from within a box containing thousands of colors.            </p>
+              On the far right are three special color options:              <ul>
+                <li>The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.                <li>The rainbow palette allows you to pick a color from within a box containing thousands of colors.</li>
+                <li>The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors &mdash; red, yellow, and blue &mdash; along with white (to "tint"), grey (to "tone"), and black (to "shade").  The ratios of colors added are shown at the bottom.</li>
+              </ul>
+            </p>
 
             <p>
               When the active tool supports colors, a shortcut may be used to access the "color picker" option more quickly. Hold the <b><code>[Control]</code></b> key while clicking, and the color under the mouse cursor will be shown at the bottom. You may drag around to canvas to find the color you want. When you release the mouse button, the color under the cursor will be selected. If you release the mouse outside of the canvas (e.g., over the "Tools" area), the color selection will be left unchanged. (This is similar to clicking the"Back" button that's available when bringing up the "color picker" option via its button the color palette.)            </p>

docs/fr_FR.UTF-8/README.txt

@@ -200,12 +200,19 @@ Lancement de Tux Paint
 [Couleurs - Noir, Blanc, Rouge, Rose, Orange, Jaune, Vert, Cyan, Bleu, Pourpre,
                                   Brun, Gris]
 
-               À l'extrême droite se trouvent deux options de choix de
+               On the far right are three special color options:
-               couleur, le "sélecteur de couleurs", qui a le contour d'un
+                  * The "color picker" (which has an outline of an
-               compte-gouttes, et vous permet de choisir une couleur trouvée
+                    eye-dropper) allows you to pick a color found within your
-               dans votre dessin, et la palette arc-en-ciel, qui vous permet
+                    drawing. A shortcut key is available to access this
-               de choisir une couleur dans une boîte contenant des milliers
+                    feature quickly; see below.
-               de couleurs.
+                  * The rainbow palette allows you to pick a color from
+                    within a box containing thousands of colors.
+                  * The "color mixer" (which has silhouette of a paint
+                    palette) allows you to create colors by blending primary
+                    additive colors — red, yellow, and blue — along with
+                    white (to "tint"), grey (to "tone"), and black (to
+                    "shade"). The ratios of colors added are shown at the
+                    bottom.
 
                When the active tool supports colors, a shortcut may be used
                to access the "color picker" option more quickly. Hold the

docs/fr_FR.UTF-8/html/README.html

@@ -352,7 +352,11 @@
             </p>
 
             <p>
-              À l'extrême droite se trouvent deux options de choix de couleur, le "sélecteur de couleurs", qui a le contour d'un compte-gouttes, et vous permet de choisir une couleur trouvée dans votre dessin, et la palette arc-en-ciel, qui vous permet de choisir une couleur dans une boîte contenant des milliers de couleurs.            </p>
+              On the far right are three special color options:              <ul>
+                <li>The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.                <li>The rainbow palette allows you to pick a color from within a box containing thousands of colors.</li>
+                <li>The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors &mdash; red, yellow, and blue &mdash; along with white (to "tint"), grey (to "tone"), and black (to "shade").  The ratios of colors added are shown at the bottom.</li>
+              </ul>
+            </p>
 
             <p>
               When the active tool supports colors, a shortcut may be used to access the "color picker" option more quickly. Hold the <b><code>[Control]</code></b> key while clicking, and the color under the mouse cursor will be shown at the bottom. You may drag around to canvas to find the color you want. When you release the mouse button, the color under the cursor will be selected. If you release the mouse outside of the canvas (e.g., over the "Tools" area), the color selection will be left unchanged. (This is similar to clicking the"Back" button that's available when bringing up the "color picker" option via its button the color palette.)            </p>

docs/gl_ES.UTF-8/README.txt

@@ -194,11 +194,19 @@ Pantalla principal
   [Cores: negro, branco, vermello, rosa, laranxa, amarelo, verde, cian, azul,
                               roxo, marrón, gris]
 
-               No extremo dereito hai dúas opcións especiais de cor, o
+               On the far right are three special color options:
-               «selector de cores», que ten o contorno dun contagotas e que
+                  * The "color picker" (which has an outline of an
-               permite recoller unha cor que se atopa dentro do debuxo e a
+                    eye-dropper) allows you to pick a color found within your
-               paleta do arco da vella, que lle permite recoller unha cor
+                    drawing. A shortcut key is available to access this
-               dede dentro dunha caixa que contén milleiros de cores.
+                    feature quickly; see below.
+                  * The rainbow palette allows you to pick a color from
+                    within a box containing thousands of colors.
+                  * The "color mixer" (which has silhouette of a paint
+                    palette) allows you to create colors by blending primary
+                    additive colors — red, yellow, and blue — along with
+                    white (to "tint"), grey (to "tone"), and black (to
+                    "shade"). The ratios of colors added are shown at the
+                    bottom.
 
                When the active tool supports colors, a shortcut may be used
                to access the "color picker" option more quickly. Hold the

docs/gl_ES.UTF-8/html/README.html

@@ -352,7 +352,11 @@
             </p>
 
             <p>
-              No extremo dereito hai dúas opcións especiais de cor, o «selector de cores», que ten o contorno dun contagotas e que permite recoller unha cor que se atopa dentro do debuxo e a paleta do arco da vella, que lle permite recoller unha cor dede dentro dunha caixa que contén milleiros de cores.            </p>
+              On the far right are three special color options:              <ul>
+                <li>The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.                <li>The rainbow palette allows you to pick a color from within a box containing thousands of colors.</li>
+                <li>The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors &mdash; red, yellow, and blue &mdash; along with white (to "tint"), grey (to "tone"), and black (to "shade").  The ratios of colors added are shown at the bottom.</li>
+              </ul>
+            </p>
 
             <p>
               When the active tool supports colors, a shortcut may be used to access the "color picker" option more quickly. Hold the <b><code>[Control]</code></b> key while clicking, and the color under the mouse cursor will be shown at the bottom. You may drag around to canvas to find the color you want. When you release the mouse button, the color under the cursor will be selected. If you release the mouse outside of the canvas (e.g., over the "Tools" area), the color selection will be left unchanged. (This is similar to clicking the"Back" button that's available when bringing up the "color picker" option via its button the color palette.)            </p>

docs/ja_JP.UTF-8/README.txt

@@ -150,7 +150,19 @@ Tux Paint の起動
 
           [いろ - いろ - くろ、しろ、あか、ぴんく、おれんじ、きいろ、みどり、みずいろ、あお、むらさき、ちゃいろ、はいいろ]
 
-               右端には色についての２つの特別なオプションがあります。スポイトの形をした「カラーピッカー」は描いている絵の中から色を選ぶことができます。また、「レインボーパレット」では、何千もの色から描画色を選ぶことができます。
+               On the far right are three special color options:
+                  * The "color picker" (which has an outline of an
+                    eye-dropper) allows you to pick a color found within your
+                    drawing. A shortcut key is available to access this
+                    feature quickly; see below.
+                  * The rainbow palette allows you to pick a color from
+                    within a box containing thousands of colors.
+                  * The "color mixer" (which has silhouette of a paint
+                    palette) allows you to create colors by blending primary
+                    additive colors — red, yellow, and blue — along with
+                    white (to "tint"), grey (to "tone"), and black (to
+                    "shade"). The ratios of colors added are shown at the
+                    bottom.
 
                When the active tool supports colors, a shortcut may be used
                to access the "color picker" option more quickly. Hold the

docs/ja_JP.UTF-8/html/README.html

@@ -352,7 +352,11 @@
             </p>
 
             <p>
-              右端には色についての２つの特別なオプションがあります。スポイトの形をした「カラーピッカー」は描いている絵の中から色を選ぶことができます。また、「レインボーパレット」では、何千もの色から描画色を選ぶことができます。            </p>
+              On the far right are three special color options:              <ul>
+                <li>The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.                <li>The rainbow palette allows you to pick a color from within a box containing thousands of colors.</li>
+                <li>The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors &mdash; red, yellow, and blue &mdash; along with white (to "tint"), grey (to "tone"), and black (to "shade").  The ratios of colors added are shown at the bottom.</li>
+              </ul>
+            </p>
 
             <p>
               When the active tool supports colors, a shortcut may be used to access the "color picker" option more quickly. Hold the <b><code>[Control]</code></b> key while clicking, and the color under the mouse cursor will be shown at the bottom. You may drag around to canvas to find the color you want. When you release the mouse button, the color under the cursor will be selected. If you release the mouse outside of the canvas (e.g., over the "Tools" area), the color selection will be left unchanged. (This is similar to clicking the"Back" button that's available when bringing up the "color picker" option via its button the color palette.)            </p>