Merging upstream version 4.23.0.

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

1 files changed, 14 insertions, 51 deletions

diff --git a/templates/man8/nfsd.8.pot b/templates/man8/nfsd.8.pot
index f04cdeba..ab4f5671 100644
--- a/templates/man8/nfsd.8.pot
+++ b/templates/man8/nfsd.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-15 18:05+0100\n"
+"POT-Creation-Date: 2024-05-01 15:46+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"
@@ -199,7 +199,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "This option can be used to request that B<rpc.nfsd> does not offer certain "
 "versions of NFS. The current version of B<rpc.nfsd> can support major NFS "
@@ -225,14 +225,14 @@ msgstr ""
 
 #. type: TP
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "B<-t  or  --tcp>"
 msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "Instruct the kernel nfs server to open and listen on a TCP socket. This is "
 "the default."
@@ -247,20 +247,20 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid "Instruct the kernel nfs server not to open and listen on a TCP socket."
 msgstr ""
 
 #. type: TP
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "B<-u  or  --udp>"
 msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid "Instruct the kernel nfs server to open and listen on a UDP socket."
 msgstr ""
 
@@ -273,7 +273,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "Instruct the kernel nfs server not to open and listen on a UDP socket. This "
 "is the default."
@@ -288,7 +288,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "This option can be used to request that B<rpc.nfsd> offer certain versions "
 "of NFS. The current version of B<rpc.nfsd> can support major NFS versions "
@@ -462,7 +462,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "Enable RDMA port (with \"on\" or \"yes\" etc) on the standard port "
 "(\"nfsrdma\", port 20049)."
@@ -470,14 +470,14 @@ msgstr ""
 
 #. type: TP
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "B<rdma-port>"
 msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid "Set an alternate RDMA port."
 msgstr ""
 
@@ -524,7 +524,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "Enable or disable B<all> NFSv4 versions.  All versions are normally enabled "
 "by default."
@@ -611,45 +611,8 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Enable or disable a major NFS version.  3 and 4 are normally enabled by "
 "default."
 msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"This option can be used to request that B<rpc.nfsd> does not offer certain "
-"versions of NFS. The current version of B<rpc.nfsd> can support major NFS "
-"versions 2,3,4 and the minor versions 4.1 and 4.2."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "Disable B<rpc.nfsd> from accepting TCP connections from clients."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "Disable B<rpc.nfsd> from accepting UDP connections from clients."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"This option can be used to request that B<rpc.nfsd> offer certain versions "
-"of NFS. The current version of B<rpc.nfsd> can support major NFS versions "
-"2,3,4 and the minor versions 4.1 and 4.2."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "Set RDMA port.  Use \"rdma=nfsrdma\" to enable standard port."
-msgstr ""
-
-#. type: TP
-#: opensuse-leap-15-6
-#, no-wrap
-msgid "B<vers2>"
-msgstr ""