Merging upstream version 4.23.0.

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

1 files changed, 13 insertions, 19 deletions

diff --git a/templates/man5/sane-bh.5.pot b/templates/man5/sane-bh.5.pot
index 35b47cad..c47f7949 100644
--- a/templates/man5/sane-bh.5.pot
+++ b/templates/man5/sane-bh.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:17+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"
@@ -223,7 +223,7 @@ msgid "B<--mode lineart|halftone [lineart]>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 
@@ -397,7 +397,7 @@ msgid "B<--source Automatic Document Feeder|Manual Feed Tray [Automatic Document
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Selects the scan source (such as a document feeder).  This option is "
 "provided to allow multiple image scans with B<xsane>(1); it has no other "
@@ -476,7 +476,7 @@ msgid "B<--check-adf[=(yes|no)] [no]>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Check ADF status prior to starting scan using the OBJECT POSITION command.  "
 "Note that this feature requires RSC firmware level 1.5 or higher and dip "
@@ -1047,7 +1047,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "The following options can be specified in the I<bh.conf> file:"
 msgstr ""
 
@@ -1373,7 +1373,7 @@ msgid "B<Scanning a fixed number of pages in batch mode>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "The separation of front and back end functionality in SANE presents a "
 "problem in supporting the 'cancel batch' functionality in the scanner.  In "
@@ -1411,7 +1411,7 @@ msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "Detailed bug reports are welcome -- and expected ;)"
 msgstr ""
 
@@ -1456,14 +1456,12 @@ 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 "Selects the scan mode (e.g., lineart,monochrome, or color)."
 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 ""
 "Selects the scan source (such as a document feeder).  This option is "
 "provided to allow multiple image scans with B<xsane>(1);"
@@ -1471,8 +1469,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 ""
 "Check ADF Status prior to starting scan using the OBJECT POSITION command.  "
 "Note that this feature requires RSC firmware level 1.5 or higher and dip "
@@ -1481,8 +1478,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 following options can be specified in the I<bh.conf> file."
 msgstr ""
 
@@ -1499,8 +1495,7 @@ msgid "I</usr/lib/x86_64-linux-gnu/sane/libsane-bh.so>"
 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 separation of front and back end functionality in SANE presents a "
 "problem in supporting the 'cancel batch' functionality in the scanner.  In "
@@ -1515,8 +1510,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 ""
 "This is a new backend; detailed bug reports are welcome -- and expected ;)"
 msgstr ""