Merging upstream version 4.23.0.

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

1 files changed, 9 insertions, 13 deletions

diff --git a/templates/man5/sane-scsi.5.pot b/templates/man5/sane-scsi.5.pot
index 858f0538..93883e4b 100644
--- a/templates/man5/sane-scsi.5.pot
+++ b/templates/man5/sane-scsi.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:07+0100\n"
+"POT-Creation-Date: 2024-06-01 06:19+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"
@@ -106,7 +106,7 @@ msgid "scsi I<VENDOR MODEL TYPE BUS CHANNEL ID LUN>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "where I<VENDOR> is the SCSI vendor string, I<MODEL> is the SCSI model "
 "string, I<TYPE> is the SCSI device type string, I<BUS> is the SCSI bus "
@@ -350,7 +350,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "To keep scanning times to a minimum, it is strongly recommended to use a "
 "large buffer size for the generic SCSI driver. From SG driver version 2.0 "
@@ -527,7 +527,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "For Linux kernels before 2.0.33 it may be necessary to increase the SCSI "
 "timeout. The default timeout for the Linux kernels before 2.0.33 is 10 "
@@ -574,7 +574,7 @@ msgid "SOLARIS, OPENSTEP AND NEXTSTEP INFO"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Under Solaris, OpenStep and NeXTStep, the generic SCSI device name refers to "
 "a SCSI bus, not to an individual device.  For example, I</dev/sg0> refers to "
@@ -654,8 +654,7 @@ msgid "David Mosberger"
 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 ""
 "where I<VENDOR> is the SCSI vendor string, I<MODEL> is the SCSI model "
 "string, I<TYPE> is type SCSI device type string, I<BUS> is the SCSI bus "
@@ -675,8 +674,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 ""
 "To keep scanning times to a minimum, it is strongly recommended to use a "
 "large buffer size for the generic SCSI driver. From SG driver version 2.0 "
@@ -694,8 +692,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 ""
 "For Linux kernels before 2.0.33 it may be necessary to increase the SCSI "
 "timeout. The default timeout for the Linux kernels before 2.0.33 is 10 "
@@ -709,8 +706,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 ""
 "Under Solaris, OpenStep and NeXTStep, the generic SCSI device name refers to "
 "a SCSI bus, not to an individual device.  For example, I</dev/sg0> refers to "