diff --git a/man/en/tuxpaint.1 b/man/en/tuxpaint.1
index 3b2dc2b06..661f99995 100644
--- a/man/en/tuxpaint.1
+++ b/man/en/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2023.06.01
-.TH TUXPAINT 1 "June  1, 2023" "0.9.31" "Tux Paint"
+.\" tuxpaint.1 - 2023.06.04
+.TH TUXPAINT 1 "June  4, 2023" "0.9.31" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -13,13 +13,13 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-allowscreensaver]
 .br
-[\-\-WIDTHxHEIGHT]
+[\-\-\fIWIDTH\fPx\fIHEIGHT\fP]
 .br
 [\-\-native]
 .br
 [\-\-orient=portrait]
 .br
-[\-\-buttonsize SIZE | \-\-buttonsize auto]
+[\-\-buttonsize \fISIZE\fP | \-\-buttonsize auto]
 .br
 [\-\-startblank]
 .br
@@ -247,7 +247,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
-[\-\-uifont=default\fP]
+[\-\-uifont=default]
 .br
 [\-\-saveoverask]
 .br
@@ -328,7 +328,7 @@ system's native resolution ("--fullscreen=native"); or run in a window
 When in fullscreen mode, use the system's default screen resolution.
 
 .TP 8
-.B \-\-WIDTHxHEIGHT
+.B \-\-\fIWIDTH\fPx\fIHEIGHT\fP
 Run \fITux Paint\fP in a particularly-sized window, or at a particular
 fullscreen resolution (if \-\-native is not used).  Default is 800x600. 
 Minimum width is 640.  Minimum height is 480.  Portrait and landscape
@@ -1221,7 +1221,7 @@ the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
 .TP 8
-.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+.B \-\-uifont=\fI"FONT NAME"\fP \-\-uifont=default
 Specify the name of a font for Tux Paint to attempt to use for its user
 interface (UI) -- button labels, dialog pop-up text, instructional text at
 the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
diff --git a/man/es_ES.UTF-8/tuxpaint.1 b/man/es_ES.UTF-8/tuxpaint.1
index cf7e78b25..1f52df7e2 100644
--- a/man/es_ES.UTF-8/tuxpaint.1
+++ b/man/es_ES.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2023.06.01
-.TH TUXPAINT 1 "junio  1, 2023" "0.9.31" "Tux Paint"
+.\" tuxpaint.1 - 2023.06.04
+.TH TUXPAINT 1 "junio  4, 2023" "0.9.31" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -13,13 +13,13 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-allowscreensaver]
 .br
-[\-\-WIDTHxHEIGHT]
+[\-\-\fIWIDTH\fPx\fIHEIGHT\fP]
 .br
 [\-\-native]
 .br
 [\-\-orient=portrait]
 .br
-[\-\-buttonsize SIZE | \-\-buttonsize auto]
+[\-\-buttonsize \fISIZE\fP | \-\-buttonsize auto]
 .br
 [\-\-startblank]
 .br
@@ -247,7 +247,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
-[\-\-uifont=default\fP]
+[\-\-uifont=default]
 .br
 [\-\-saveoverask]
 .br
@@ -328,7 +328,7 @@ system's native resolution ("--fullscreen=native"); or run in a window
 When in fullscreen mode, use the system's default screen resolution.
 
 .TP 8
-.B \-\-WIDTHxHEIGHT
+.B \-\-\fIWIDTH\fPx\fIHEIGHT\fP
 Run \fITux Paint\fP in a particularly-sized window, or at a particular
 fullscreen resolution (if \-\-native is not used).  Default is 800x600. 
 Minimum width is 640.  Minimum height is 480.  Portrait and landscape
@@ -1221,7 +1221,7 @@ the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
 .TP 8
-.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+.B \-\-uifont=\fI"FONT NAME"\fP \-\-uifont=default
 Specify the name of a font for Tux Paint to attempt to use for its user
 interface (UI) -- button labels, dialog pop-up text, instructional text at
 the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
diff --git a/man/fr_FR.UTF-8/tuxpaint.1 b/man/fr_FR.UTF-8/tuxpaint.1
index 84c0935b4..924592658 100644
--- a/man/fr_FR.UTF-8/tuxpaint.1
+++ b/man/fr_FR.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2023.06.01
-.TH TUXPAINT 1 "juin  1, 2023" "0.9.31" "Tux Paint"
+.\" tuxpaint.1 - 2023.06.04
+.TH TUXPAINT 1 "juin  4, 2023" "0.9.31" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants.
 
@@ -13,13 +13,13 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants.
 .br
 [\-\-allowscreensaver]
 .br
-[\-\-WIDTHxHEIGHT]
+[\-\-\fIWIDTH\fPx\fIHEIGHT\fP]
 .br
 [\-\-native]
 .br
 [\-\-orient=portrait]
 .br
-[\-\-buttonsize SIZE | \-\-buttonsize auto]
+[\-\-buttonsize \fISIZE\fP | \-\-buttonsize auto]
 .br
 [\-\-startblank]
 .br
@@ -247,7 +247,7 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants.
 .br
 [\-\-currentlocalefont]
 .br
-[\-\-uifont=default\fP]
+[\-\-uifont=default]
 .br
 [\-\-saveoverask]
 .br
@@ -332,7 +332,7 @@ défaut).
 En mode plein écran, utilise la résolution de l'écran par défaut.
 
 .TP 8
-.B \-\-WIDTHxHEIGHT
+.B \-\-\fIWIDTH\fPx\fIHEIGHT\fP
 Fait tourner \fITux Paint\fP dans une fenêtre de dimensions
 particulières, ou dans une résolution plein écran particulière (si
 \-\-native n'est pas utilisé). Valeur par défaut 800x600. Largeur minimum
@@ -1255,7 +1255,7 @@ telles fontes, pour les outils Texte et Étiquette. (C'était le
 comportement par défaut pour les versions antérieures à la 0.9.21).
 
 .TP 8
-.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+.B \-\-uifont=\fI"FONT NAME"\fP \-\-uifont=default
 Specify the name of a font for Tux Paint to attempt to use for its user
 interface (UI) -- button labels, dialog pop-up text, instructional text at
 the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
diff --git a/man/gl_ES.UTF-8/tuxpaint.1 b/man/gl_ES.UTF-8/tuxpaint.1
index 969ea8e97..dc887200c 100644
--- a/man/gl_ES.UTF-8/tuxpaint.1
+++ b/man/gl_ES.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2023.06.01
-.TH TUXPAINT 1 " 1 de Xuño de 2023" "0.9.31" "Tux Paint"
+.\" tuxpaint.1 - 2023.06.04
+.TH TUXPAINT 1 " 4 de Xuño de 2023" "0.9.31" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -13,13 +13,13 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-allowscreensaver]
 .br
-[\-\-WIDTHxHEIGHT]
+[\-\-\fILARGO\fPx\fIALTO\fP]
 .br
 [\-\-native]
 .br
 [\-\-orient=portrait]
 .br
-[\-\-buttonsize TAMAÑO | \-\-buttonsize auto]
+[\-\-buttonsize \fITAMAÑO\fP | \-\-buttonsize auto]
 .br
 [\-\-startblank]
 .br
@@ -247,7 +247,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
-[\-\-uifont=default\fP]
+[\-\-uifont=default]
 .br
 [\-\-saveoverask]
 .br
@@ -328,7 +328,7 @@ system's native resolution ("--fullscreen=native"); or run in a window
 When in fullscreen mode, use the system's default screen resolution.
 
 .TP 8
-.B \-\-WIDTHxHEIGHT
+.B \-\-\fILARGO\fPx\fIALTO\fP
 Run \fITux Paint\fP in a particularly-sized window, or at a particular
 fullscreen resolution (if \-\-native is not used).  Default is 800x600. 
 Minimum width is 640.  Minimum height is 480.  Portrait and landscape
@@ -1225,7 +1225,7 @@ the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
 .TP 8
-.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+.B \-\-uifont=\fI"FONT NAME"\fP \-\-uifont=default
 Specify the name of a font for Tux Paint to attempt to use for its user
 interface (UI) -- button labels, dialog pop-up text, instructional text at
 the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
diff --git a/man/ja_JP.UTF-8/tuxpaint.1 b/man/ja_JP.UTF-8/tuxpaint.1
index 5a7e55770..15517764d 100644
--- a/man/ja_JP.UTF-8/tuxpaint.1
+++ b/man/ja_JP.UTF-8/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2023.06.01
-.TH TUXPAINT 1 "2023年6月 1日" "0.9.31" "Tux Paint"
+.\" tuxpaint.1 - 2023.06.04
+.TH TUXPAINT 1 "2023年6月 4日" "0.9.31" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -13,13 +13,13 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-allowscreensaver]
 .br
-[\-\-WIDTHxHEIGHT]
+[\-\-\fIWIDTH\fPx\fIHEIGHT\fP]
 .br
 [\-\-native]
 .br
 [\-\-orient=portrait]
 .br
-[\-\-buttonsize SIZE | \-\-buttonsize auto]
+[\-\-buttonsize \fISIZE\fP | \-\-buttonsize auto]
 .br
 [\-\-startblank]
 .br
@@ -247,7 +247,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
-[\-\-uifont=default\fP]
+[\-\-uifont=default]
 .br
 [\-\-saveoverask]
 .br
@@ -328,7 +328,7 @@ system's native resolution ("--fullscreen=native"); or run in a window
 When in fullscreen mode, use the system's default screen resolution.
 
 .TP 8
-.B \-\-WIDTHxHEIGHT
+.B \-\-\fIWIDTH\fPx\fIHEIGHT\fP
 Run \fITux Paint\fP in a particularly-sized window, or at a particular
 fullscreen resolution (if \-\-native is not used).  Default is 800x600. 
 Minimum width is 640.  Minimum height is 480.  Portrait and landscape
@@ -1224,7 +1224,7 @@ the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
 .TP 8
-.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+.B \-\-uifont=\fI"FONT NAME"\fP \-\-uifont=default
 Specify the name of a font for Tux Paint to attempt to use for its user
 interface (UI) -- button labels, dialog pop-up text, instructional text at
 the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"