Merging upstream version 4.23.0.

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

1 files changed, 96 insertions, 30 deletions

diff --git a/templates/man2/shmctl.2.pot b/templates/man2/shmctl.2.pot
index c3ed7e89..3838f01b 100644
--- a/templates/man2/shmctl.2.pot
+++ b/templates/man2/shmctl.2.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:08+0100\n"
+"POT-Creation-Date: 2024-06-01 06:21+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 "shmctl"
 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
@@ -76,10 +76,9 @@ msgid "B<#include E<lt>sys/shm.hE<gt>>\n"
 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
 #, no-wrap
-msgid "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>\n"
+msgid "B<int shmctl(int >I<shmid>B<, int >I<op>B<, struct shmid_ds *>I<buf>B<);>\n"
 msgstr ""
 
 #. type: SH
@@ -90,10 +89,9 @@ msgid "DESCRIPTION"
 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 ""
-"B<shmctl>()  performs the control operation specified by I<cmd> on the "
+"B<shmctl>()  performs the control operation specified by I<op> on the "
 "System\\ V shared memory segment whose identifier is given in I<shmid>."
 msgstr ""
 
@@ -368,9 +366,8 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "Valid values for I<cmd> are:"
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "Valid values for I<op> are:"
 msgstr ""
 
 #. type: TP
@@ -580,11 +577,10 @@ msgid ""
 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 ""
 "The caller can prevent or allow swapping of a shared memory segment with the "
-"following I<cmd> values:"
+"following I<op> values:"
 msgstr ""
 
 #. type: TP
@@ -691,10 +687,9 @@ msgid "B<EFAULT>"
 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 ""
-"The argument I<cmd> has value B<IPC_SET> or B<IPC_STAT> but the address "
+"The argument I<op> has value B<IPC_SET> or B<IPC_STAT> but the address "
 "pointed to by I<buf> isn't accessible."
 msgstr ""
 
@@ -719,10 +714,9 @@ msgid "B<EINVAL>"
 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 ""
-"I<shmid> is not a valid identifier, or I<cmd> is not a valid command.  Or: "
+"I<shmid> is not a valid identifier, or I<op> is not a valid operation.  Or: "
 "for a B<SHM_STAT> or B<SHM_STAT_ANY> operation, the index value specified in "
 "I<shmid> referred to an array slot that is currently unused."
 msgstr ""
@@ -834,13 +828,12 @@ msgid "POSIX.1-2001, SVr4."
 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 ""
 "Various fields in a I<struct shmid_ds> were typed as I<short> under Linux "
 "2.2 and have become I<long> under Linux 2.4.  To take advantage of this, a "
 "recompilation under glibc-2.1.91 or later should suffice.  (The kernel "
-"distinguishes old and new calls by an B<IPC_64> flag in I<cmd>.)"
+"distinguishes old and new calls by an B<IPC_64> flag in I<op>.)"
 msgstr ""
 
 #. type: SH
@@ -886,6 +879,46 @@ msgstr ""
 msgid "Linux man-pages 6.03"
 msgstr ""
 
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>\n"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"B<shmctl>()  performs the control operation specified by I<cmd> on the "
+"System\\ V shared memory segment whose identifier is given in I<shmid>."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "Valid values for I<cmd> are:"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"The caller can prevent or allow swapping of a shared memory segment with the "
+"following I<cmd> values:"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"The argument I<cmd> has value B<IPC_SET> or B<IPC_STAT> but the address "
+"pointed to by I<buf> isn't accessible."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"I<shmid> is not a valid identifier, or I<cmd> is not a valid command.  Or: "
+"for a B<SHM_STAT> or B<SHM_STAT_ANY> operation, the index value specified in "
+"I<shmid> referred to an array slot that is currently unused."
+msgstr ""
+
 #.  SVr4 documents additional error conditions EINVAL,
 #.  ENOENT, ENOSPC, ENOMEM, EEXIST.  Neither SVr4 nor SVID documents
 #.  an EIDRM error condition.
@@ -894,16 +927,43 @@ msgstr ""
 msgid "POSIX.1-2001, POSIX.1-2008, SVr4."
 msgstr ""
 
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Various fields in a I<struct shmid_ds> were typed as I<short> under Linux "
+"2.2 and have become I<long> under Linux 2.4.  To take advantage of this, a "
+"recompilation under glibc-2.1.91 or later should suffice.  (The kernel "
+"distinguishes old and new calls by an B<IPC_64> flag in I<cmd>.)"
+msgstr ""
+
 #. type: TH
-#: debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "2023-03-30"
+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 "2024-03-03"
 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
+#: opensuse-leap-15-6
+#, no-wrap
+msgid "2023-03-30"
 msgstr ""
 
 #. type: TH
@@ -911,3 +971,9 @@ msgstr ""
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr ""