Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 31 deletions

diff --git a/templates/man5/sane-matsushita.5.pot b/templates/man5/sane-matsushita.5.pot
index b8d607b7..304fd1e4 100644
--- a/templates/man5/sane-matsushita.5.pot
+++ b/templates/man5/sane-matsushita.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:06+0100\n"
+"POT-Creation-Date: 2024-06-01 06:18+0200\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"
@@ -88,7 +88,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "(*) WARNING: None of the advanced options of these scanners are available (i."
 "e. no color, no high resolution, no automatic cropping). Basically, the "
@@ -104,12 +104,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "Valid command line options and their syntax can be listed by using:"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "I<scanimage --help -d matsushita>"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgid "B<--paper-size A4|...|Legal|Letter [A4]>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "selects the area to scan. It adjusts the B<-l -t -x -y> options accordingly. "
 "It does not need to be the real size of the paper."
@@ -203,7 +203,7 @@ msgid "B<-l -t -x -y>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "controls the scan area: -l sets the top left x coordinate, -t the top left y "
 "coordinate, -x selects the width and -y the height of the scan area. All "
@@ -272,7 +272,7 @@ msgid "B<--halftone-pattern>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "sets the tonal gradation for the halftone mode. Pattern downloading is not "
 "implemented by the backend."
@@ -299,7 +299,7 @@ msgid "B<--white-level>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "indicates the source of the white base."
 msgstr ""
 
@@ -325,7 +325,7 @@ msgid "B<--image-emphasis>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "sets the image emphasis. Some selection are not available on all scanners."
 msgstr ""
@@ -338,7 +338,7 @@ msgid "B<--gamma>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "sets the gamma curve. It is only valid for Gray modes, and is not available "
 "on all scanners. Gamma downloading is not implemented by the backend."
@@ -352,7 +352,7 @@ msgid "CONFIGURATION FILE"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "The configuration file I</etc/sane.d/matsushita.conf> supports the device "
 "name to use (e.g.  I</dev/scanner>)  and the SCSI option to auto-detect the "
@@ -561,8 +561,7 @@ msgid "I<http://www.zago.net/sane/#matsushita>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "(*) WARNING: None of the advanced options of these scanners are available "
 "(ie no color, no high resolution, no automatic cropping). Basically, the "
@@ -571,28 +570,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid "Valid command line options and their syntax can be listed by using"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid "scanimage --help -d matsushita"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "options selects the area to scan. It adjust the B<-l -t -x -y> options "
 "accordingly. It does not need to be the real size of the paper."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "control the scan area: -l sets the top left x coordinate, -t the top left y "
 "coordinate, -x selects the width and -y the height of the scan area. All "
@@ -601,30 +596,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "option sets the tonal gradation for the halftone mode. Pattern downloading "
 "is not implemented by the backend."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid "option indicate the source of the white base."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "option sets the image emphasis. Some selection are not available on all "
 "scanners."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "options set the gamma curve. It is only valid for Gray modes, and is not "
 "available on all scanners. Gamma downloading is not implemented by the "
@@ -632,8 +623,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide opensuse-leap-15-6
 msgid ""
 "The configuration file I</etc/sane.d/matsushita.conf> supports the device "
 "name to use (eg I</dev/scanner>)  and the SCSI option to auto-detect the "