Merging upstream version 4.23.0.

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

1 files changed, 47 insertions, 12 deletions

diff --git a/templates/man7/sane.7.pot b/templates/man7/sane.7.pot
index 43f9bbd6..c35a37f6 100644
--- a/templates/man7/sane.7.pot
+++ b/templates/man7/sane.7.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"
@@ -876,13 +876,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 #, no-wrap
 msgid "B<lexmark_x2600>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Supports the Lexmark X2600 series of USB scanners. See B<sane-"
 "lexmark_x2600>(5)  for details."
@@ -1829,7 +1829,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "So now scanning with B<scanimage (1)> works and you want to use one of the "
 "graphical frontends like B<xsane>(1)B<,> B<xscanimage>(1)B<, or> "
@@ -1884,7 +1884,7 @@ msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "B<saned>(8), B<sane-find-scanner>(1), B<scanimage>(1), B<sane-abaton>(5), "
 "B<sane-agfafocus>(5), B<sane-apple>(5), B<sane-artec>(5), B<sane-"
@@ -1928,7 +1928,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable
+#: debian-bookworm
 msgid ""
 "The following sections provide short descriptions and links to more "
 "information about several aspects of B<SANE.> A name with a number in "
@@ -2007,8 +2007,7 @@ msgid "I</usr/share/doc/libsane/*>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "So now scanning with B<scanimage (1)> works and you want to use one of the "
 "graphical frontends like B<xsane>(1)B<,> B<xscanimage>(1)B<, or> "
@@ -2034,8 +2033,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "B<saned>(8), B<sane-find-scanner>(1), B<scanimage>(1), B<sane-abaton>(5), "
 "B<sane-agfafocus>(5), B<sane-apple>(5), B<sane-artec>(5), B<sane-"
@@ -2071,7 +2069,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: fedora-40 fedora-rawhide mageia-cauldron
+#: debian-unstable
+msgid ""
+"The following sections provide short descriptions and links to more "
+"information about several aspects of B<SANE>.  A name with a number in "
+"parenthesis (e.g.  B<sane-dll>(5))  points to a manual page. In this case "
+"I<man\\ 5\\ sane-dll> will display the page. Entries like I</usr/share/doc/"
+"libsane/README> are references to text files that were copied to the B<SANE> "
+"documentation directory (I</usr/share/doc/libsane/>)  during installation. "
+"Everything else is a URL to a resource on the web."
+msgstr ""
+
+#. type: Plain text
+#: fedora-40 fedora-rawhide
 msgid ""
 "The following sections provide short descriptions and links to more "
 "information about several aspects of B<SANE.> A name with a number in "
@@ -2173,6 +2183,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: mageia-cauldron
+msgid ""
+"The following sections provide short descriptions and links to more "
+"information about several aspects of B<SANE>.  A name with a number in "
+"parenthesis (e.g.  B<sane-dll>(5))  points to a manual page. In this case "
+"I<man\\ 5\\ sane-dll> will display the page. Entries like I</usr/share/doc/"
+"sane-backends/README> are references to text files that were copied to the "
+"B<SANE> documentation directory (I</usr/share/doc/sane-backends/>)  during "
+"installation. Everything else is a URL to a resource on the web."
+msgstr ""
+
+#. type: Plain text
 #: opensuse-leap-15-6
 msgid ""
 "The package B<sane-backends> contains backends, documentation, networking "
@@ -2184,7 +2206,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: opensuse-leap-15-6
 msgid ""
 "The following sections provide short descriptions and links to more "
 "information about several aspects of B<SANE.> A name with a number in "
@@ -2379,3 +2401,16 @@ msgid ""
 "Geinitz. Quite a lot of text was taken from the B<SANE> standard, several "
 "man pages, and README files."
 msgstr ""
+
+#. type: Plain text
+#: opensuse-tumbleweed
+msgid ""
+"The following sections provide short descriptions and links to more "
+"information about several aspects of B<SANE>.  A name with a number in "
+"parenthesis (e.g.  B<sane-dll>(5))  points to a manual page. In this case "
+"I<man\\ 5\\ sane-dll> will display the page. Entries like I</usr/share/doc/"
+"packages/sane-backends/README> are references to text files that were copied "
+"to the B<SANE> documentation directory (I</usr/share/doc/packages/sane-"
+"backends/>)  during installation. Everything else is a URL to a resource on "
+"the web."
+msgstr ""