Merging upstream version 4.23.0.

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

1 files changed, 71 insertions, 53 deletions

diff --git a/po/ru/man2/futex.2.po b/po/ru/man2/futex.2.po
index 237cd31e..dddb1ee5 100644
--- a/po/ru/man2/futex.2.po
+++ b/po/ru/man2/futex.2.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:56+0100\n"
+"POT-Creation-Date: 2024-06-01 05:51+0200\n"
 "PO-Revision-Date: 2019-09-27 19:31+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -16,9 +16,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
@@ -29,16 +29,17 @@ msgid "futex"
 msgstr "futex"
 
 #. 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
@@ -152,27 +153,27 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
-#| "A futex is a 32-bit value\\(emreferred to below as a I<futex "
-#| "word>\\(emwhose address is supplied to the B<futex>()  system call.  "
-#| "(Futexes are 32 bits in size on all platforms, including 64-bit "
-#| "systems.)  All futex operations are governed by this value.  In order to "
-#| "share a futex between processes, the futex is placed in a region of "
-#| "shared memory, created using (for example)  B<mmap>(2)  or B<shmat>(2).  "
-#| "(Thus, the futex word may have different virtual addresses in different "
-#| "processes, but these addresses all refer to the same location in physical "
-#| "memory.)  In a multithreaded program, it is sufficient to place the futex "
-#| "word in a global variable shared by all threads."
-msgid ""
-"A futex is a 32-bit value\\[em]referred to below as a I<futex "
-"word>\\[em]whose address is supplied to the B<futex>()  system call.  "
-"(Futexes are 32 bits in size on all platforms, including 64-bit systems.)  "
-"All futex operations are governed by this value.  In order to share a futex "
-"between processes, the futex is placed in a region of shared memory, created "
-"using (for example)  B<mmap>(2)  or B<shmat>(2).  (Thus, the futex word may "
-"have different virtual addresses in different processes, but these addresses "
-"all refer to the same location in physical memory.)  In a multithreaded "
-"program, it is sufficient to place the futex word in a global variable "
-"shared by all threads."
+#| "A futex is a 32-bit value\\(emreferred to below as a I<futex word>"
+#| "\\(emwhose address is supplied to the B<futex>()  system call.  (Futexes "
+#| "are 32 bits in size on all platforms, including 64-bit systems.)  All "
+#| "futex operations are governed by this value.  In order to share a futex "
+#| "between processes, the futex is placed in a region of shared memory, "
+#| "created using (for example)  B<mmap>(2)  or B<shmat>(2).  (Thus, the "
+#| "futex word may have different virtual addresses in different processes, "
+#| "but these addresses all refer to the same location in physical memory.)  "
+#| "In a multithreaded program, it is sufficient to place the futex word in a "
+#| "global variable shared by all threads."
+msgid ""
+"A futex is a 32-bit value\\[em]referred to below as a I<futex word>"
+"\\[em]whose address is supplied to the B<futex>()  system call.  (Futexes "
+"are 32 bits in size on all platforms, including 64-bit systems.)  All futex "
+"operations are governed by this value.  In order to share a futex between "
+"processes, the futex is placed in a region of shared memory, created using "
+"(for example)  B<mmap>(2)  or B<shmat>(2).  (Thus, the futex word may have "
+"different virtual addresses in different processes, but these addresses all "
+"refer to the same location in physical memory.)  In a multithreaded program, "
+"it is sufficient to place the futex word in a global variable shared by all "
+"threads."
 msgstr ""
 "Фьютекс это 32-битное значение — называемое далее I<словом фьютекса> — чей "
 "адрес передаётся в системный вызов B<futex>() (фьютексы имеют размер в 32 "
@@ -1050,9 +1051,13 @@ msgstr ""
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#, fuzzy
+#| msgid ""
+#| "In addition, bitwise ORing the following value into I<op> causes "
+#| "I<(1\\~E<lt>E<lt>\\~oparg)> to be used as the operand:"
 msgid ""
-"In addition, bitwise ORing the following value into I<op> causes "
-"I<(1\\~E<lt>E<lt>\\~oparg)> to be used as the operand:"
+"In addition, bitwise ORing the following value into I<op> causes I<(1\\ "
+"E<lt>E<lt>\\ oparg)> to be used as the operand:"
 msgstr ""
 "Также, битовое сложение следующего значения с I<op> приводит к использованию "
 "I<(1\\ E<lt>E<lt>\\~oparg)> в качестве операнда:"
@@ -1558,20 +1563,20 @@ msgstr "B<FUTEX_LOCK_PI> (начиная с Linux 2.6.18)"
 #, fuzzy
 #| msgid ""
 #| "This operation is used after an attempt to acquire the lock via an atomic "
-#| "user-mode instruction failed because the futex word has a nonzero "
-#| "value\\(emspecifically, because it contained the (PID-namespace-specific) "
-#| "TID of the lock owner."
+#| "user-mode instruction failed because the futex word has a nonzero value"
+#| "\\(emspecifically, because it contained the (PID-namespace-specific) TID "
+#| "of the lock owner."
 msgid ""
 "This operation is used after an attempt to acquire the lock via an atomic "
-"user-mode instruction failed because the futex word has a nonzero "
-"value\\[em]specifically, because it contained the (PID-namespace-specific) "
-"TID of the lock owner."
+"user-mode instruction failed because the futex word has a nonzero value"
+"\\[em]specifically, because it contained the (PID-namespace-specific) TID of "
+"the lock owner."
 msgstr ""
 "Данная операция используется после  попытки получить блокировку через "
 "атомарную инструкцию в пространстве пользователя, которая завершилась с "
-"ошибкой из-за того, что слово фьютекса не равно нулю — содержит "
-"value\\(emspecifically, because it contained the TID (PID в этом "
-"пространстве имён) владельца блокировки."
+"ошибкой из-за того, что слово фьютекса не равно нулю — содержит value"
+"\\(emspecifically, because it contained the TID (PID в этом пространстве "
+"имён) владельца блокировки."
 
 #.  tglx (July 2015):
 #.      The operation here is similar to the FUTEX_WAIT logic. When the user
@@ -2413,8 +2418,8 @@ msgstr ""
 #| "valid object\\(emthat is, the address is not four-byte-aligned."
 msgid ""
 "The operation specified in I<futex_op> employs one or both of the pointers "
-"I<uaddr> and I<uaddr2>, but one of these does not point to a valid "
-"object\\[em]that is, the address is not four-byte-aligned."
+"I<uaddr> and I<uaddr2>, but one of these does not point to a valid object"
+"\\[em]that is, the address is not four-byte-aligned."
 msgstr ""
 "Операция, указанная в I<futex_op>, использует один или оба указателя "
 "I<uaddr> и I<uaddr2>, но один из них не указывает на корректный объект, то "
@@ -2983,7 +2988,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
@@ -3141,7 +3146,7 @@ msgstr "Данный вызов есть только в Linux."
 #: debian-bookworm
 #, no-wrap
 msgid "NOTES"
-msgstr "ЗАМЕЧАНИЯ"
+msgstr "ПРИМЕЧАНИЯ"
 
 #.  TODO FIXME(Torvald) Above, we cite this section and claim it contains
 #.  details on the synchronization semantics; add the C11 equivalents
@@ -3596,16 +3601,22 @@ msgstr ""
 "}\n"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-05-03"
-msgstr "3 мая 2023 г."
+msgid "2023-10-31"
+msgstr "31 октября 2023 г."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
 #. type: TH
 #: opensuse-leap-15-6
@@ -3618,3 +3629,10 @@ msgstr "30 марта 2023 г."
 #, 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"