Merging upstream version 4.23.0.

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

1 files changed, 40 insertions, 14 deletions

diff --git a/templates/man7/user_namespaces.7.pot b/templates/man7/user_namespaces.7.pot
index 456b4378..bf537d7c 100644
--- a/templates/man7/user_namespaces.7.pot
+++ b/templates/man7/user_namespaces.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:13+0100\n"
+"POT-Creation-Date: 2024-06-01 06:33+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"
@@ -24,15 +24,15 @@ msgid "user_namespaces"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-10-31"
+msgid "2024-05-02"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable
 #, no-wrap
-msgid "Linux man-pages 6.06"
+msgid "Linux man-pages 6.8"
 msgstr ""
 
 #. type: SH
@@ -376,13 +376,12 @@ msgid "I<overlayfs> (since Linux 5.11)"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
 "Holding B<CAP_SYS_ADMIN> within the user namespace that owns a process's "
 "cgroup namespace allows (since Linux 4.6)  that process to the mount the "
 "cgroup version 2 filesystem and cgroup version 1 named hierarchies (i.e., "
-"cgroup filesystems mounted with the I<\"none,name=\"> option)."
+"cgroup filesystems mounted with the I<\\[dq]none,name=\\[dq]> option)."
 msgstr ""
 
 #. type: Plain text
@@ -656,8 +655,8 @@ msgid ""
 "maps to a range starting at 0 in the (nonexistent) parent namespace, and the "
 "length of the range is the largest 32-bit unsigned integer.  This leaves "
 "4294967295 (the 32-bit signed -1 value) unmapped.  This is deliberate: "
-"I<(uid_t)\\~-1> is used in several interfaces (e.g., B<setreuid>(2))  as a "
-"way to specify \"no user ID\".  Leaving I<(uid_t)\\~-1> unmapped and "
+"I<(uid_t)\\ -1> is used in several interfaces (e.g., B<setreuid>(2))  as a "
+"way to specify \"no user ID\".  Leaving I<(uid_t)\\ -1> unmapped and "
 "unusable guarantees that there will be no confusion when using these "
 "interfaces."
 msgstr ""
@@ -1835,6 +1834,15 @@ msgstr ""
 msgid "Linux man-pages 6.03"
 msgstr ""
 
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Holding B<CAP_SYS_ADMIN> within the user namespace that owns a process's "
+"cgroup namespace allows (since Linux 4.6)  that process to the mount the "
+"cgroup version 2 filesystem and cgroup version 1 named hierarchies (i.e., "
+"cgroup filesystems mounted with the I<\"none,name=\"> option)."
+msgstr ""
+
 #. type: SS
 #: debian-bookworm
 #, no-wrap
@@ -2391,15 +2399,27 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "2023-10-31"
+msgstr ""
+
+#. type: TH
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "Linux man-pages 6.06"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
 #, no-wrap
-msgid "2023-05-03"
+msgid "2024-02-25"
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-rawhide
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.7"
 msgstr ""
 
 #. type: TH
@@ -2413,3 +2433,9 @@ msgstr ""
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr ""