Merging upstream version 4.23.0.

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

1 files changed, 150 insertions, 41 deletions

diff --git a/po/ru/man2/shmctl.2.po b/po/ru/man2/shmctl.2.po
index 51e2b44b..d9d50395 100644
--- a/po/ru/man2/shmctl.2.po
+++ b/po/ru/man2/shmctl.2.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:08+0100\n"
+"POT-Creation-Date: 2024-06-01 06:21+0200\n"
 "PO-Revision-Date: 2019-10-15 18:55+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -20,9 +20,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
-"(n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: TH
@@ -33,16 +33,17 @@ msgid "shmctl"
 msgstr "shmctl"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-10-31"
-msgstr "31 октября 2023 г."
+msgid "2024-05-02"
+msgstr "2 мая 2024 г."
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-#, no-wrap
-msgid "Linux man-pages 6.06"
-msgstr "Linux man-pages 6.06"
+#: archlinux debian-unstable
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages 6.8"
+msgstr "Linux man-pages 6.7"
 
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -85,11 +86,10 @@ msgid "B<#include E<lt>sys/shm.hE<gt>>\n"
 msgstr "B<#include E<lt>sys/shm.hE<gt>>\n"
 
 #. 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
 #, fuzzy, no-wrap
 #| msgid "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>"
-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 "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>"
 
 #. type: SH
@@ -100,11 +100,14 @@ 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
+#, fuzzy
+#| 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>."
 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>."
+"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 ""
 "Вызов B<shmctl>() выполняет управляющую операцию, указанную в I<cmd>, над "
 "общим сегментом памяти System\\ V, чей идентификатор задан в I<shmid>."
@@ -452,9 +455,10 @@ 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
+#, fuzzy
+#| msgid "Valid values for I<cmd> are:"
+msgid "Valid values for I<op> are:"
 msgstr "Возможные значения I<cmd>:"
 
 #. type: TP
@@ -730,11 +734,14 @@ msgstr ""
 "может прочитать эту же информацию из I</proc/sysvipc/shm>)."
 
 #. 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
+#, fuzzy
+#| msgid ""
+#| "The caller can prevent or allow swapping of a shared memory segment with "
+#| "the following I<cmd> values:"
 msgid ""
 "The caller can prevent or allow swapping of a shared memory segment with the "
-"following I<cmd> values:"
+"following I<op> values:"
 msgstr ""
 "Вызывающий может запретить или разрешить размещение общего сегмента памяти в "
 "пространство подкачки с помощью следующих значений I<cmd>:"
@@ -876,10 +883,13 @@ msgid "B<EFAULT>"
 msgstr "B<EFAULT>"
 
 #. 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
+#, fuzzy
+#| 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."
 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 ""
 "Значение аргумента I<cmd> равно B<IPC_SET> или B<IPC_STAT>, но адрес, "
@@ -906,10 +916,14 @@ msgid "B<EINVAL>"
 msgstr "B<EINVAL>"
 
 #. 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
+#, fuzzy
+#| 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."
 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 ""
@@ -1058,13 +1072,18 @@ msgid "POSIX.1-2001, SVr4."
 msgstr "POSIX.1-2001, SVr4."
 
 #. 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
+#, fuzzy
+#| 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>.)"
 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 ""
 "В Linux 2.2 различные поля I<struct shmid_ds> имели тип I<short>. В Linux "
 "2.4 тип был изменён на I<long>. Для задействования преимуществ этого "
@@ -1077,7 +1096,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "NOTES"
-msgstr "ЗАМЕЧАНИЯ"
+msgstr "ПРИМЕЧАНИЯ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -1102,7 +1121,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "СМ. ТАКЖЕ"
+msgstr "СМОТРИТЕ ТАКЖЕ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -1126,6 +1145,57 @@ msgstr "15 декабря 2022 г."
 msgid "Linux man-pages 6.03"
 msgstr "Linux man-pages 6.03"
 
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, fuzzy, no-wrap
+#| msgid "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>"
+msgid "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>\n"
+msgstr "B<int shmctl(int >I<shmid>B<, int >I<cmd>B<, struct shmid_ds *>I<buf>B<);>"
+
+#. 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 ""
+"Вызов B<shmctl>() выполняет управляющую операцию, указанную в I<cmd>, над "
+"общим сегментом памяти System\\ V, чей идентификатор задан в I<shmid>."
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "Valid values for I<cmd> are:"
+msgstr "Возможные значения I<cmd>:"
+
+#. 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 ""
+"Вызывающий может запретить или разрешить размещение общего сегмента памяти в "
+"пространство подкачки с помощью следующих значений I<cmd>:"
+
+#. 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 ""
+"Значение аргумента I<cmd> равно B<IPC_SET> или B<IPC_STAT>, но адрес, "
+"указанный в I<buf>, недоступен."
+
+#. 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 ""
+"Значение I<shmid> содержит недопустимый идентификатор, или I<cmd> содержит "
+"недопустимую команду. Или (для B<SHM_STAT> или B<SHM_STAT_ANY>) индекс "
+"I<shmid> ссылается на элемент массива, который в данный момент не "
+"используется."
+
 #.  SVr4 documents additional error conditions EINVAL,
 #.  ENOENT, ENOSPC, ENOMEM, EEXIST.  Neither SVr4 nor SVID documents
 #.  an EIDRM error condition.
@@ -1134,20 +1204,59 @@ msgstr "Linux man-pages 6.03"
 msgid "POSIX.1-2001, POSIX.1-2008, SVr4."
 msgstr "POSIX.1-2001, POSIX.1-2008, SVr4."
 
+#. 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 ""
+"В Linux 2.2 различные поля I<struct shmid_ds> имели тип I<short>. В Linux "
+"2.4 тип был изменён на I<long>. Для задействования преимуществ этого "
+"изменения необходима перекомпиляция программы с glibc-2.1.91 или более "
+"поздней версией (ядро различает старые и новые вызовы по флагу B<IPC_64> в "
+"аргументе I<cmd>)."
+
 #. type: TH
-#: debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "2023-03-30"
-msgstr "30 марта 2023 г."
+msgid "2023-10-31"
+msgstr "31 октября 2023 г."
+
+#. type: TH
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "2024-03-03"
+msgstr "3 марта 2024 г."
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: opensuse-leap-15-6
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+msgid "2023-03-30"
+msgstr "30 марта 2023 г."
 
 #. type: TH
 #: opensuse-leap-15-6
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr "Linux man-pages 6.04"
+
+#. type: TH
+#: opensuse-tumbleweed
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages (unreleased)"
+msgstr "Linux man-pages 6.7"