From ed30295004181f9655bf2f3faa2517d0978321e9 Mon Sep 17 00:00:00 2001
From: Bill Kendrick
Date: Wed, 23 Feb 2022 23:05:22 -0800
Subject: [PATCH] Syncing docs to grab color mixer/etc. updates
---
docs/en/README.txt | 18 +++++++++++++-----
docs/en/html/README.html | 6 +++++-
docs/es_ES.UTF-8/README.txt | 18 +++++++++++++-----
docs/es_ES.UTF-8/html/README.html | 6 +++++-
docs/fr_FR.UTF-8/README.txt | 19 +++++++++++++------
docs/fr_FR.UTF-8/html/README.html | 6 +++++-
docs/gl_ES.UTF-8/README.txt | 18 +++++++++++++-----
docs/gl_ES.UTF-8/html/README.html | 6 +++++-
docs/ja_JP.UTF-8/README.txt | 14 +++++++++++++-
docs/ja_JP.UTF-8/html/README.html | 6 +++++-
10 files changed, 90 insertions(+), 27 deletions(-)
diff --git a/docs/en/README.txt b/docs/en/README.txt
index 5afc1a990..7ea5598b3 100644
--- a/docs/en/README.txt
+++ b/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
- 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.
+ 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
diff --git a/docs/en/html/README.html b/docs/en/html/README.html
index 8b0bd0947..355cdf198 100644
--- a/docs/en/html/README.html
+++ b/docs/en/html/README.html
@@ -352,7 +352,11 @@
- 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.
+ 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 [Control] 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.)
diff --git a/docs/es_ES.UTF-8/README.txt b/docs/es_ES.UTF-8/README.txt
index 45991da08..7a8541cc8 100644
--- a/docs/es_ES.UTF-8/README.txt
+++ b/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
- 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.
+ 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
diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html
index 561cc7354..38ee85755 100644
--- a/docs/es_ES.UTF-8/html/README.html
+++ b/docs/es_ES.UTF-8/html/README.html
@@ -352,7 +352,11 @@
- 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.
+ 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 [Control] 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.)
diff --git a/docs/fr_FR.UTF-8/README.txt b/docs/fr_FR.UTF-8/README.txt
index ef11fe8ca..0005956e3 100644
--- a/docs/fr_FR.UTF-8/README.txt
+++ b/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
- 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.
+ 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
diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html
index c62bf6452..888493c55 100644
--- a/docs/fr_FR.UTF-8/html/README.html
+++ b/docs/fr_FR.UTF-8/html/README.html
@@ -352,7 +352,11 @@
- À 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.
+ 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 [Control] 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.)
diff --git a/docs/gl_ES.UTF-8/README.txt b/docs/gl_ES.UTF-8/README.txt
index 130aa0c14..861825922 100644
--- a/docs/gl_ES.UTF-8/README.txt
+++ b/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
- «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.
+ 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
diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html
index 8a0ced32e..9082f6aac 100644
--- a/docs/gl_ES.UTF-8/html/README.html
+++ b/docs/gl_ES.UTF-8/html/README.html
@@ -352,7 +352,11 @@
- 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.
+ 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 [Control] 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.)
diff --git a/docs/ja_JP.UTF-8/README.txt b/docs/ja_JP.UTF-8/README.txt
index 280287434..8bcb448f4 100644
--- a/docs/ja_JP.UTF-8/README.txt
+++ b/docs/ja_JP.UTF-8/README.txt
@@ -150,7 +150,19 @@ Tux Paint の起動
[いろ - いろ - くろ、しろ、あか、ぴんく、おれんじ、きいろ、みどり、みずいろ、あお、むらさき、ちゃいろ、はいいろ]
- 右端には色についての2つの特別なオプションがあります。スポイトの形をした「カラーピッカー」は描いている絵の中から色を選ぶことができます。また、「レインボーパレット」では、何千もの色から描画色を選ぶことができます。
+ 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
diff --git a/docs/ja_JP.UTF-8/html/README.html b/docs/ja_JP.UTF-8/html/README.html
index 3eaa8ddd3..83ba9e948 100644
--- a/docs/ja_JP.UTF-8/html/README.html
+++ b/docs/ja_JP.UTF-8/html/README.html
@@ -352,7 +352,11 @@
- 右端には色についての2つの特別なオプションがあります。スポイトの形をした「カラーピッカー」は描いている絵の中から色を選ぶことができます。また、「レインボーパレット」では、何千もの色から描画色を選ぶことができます。
+ 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 [Control] 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.)