Merging upstream version 4.23.0.

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

1 files changed, 10 insertions, 15 deletions

diff --git a/templates/man5/sane-hp.5.pot b/templates/man5/sane-hp.5.pot
index 460ffd4c..a828ad2e 100644
--- a/templates/man5/sane-hp.5.pot
+++ b/templates/man5/sane-hp.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"
@@ -105,14 +105,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Support for models 5200C/62X0C/63X0C connected to USB requires libusb. See "
 "B<sane-usb>(5)  for more details."
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "The B<sane-hp> backend no longer supports OfficeJet multi-function "
 "peripherals.  For these devices use the external \"hplip\" packages "
@@ -134,7 +134,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "More details about the hp backend can be found on its homepage I<http://web."
 "archive.org/web/20070206115546/http://www.kirchgessner.net/sane.html>."
@@ -397,7 +397,7 @@ msgid "B<SANE_HOME_HP>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Only used for OS/2 and along with use of HP PhotoSmart PhotoScanner.  Must "
 "be set to the directory where the directory I<.sane> is located. Is used to "
@@ -594,16 +594,14 @@ msgid "HP PhotoSmart PhotoScanner support by Peter Kirchgessner."
 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 ""
 "Support for models 5200C/62X0C/63X0C connected to the USB require the kernel "
 "scanner driver or libusb. See B<sane-usb>(5)  for more details."
 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 B<sane-hp> backend no longer supports OfficeJet multi-function "
 "peripherals.  For these devices use the external \"hpoj\" backend in version "
@@ -611,14 +609,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 "I<http://hpoj.sourceforge.net>"
 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 ""
 "More details about the hp backend can be found on its homepage I<http://www."
 "kirchgessner.net/sane.html>."
@@ -637,8 +633,7 @@ msgid "I</usr/lib/x86_64-linux-gnu/sane/libsane-hp.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 ""
 "Only used for OS/2 and along with use of HP PhotoSmart PhotoScanner.  Must "
 "be set to the directory where the directory .sane is located.  Is used to "