diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt
index 9dd1134e7..31ba1a8a0 100644
--- a/docs/en/OPTIONS.txt
+++ b/docs/en/OPTIONS.txt
@@ -1167,7 +1167,7 @@ Accessibility
 
                  Note: If used in a system-wide configuration file, may be
                  overridden by the user's configuration file using
-                 "keyboard=no" or "2$keyboard=no". In both cases, may be
+                 "keyboard=no" or "mouse=yes". In both cases, may be
                  overridden by the command-line option "--mouse".
 
   Onscreen Keyboard
diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html
index 9233e9934..b8fc03d33 100644
--- a/docs/en/html/OPTIONS.html
+++ b/docs/en/html/OPTIONS.html
@@ -2661,7 +2661,7 @@
       </ul>
 
       <p>
-        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "2$<code>keyboard=no</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
+        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "<code>mouse=yes</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
     </dd>
   </dl>
 </blockquote>
diff --git a/docs/es_ES.UTF-8/OPTIONS.txt b/docs/es_ES.UTF-8/OPTIONS.txt
index 42cf65576..b611eccd2 100644
--- a/docs/es_ES.UTF-8/OPTIONS.txt
+++ b/docs/es_ES.UTF-8/OPTIONS.txt
@@ -1167,7 +1167,7 @@ Accessibility
 
                  Note: If used in a system-wide configuration file, may be
                  overridden by the user's configuration file using
-                 "keyboard=no" or "2$keyboard=no". In both cases, may be
+                 "keyboard=no" or "mouse=yes". In both cases, may be
                  overridden by the command-line option "--mouse".
 
   Onscreen Keyboard
diff --git a/docs/es_ES.UTF-8/html/OPTIONS.html b/docs/es_ES.UTF-8/html/OPTIONS.html
index d81c76982..91fa95ec4 100644
--- a/docs/es_ES.UTF-8/html/OPTIONS.html
+++ b/docs/es_ES.UTF-8/html/OPTIONS.html
@@ -2661,7 +2661,7 @@
       </ul>
 
       <p>
-        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "2$<code>keyboard=no</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
+        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "<code>mouse=yes</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
     </dd>
   </dl>
 </blockquote>
diff --git a/docs/fr_FR.UTF-8/OPTIONS.txt b/docs/fr_FR.UTF-8/OPTIONS.txt
index b4c9f397f..71aec4ee4 100644
--- a/docs/fr_FR.UTF-8/OPTIONS.txt
+++ b/docs/fr_FR.UTF-8/OPTIONS.txt
@@ -1231,7 +1231,7 @@ Accessibility
 
                  Note: If used in a system-wide configuration file, may be
                  overridden by the user's configuration file using
-                 "keyboard=no" or "2$keyboard=no". In both cases, may be
+                 "keyboard=no" or "mouse=yes". In both cases, may be
                  overridden by the command-line option "--mouse".
 
   Onscreen Keyboard
diff --git a/docs/fr_FR.UTF-8/html/OPTIONS.html b/docs/fr_FR.UTF-8/html/OPTIONS.html
index 0f31174ad..d2fe28c38 100644
--- a/docs/fr_FR.UTF-8/html/OPTIONS.html
+++ b/docs/fr_FR.UTF-8/html/OPTIONS.html
@@ -2661,7 +2661,7 @@
       </ul>
 
       <p>
-        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "2$<code>keyboard=no</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
+        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "<code>mouse=yes</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
     </dd>
   </dl>
 </blockquote>
diff --git a/docs/gl_ES.UTF-8/OPTIONS.txt b/docs/gl_ES.UTF-8/OPTIONS.txt
index ed6c844df..e28ced6e8 100644
--- a/docs/gl_ES.UTF-8/OPTIONS.txt
+++ b/docs/gl_ES.UTF-8/OPTIONS.txt
@@ -1202,7 +1202,7 @@ Accessibility
 
                  Note: If used in a system-wide configuration file, may be
                  overridden by the user's configuration file using
-                 "keyboard=no" or "2$keyboard=no". In both cases, may be
+                 "keyboard=no" or "mouse=yes". In both cases, may be
                  overridden by the command-line option "--mouse".
 
   Onscreen Keyboard
diff --git a/docs/gl_ES.UTF-8/html/OPTIONS.html b/docs/gl_ES.UTF-8/html/OPTIONS.html
index 12145744b..205627529 100644
--- a/docs/gl_ES.UTF-8/html/OPTIONS.html
+++ b/docs/gl_ES.UTF-8/html/OPTIONS.html
@@ -2661,7 +2661,7 @@
       </ul>
 
       <p>
-        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "2$<code>keyboard=no</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
+        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "<code>mouse=yes</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
     </dd>
   </dl>
 </blockquote>
diff --git a/docs/ja_JP.UTF-8/OPTIONS.txt b/docs/ja_JP.UTF-8/OPTIONS.txt
index d7de7154e..621dc9fd3 100644
--- a/docs/ja_JP.UTF-8/OPTIONS.txt
+++ b/docs/ja_JP.UTF-8/OPTIONS.txt
@@ -1009,7 +1009,7 @@ Accessibility
 
                  Note: If used in a system-wide configuration file, may be
                  overridden by the user's configuration file using
-                 "keyboard=no" or "2$keyboard=no". In both cases, may be
+                 "keyboard=no" or "mouse=yes". In both cases, may be
                  overridden by the command-line option "--mouse".
 
   Onscreen Keyboard
diff --git a/docs/ja_JP.UTF-8/html/OPTIONS.html b/docs/ja_JP.UTF-8/html/OPTIONS.html
index 283ac7871..1e7fe13d5 100644
--- a/docs/ja_JP.UTF-8/html/OPTIONS.html
+++ b/docs/ja_JP.UTF-8/html/OPTIONS.html
@@ -2661,7 +2661,7 @@
       </ul>
 
       <p>
-        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "2$<code>keyboard=no</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
+        Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>keyboard=no</code>" or "<code>mouse=yes</code>". In both cases, may be overridden by the command-line option "<code>--mouse</code>".      </p>
     </dd>
   </dl>
 </blockquote>
diff --git a/man/en/tuxpaint.1 b/man/en/tuxpaint.1
index 3ce1c5b9a..ea5d3abf0 100644
--- a/man/en/tuxpaint.1
+++ b/man/en/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2021.08.15
-.TH TUXPAINT 1 "August 15, 2021" "0.9.27" "Tux Paint"
+.\" tuxpaint.1 - 2021.08.29
+.TH TUXPAINT 1 "August 29, 2021" "0.9.27" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -365,7 +365,7 @@ mixed case.
 Overrides the default size of all stamps, relative to their possible sizes
 (determined by Tux Paint, based on the dimensions of both the stamps
 themselves, and the drawing canvas).  Valid values are from 0 (smallest) to
-10 (largest).  Use "--stampsize=default" to let ITux PaintP choose on a
+10 (largest).  Use "--stampsize=default" to let Tux Paint choose on a
 per-stamp basis (this is the default setting).
 
 .SS STARTING OUT
@@ -439,7 +439,8 @@ can be useful on touchscreen devices, such as tablet PCs.
 .SS KEYBOARD
 .TP 8
 .B \-\-noshortcuts \-\-shortcuts
-<? /* --[no]shortcuts */ wordwrap(sprintf(gettext(If \"%s\" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save) will be disabled.  Default mode is for shortcuts to be enabled."), "--noshortcuts")) . "\n" ?>
+If "--noshortcuts" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save)
+will be disabled.  Default mode is for shortcuts to be enabled.
 
 .SS MOUSE AND ACCESSIBILITY
 .TP 8
@@ -458,7 +459,8 @@ the wheel.
 .TP 8
 .B \-\-mouse-accessibility
 In this mode, instead of clicking, dragging and releasing (e.g., to draw),
-you click, move, and click again to end the motion.
+you click, move, and click again to end the motion. ("Sticky mouse
+clicks.")
 
 .TP 8
 .B \-\-keyboard \-\-mouse
@@ -541,7 +543,10 @@ to various tools within Tux Paint.
 .PD 0
 .TP 2
 -
-brush | Brush
+brush | Paint
+.TP 2
+-
+stamp | Stamp
 .TP 2
 -
 lines | Lines
@@ -680,8 +685,8 @@ test environment.
 
 .TP 8
 .B \-\-autosave \-\-noautosave
-The --autosave option prevents ITux PaintP from asking whether you want
-to save the current picture when quitting, and assumes you do.
+The --autosave option prevents Tux Paint from asking whether you want to
+save the current picture when quitting, and assumes you do.
 
 .SH OPTIONS - DATA FILES
 .l
diff --git a/man/es_ES.UTF-8/tuxpaint.1 b/man/es_ES.UTF-8/tuxpaint.1
index 736727dc0..9321c238c 100644
--- a/man/es_ES.UTF-8/tuxpaint.1
+++ b/man/es_ES.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2021.08.15
-.TH TUXPAINT 1 "agosto 15, 2021" "0.9.27" "Tux Paint"
+.\" tuxpaint.1 - 2021.08.29
+.TH TUXPAINT 1 "agosto 29, 2021" "0.9.27" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -365,7 +365,7 @@ mixed case.
 Overrides the default size of all stamps, relative to their possible sizes
 (determined by Tux Paint, based on the dimensions of both the stamps
 themselves, and the drawing canvas).  Valid values are from 0 (smallest) to
-10 (largest).  Use "--stampsize=default" to let ITux PaintP choose on a
+10 (largest).  Use "--stampsize=default" to let Tux Paint choose on a
 per-stamp basis (this is the default setting).
 
 .SS STARTING OUT
@@ -439,7 +439,8 @@ can be useful on touchscreen devices, such as tablet PCs.
 .SS KEYBOARD
 .TP 8
 .B \-\-noshortcuts \-\-shortcuts
-<? /* --[no]shortcuts */ wordwrap(sprintf(gettext(If \"%s\" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save) will be disabled.  Default mode is for shortcuts to be enabled."), "--noshortcuts")) . "\n" ?>
+If "--noshortcuts" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save)
+will be disabled.  Default mode is for shortcuts to be enabled.
 
 .SS MOUSE AND ACCESSIBILITY
 .TP 8
@@ -458,7 +459,8 @@ the wheel.
 .TP 8
 .B \-\-mouse-accessibility
 In this mode, instead of clicking, dragging and releasing (e.g., to draw),
-you click, move, and click again to end the motion.
+you click, move, and click again to end the motion. ("Sticky mouse
+clicks.")
 
 .TP 8
 .B \-\-keyboard \-\-mouse
@@ -541,7 +543,10 @@ to various tools within Tux Paint.
 .PD 0
 .TP 2
 -
-brush | Brush
+brush | Paint
+.TP 2
+-
+stamp | Stamp
 .TP 2
 -
 lines | Lines
@@ -680,8 +685,8 @@ test environment.
 
 .TP 8
 .B \-\-autosave \-\-noautosave
-The --autosave option prevents ITux PaintP from asking whether you want
-to save the current picture when quitting, and assumes you do.
+The --autosave option prevents Tux Paint from asking whether you want to
+save the current picture when quitting, and assumes you do.
 
 .SH OPTIONS - DATA FILES
 .l
diff --git a/man/fr_FR.UTF-8/tuxpaint.1 b/man/fr_FR.UTF-8/tuxpaint.1
index 92e72be4a..2ec0fdbdc 100644
--- a/man/fr_FR.UTF-8/tuxpaint.1
+++ b/man/fr_FR.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2021.08.15
-.TH TUXPAINT 1 "août 15, 2021" "0.9.27" "Tux Paint"
+.\" tuxpaint.1 - 2021.08.29
+.TH TUXPAINT 1 "août 29, 2021" "0.9.27" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -365,7 +365,7 @@ mixed case.
 Overrides the default size of all stamps, relative to their possible sizes
 (determined by Tux Paint, based on the dimensions of both the stamps
 themselves, and the drawing canvas).  Valid values are from 0 (smallest) to
-10 (largest).  Use "--stampsize=default" to let ITux PaintP choose on a
+10 (largest).  Use "--stampsize=default" to let Tux Paint choose on a
 per-stamp basis (this is the default setting).
 
 .SS STARTING OUT
@@ -439,7 +439,8 @@ can be useful on touchscreen devices, such as tablet PCs.
 .SS KEYBOARD
 .TP 8
 .B \-\-noshortcuts \-\-shortcuts
-<? /* --[no]shortcuts */ wordwrap(sprintf(gettext(If \"%s\" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save) will be disabled.  Default mode is for shortcuts to be enabled."), "--noshortcuts")) . "\n" ?>
+If "--noshortcuts" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save)
+will be disabled.  Default mode is for shortcuts to be enabled.
 
 .SS MOUSE AND ACCESSIBILITY
 .TP 8
@@ -457,9 +458,9 @@ the wheel.
 
 .TP 8
 .B \-\-mouse-accessibility
-Dans ce mode, au lieu de cliquer, de faire glisser et de relâcher (par
-exemple, pour dessiner), vous cliquez, déplacez et cliquez à nouveau pour
-terminer le mouvement.
+In this mode, instead of clicking, dragging and releasing (e.g., to draw),
+you click, move, and click again to end the motion. ("Sticky mouse
+clicks.")
 
 .TP 8
 .B \-\-keyboard \-\-mouse
@@ -547,7 +548,10 @@ to various tools within Tux Paint.
 .PD 0
 .TP 2
 -
-brush | Brush
+brush | Paint
+.TP 2
+-
+stamp | Stamp
 .TP 2
 -
 lines | Lines
@@ -686,8 +690,8 @@ test environment.
 
 .TP 8
 .B \-\-autosave \-\-noautosave
-The --autosave option prevents ITux PaintP from asking whether you want
-to save the current picture when quitting, and assumes you do.
+The --autosave option prevents Tux Paint from asking whether you want to
+save the current picture when quitting, and assumes you do.
 
 .SH OPTIONS - DATA FILES
 .l
diff --git a/man/gl_ES.UTF-8/tuxpaint.1 b/man/gl_ES.UTF-8/tuxpaint.1
index 912e3a960..e94f55eff 100644
--- a/man/gl_ES.UTF-8/tuxpaint.1
+++ b/man/gl_ES.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2021.08.15
-.TH TUXPAINT 1 "15 de Agosto de 2021" "0.9.27" "Tux Paint"
+.\" tuxpaint.1 - 2021.08.29
+.TH TUXPAINT 1 "29 de Agosto de 2021" "0.9.27" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -365,7 +365,7 @@ mixed case.
 Overrides the default size of all stamps, relative to their possible sizes
 (determined by Tux Paint, based on the dimensions of both the stamps
 themselves, and the drawing canvas).  Valid values are from 0 (smallest) to
-10 (largest).  Use "--stampsize=default" to let ITux PaintP choose on a
+10 (largest).  Use "--stampsize=default" to let Tux Paint choose on a
 per-stamp basis (this is the default setting).
 
 .SS STARTING OUT
@@ -439,7 +439,8 @@ can be useful on touchscreen devices, such as tablet PCs.
 .SS KEYBOARD
 .TP 8
 .B \-\-noshortcuts \-\-shortcuts
-<? /* --[no]shortcuts */ wordwrap(sprintf(gettext(If \"%s\" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save) will be disabled.  Default mode is for shortcuts to be enabled."), "--noshortcuts")) . "\n" ?>
+If "--noshortcuts" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save)
+will be disabled.  Default mode is for shortcuts to be enabled.
 
 .SS MOUSE AND ACCESSIBILITY
 .TP 8
@@ -457,8 +458,9 @@ the wheel.
 
 .TP 8
 .B \-\-mouse-accessibility
-Neste modo, no canto de premer, arrastrar e soltar (por exemplo, para
-debuxar), premese, móvese e premese  de novo para rematar o movemento.
+In this mode, instead of clicking, dragging and releasing (e.g., to draw),
+you click, move, and click again to end the motion. ("Sticky mouse
+clicks.")
 
 .TP 8
 .B \-\-keyboard \-\-mouse
@@ -545,7 +547,10 @@ to various tools within Tux Paint.
 .PD 0
 .TP 2
 -
-brush | Brush
+brush | Paint
+.TP 2
+-
+stamp | Stamp
 .TP 2
 -
 lines | Lines
@@ -684,8 +689,8 @@ test environment.
 
 .TP 8
 .B \-\-autosave \-\-noautosave
-The --autosave option prevents ITux PaintP from asking whether you want
-to save the current picture when quitting, and assumes you do.
+The --autosave option prevents Tux Paint from asking whether you want to
+save the current picture when quitting, and assumes you do.
 
 .SH OPTIONS - DATA FILES
 .l
diff --git a/man/ja_JP.UTF-8/tuxpaint.1 b/man/ja_JP.UTF-8/tuxpaint.1
index 254145d8a..a74d9a1a3 100644
--- a/man/ja_JP.UTF-8/tuxpaint.1
+++ b/man/ja_JP.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2021.08.15
-.TH TUXPAINT 1 "2021年8月15日" "0.9.27" "Tux Paint"
+.\" tuxpaint.1 - 2021.08.29
+.TH TUXPAINT 1 "2021年8月29日" "0.9.27" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -365,7 +365,7 @@ mixed case.
 Overrides the default size of all stamps, relative to their possible sizes
 (determined by Tux Paint, based on the dimensions of both the stamps
 themselves, and the drawing canvas).  Valid values are from 0 (smallest) to
-10 (largest).  Use "--stampsize=default" to let ITux PaintP choose on a
+10 (largest).  Use "--stampsize=default" to let Tux Paint choose on a
 per-stamp basis (this is the default setting).
 
 .SS STARTING OUT
@@ -439,7 +439,8 @@ can be useful on touchscreen devices, such as tablet PCs.
 .SS KEYBOARD
 .TP 8
 .B \-\-noshortcuts \-\-shortcuts
-<? /* --[no]shortcuts */ wordwrap(sprintf(gettext(If \"%s\" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save) will be disabled.  Default mode is for shortcuts to be enabled."), "--noshortcuts")) . "\n" ?>
+If "--noshortcuts" mode, keyboard shortcuts (e.g., [Ctrl]+[S] for Save)
+will be disabled.  Default mode is for shortcuts to be enabled.
 
 .SS MOUSE AND ACCESSIBILITY
 .TP 8
@@ -457,7 +458,9 @@ the wheel.
 
 .TP 8
 .B \-\-mouse-accessibility
-例えば「せん」ツールなどでは、マウスをクリックしてドラッグした後にマウスボタンを放すというのが標準の操作ですが、このモードを設定すると、マウスをクリックしてからマウスを動かした後に再度マウスをクリックするという操作になります。
+In this mode, instead of clicking, dragging and releasing (e.g., to draw),
+you click, move, and click again to end the motion. ("Sticky mouse
+clicks.")
 
 .TP 8
 .B \-\-keyboard \-\-mouse
@@ -543,7 +546,10 @@ to various tools within Tux Paint.
 .PD 0
 .TP 2
 -
-brush | Brush
+brush | Paint
+.TP 2
+-
+stamp | Stamp
 .TP 2
 -
 lines | Lines
@@ -682,8 +688,8 @@ test environment.
 
 .TP 8
 .B \-\-autosave \-\-noautosave
-The --autosave option prevents ITux PaintP from asking whether you want
-to save the current picture when quitting, and assumes you do.
+The --autosave option prevents Tux Paint from asking whether you want to
+save the current picture when quitting, and assumes you do.
 
 .SH OPTIONS - DATA FILES
 .l