Merging upstream version 4.23.0.

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

1 files changed, 70 insertions, 91 deletions

diff --git a/templates/man8/saned.8.pot b/templates/man8/saned.8.pot
index c1d98f64..2f60d52b 100644
--- a/templates/man8/saned.8.pot
+++ b/templates/man8/saned.8.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"
@@ -58,7 +58,7 @@ msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "B<saned> B<[ -a> I<[ username ]> B<]> B<[ -u> I<username> B<]> B<[ -b> "
 "I<address> B<]> B<[ -p> I<port> B<]> B<[ -l ]> B<[ -D ]> B<[ -o ]> B<[ -d> "
@@ -230,13 +230,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 #, no-wrap
 msgid "B<-B>, B<--buffer-size=>I<buffer-size>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "specifies the size of the read buffer used for communication with the "
 "backend in KB.  Default value is 1MB."
@@ -485,13 +485,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "B<saned> does I<not> provide confidentiality when communicating with "
 "clients. If B<saned> is exposed directly on the network, other users may be "
@@ -501,7 +501,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux
+#: archlinux debian-unstable mageia-cauldron opensuse-tumbleweed
 msgid ""
 "B<saned> is not a trusted program and should not run with root privileges."
 msgstr ""
@@ -549,8 +549,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 ""
 "B<saned> B<[ -a> I<[ username ]> B<]> B<[ -u> I<username> B<]> B<[ -b> "
 "I<address> B<]> B<[ -p> I<port> B<]> B<[ -l ]> B<[ -D ]> B<[ -o ]> B<[ -d> "
@@ -558,8 +557,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 B<saned> is run from other programs such as B<inetd>(8), B<xinetd>(8)  "
 "and B<systemd>(1), check that program's documentation on how to pass command-"
@@ -567,8 +565,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 ""
 "First and foremost: B<saned> is not intended to be exposed to the internet "
 "or other non-trusted networks. Make sure that access is limited by "
@@ -578,15 +575,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: 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
 #, no-wrap
 msgid "SERVER DAEMON CONFIGURATION"
 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 B<saned> to work properly in its default mode of operation, it is also "
 "necessary to add the appropriate configuration for B<xinetd>(8), "
@@ -597,65 +592,56 @@ 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 ""
 "In the sections below the configuration for B<inetd>(8), B<xinetd>(8)  and "
 "B<systemd>(1)  are described in more detail."
 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 the configurations below it is necessary to add a line of the following "
 "form to I</etc/services>:"
 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 "sane-port 6566/tcp # SANE network scanner daemon"
 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 official IANA short name for port 6566 is \"sane-port\". The older name "
 "\"sane\" is now deprecated."
 msgstr ""
 
 #. type: SH
-#: 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
 #, no-wrap
 msgid "INETD CONFIGURATION"
 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 ""
 "It is required to add a single line to the B<inetd>(8)  configuration file "
 "I<(/etc/inetd.conf)>"
 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 configuration line normally looks like this:"
 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 "sane-port stream tcp nowait saned.saned /usr/sbin/saned saned"
 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 ""
 "However, if your system uses B<tcpd>(8)  for additional security screening, "
 "you may want to disable B<saned> access control by putting ``+'' in I<saned."
@@ -663,14 +649,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 "sane-port stream tcp nowait saned.saned /usr/sbin/tcpd /usr/sbin/saned"
 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 ""
 "Note that both examples assume that there is a B<saned> group and a B<saned> "
 "user.  If you follow this example, please make sure that the access "
@@ -680,23 +664,20 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: 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
 #, no-wrap
 msgid "XINETD CONFIGURATION"
 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 B<xinetd>(8)  is installed on your system instead of B<inetd>(8)  the "
 "following example for I</etc/xinetd.conf> may be helpful:"
 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
 #, no-wrap
 msgid ""
 "\\f(CR# default: off\n"
@@ -715,15 +696,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: 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
 #, no-wrap
 msgid "SYSTEMD CONFIGURATION"
 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> can be compiled with explicit B<systemd>(1)  support. This will "
 "allow logging debugging information to be forwarded to the B<systemd>(1)  "
@@ -732,8 +711,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 ""
 "B<saned> can be used with B<systemd>(1)  without the B<systemd>(1)  "
 "integration compiled in, but then logging of debug information is not "
@@ -741,39 +719,34 @@ 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 B<systemd>(1)  configuration is different for the 2 options, so both are "
 "described below."
 msgstr ""
 
 #. type: SH
-#: 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
 #, no-wrap
 msgid "Systemd configuration for saned with systemd support compiled in"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "For B<systemd>(1)  configuration we need to add 2 configuration files in I</"
 "etc/systemd/system>."
 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 first file we need to add here is called I<saned.socket.> It shall have "
 "the following contents:"
 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
 #, no-wrap
 msgid ""
 "\\f(CR[Unit]\n"
@@ -781,8 +754,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
 #, no-wrap
 msgid ""
 "\\f(CR[Socket]\n"
@@ -792,8 +764,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
 #, no-wrap
 msgid ""
 "\\f(CR[Install]\n"
@@ -801,15 +772,13 @@ 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 second file to be added is I<saned@.service> with the following contents:"
 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
 #, no-wrap
 msgid ""
 "\\f(CR[Unit]\n"
@@ -818,8 +787,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
 #, no-wrap
 msgid ""
 "\\f(CR[Service]\n"
@@ -836,8 +804,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
 #, no-wrap
 msgid ""
 "\\f(CR[Install]\n"
@@ -845,8 +812,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 ""
 "You need to set an environment variable for B<SANE_CONFIG_DIR> pointing to "
 "the directory where B<saned> can find its configuration files.  You will "
@@ -856,8 +822,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 ""
 "Unlike B<xinetd>(8)  and B<inetd>(8), B<systemd>(1)  allows debugging output "
 "from backends set using B<SANE_DEBUG_XXX> to be captured. See the man-page "
@@ -866,15 +831,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: 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
 #, no-wrap
 msgid "Systemd configuration when saned is compiled without systemd support"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "This configuration will also work when B<saned> is compiled WITH "
 "B<systemd>(1)  integration support, but it does not allow debugging "
@@ -882,16 +845,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "For B<systemd>(1)  configuration for B<saned>, we need to add 2 "
 "configuration files in I</etc/systemd/system>."
 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 first file we need to add here is called I<saned.socket.> It is "
 "identical to the version for B<systemd>(1)  with the support compiled in.  "
@@ -899,16 +860,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: debian-bookworm fedora-40 fedora-rawhide
 msgid ""
 "The second file to be added is I<saned@.service>.  This one differs from the "
 "version with B<systemd>(1)  integration compiled in:"
 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
 #, no-wrap
 msgid ""
 "\\f(CR[Service]\n"
@@ -919,13 +878,26 @@ 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
 #, no-wrap
 msgid "\\f(CREnvironment=SANE_CONFIG_DIR=/etc/sane.d\\fR\n"
 msgstr ""
 
 #. type: Plain text
+#: debian-unstable
+msgid ""
+"Refer to I</usr/share/doc/libsane/saned/saned.install.md> for details on "
+"configuring B<saned> as a service."
+msgstr ""
+
+#. type: Plain text
+#: mageia-cauldron
+msgid ""
+"Refer to I</usr/share/doc/sane-backends/saned/saned.install.md> for details "
+"on configuring B<saned> as a service."
+msgstr ""
+
+#. type: Plain text
 #: opensuse-leap-15-6
 msgid ""
 "The B<-l> flag requests that B<saned> run in standalone daemon mode.  In "
@@ -1039,3 +1011,10 @@ msgid ""
 "B<sane-net>(5), B<sane-\"backendname\">(5), B<inetd>(8), B<xinetd>(8), "
 "B<systemd>(1),"
 msgstr ""
+
+#. type: Plain text
+#: opensuse-tumbleweed
+msgid ""
+"Refer to I</usr/share/doc/packages/sane-backends/saned/saned.install.md> for "
+"details on configuring B<saned> as a service."
+msgstr ""