Merging upstream version 4.23.0.

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

1 files changed, 15 insertions, 22 deletions

diff --git a/templates/man5/sane-apple.5.pot b/templates/man5/sane-apple.5.pot
index cc405d1e..6f6be00a 100644
--- a/templates/man5/sane-apple.5.pot
+++ b/templates/man5/sane-apple.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"
@@ -226,7 +226,7 @@ msgid "B<SANE_CONFIG_DIR>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "This environment variable is a list of directories where SANE looks for the "
 "configuration file.  On *NIX systems, directory names are separated by a "
@@ -461,7 +461,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "We know we have a GUI bug when a parameter is not showing up when it should "
 "(active) or vice versa. Finding out which parameters are active across "
@@ -589,7 +589,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "If you want to offer some help but you don't have a scanner, or you don't "
 "have the model you would like to help with, or you are a SANE developer and "
@@ -600,7 +600,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "If you encounter a SCSI bus error or trimmed and/or displaced images please "
 "set the environment variable B<SANE_DEBUG_SANEI_SCSI> to 255 before sending "
@@ -622,7 +622,7 @@ msgid "B<Non Blocking Support>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Make B<sane-apple> a non blocking backend. Properly support "
 "B<sane_set_io_mode>()  and B<sane_get_select_fd>()."
@@ -642,7 +642,7 @@ msgid "Make scanning possible for all models in all supported modes."
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid "Add other missing functionality."
 msgstr ""
 
@@ -667,7 +667,7 @@ msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "The B<sane-apple> backend was written not entirely from scratch by Milon "
 "Firikis. It is mostly based on the B<sane-mustek>(5)  backend from David "
@@ -687,8 +687,7 @@ msgid "I</usr/lib/x86_64-linux-gnu/sane/libsane-apple.so>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "This environment variable is list of directories where SANE looks for the "
 "configuration file.  On *NIX systems, directory names are separated by a "
@@ -702,8 +701,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 ""
 "We know we have a GUI bug when a parameter is not showing up when it should "
 "(active) or vice versa. Finding out which parameters are active across "
@@ -715,8 +713,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 ""
 "If you want to offer some help but you don't have a scanner, or you don't "
 "have the model you would like to help with, or you are a SANE developer and "
@@ -727,8 +724,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 ""
 "If you encounter a SCSI bus error or trimmed and/or displaced images please "
 "set the environment variable SANE_DEBUG_SANEI_SCSI to 255 before sending me "
@@ -736,22 +732,19 @@ 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 ""
 "Make B<sane-apple> a non blocking backend. Properly support "
 "B<sane_set_io_mode>()  and B<sane_get_select_fd>()"
 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 "Add other missing functionality"
 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-apple> backend was written not entirely from scratch by Milon "
 "Firikis. It is mostly based on the B<sane-mustek>(5)  backend from David "