Merging upstream version 4.23.0.

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

1 files changed, 91 insertions, 28 deletions

diff --git a/po/ru/man2/epoll_wait.2.po b/po/ru/man2/epoll_wait.2.po
index 0f101487..452a12f5 100644
--- a/po/ru/man2/epoll_wait.2.po
+++ b/po/ru/man2/epoll_wait.2.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:55+0100\n"
+"POT-Creation-Date: 2024-06-01 05:48+0200\n"
 "PO-Revision-Date: 2019-10-05 07:57+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -15,9 +15,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
@@ -28,16 +28,17 @@ msgid "epoll_wait"
 msgstr "epoll_wait"
 
 #. 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
@@ -192,14 +193,21 @@ msgid "the timeout expires."
 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 ""
+#| "Note that the I<timeout> interval will be rounded up to the system clock "
+#| "granularity, and kernel scheduling delays mean that the blocking interval "
+#| "may overrun by a small amount.  Specifying a I<timeout> of -1 causes "
+#| "B<epoll_wait>()  to block indefinitely, while specifying a I<timeout> "
+#| "equal to zero cause B<epoll_wait>()  to return immediately, even if no "
+#| "events are available."
 msgid ""
 "Note that the I<timeout> interval will be rounded up to the system clock "
 "granularity, and kernel scheduling delays mean that the blocking interval "
 "may overrun by a small amount.  Specifying a I<timeout> of -1 causes "
 "B<epoll_wait>()  to block indefinitely, while specifying a I<timeout> equal "
-"to zero cause B<epoll_wait>()  to return immediately, even if no events are "
+"to zero causes B<epoll_wait>()  to return immediately, even if no events are "
 "available."
 msgstr ""
 "Заметим, что интервал I<timeout> будет округлён в соответствии с точностью "
@@ -341,8 +349,7 @@ msgid "RETURN VALUE"
 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 ""
 #| "When successful, B<epoll_wait>()  returns the number of file descriptors "
@@ -351,9 +358,9 @@ msgstr "ВОЗВРАЩАЕМОЕ ЗНАЧЕНИЕ"
 #| "B<epoll_wait>()  returns -1 and I<errno> is set appropriately."
 msgid ""
 "On success, B<epoll_wait>()  returns the number of file descriptors ready "
-"for the requested I/O, or zero if no file descriptor became ready during the "
-"requested I<timeout> milliseconds.  On failure, B<epoll_wait>()  returns -1 "
-"and I<errno> is set to indicate the error."
+"for the requested I/O operation, or zero if no file descriptor became ready "
+"during the requested I<timeout> milliseconds.  On failure, B<epoll_wait>()  "
+"returns -1 and I<errno> is set to indicate the error."
 msgstr ""
 "При нормальном выполнении B<epoll_wait>() возвращает количество файловых "
 "дескрипторов, готовых для запросов ввода-вывода, или ноль, если ни один "
@@ -503,7 +510,7 @@ msgstr "Linux"
 #: 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
@@ -586,7 +593,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "BUGS"
-msgstr "ДЕФЕКТЫ"
+msgstr "ОШИБКИ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -616,7 +623,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
@@ -637,6 +644,23 @@ 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
+msgid ""
+"Note that the I<timeout> interval will be rounded up to the system clock "
+"granularity, and kernel scheduling delays mean that the blocking interval "
+"may overrun by a small amount.  Specifying a I<timeout> of -1 causes "
+"B<epoll_wait>()  to block indefinitely, while specifying a I<timeout> equal "
+"to zero cause B<epoll_wait>()  to return immediately, even if no events are "
+"available."
+msgstr ""
+"Заметим, что интервал I<timeout> будет округлён в соответствии с точностью "
+"системных часов, а задержки ядерного планирования приведут к тому, что "
+"интервал блокировки может быть немного больше. Если присвоить I<timeout> "
+"значение -1, то B<epoll_wait>() блокируется навсегда; если значение "
+"I<timeout> равно 0, то B<epoll_wait>() сразу завершает работу, даже если "
+"никаких событий не произошло."
+
+#. type: Plain text
 #: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "sigset_t origmask;\n"
@@ -654,6 +678,26 @@ msgstr ""
 "ready = epoll_wait(epfd, &events, maxevents, timeout);\n"
 "pthread_sigmask(SIG_SETMASK, &origmask, NULL);\n"
 
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, fuzzy
+#| msgid ""
+#| "When successful, B<epoll_wait>()  returns the number of file descriptors "
+#| "ready for the requested I/O, or zero if no file descriptor became ready "
+#| "during the requested I<timeout> milliseconds.  When an error occurs, "
+#| "B<epoll_wait>()  returns -1 and I<errno> is set appropriately."
+msgid ""
+"On success, B<epoll_wait>()  returns the number of file descriptors ready "
+"for the requested I/O, or zero if no file descriptor became ready during the "
+"requested I<timeout> milliseconds.  On failure, B<epoll_wait>()  returns -1 "
+"and I<errno> is set to indicate the error."
+msgstr ""
+"При нормальном выполнении B<epoll_wait>() возвращает количество файловых "
+"дескрипторов, готовых для запросов ввода-вывода, или ноль, если ни один "
+"файловый дескриптор не стал готов за отведённые I<timeout> миллисекунд. При "
+"возникновении ошибки B<epoll_wait>() возвращает -1 и устанавливает I<errno> "
+"в соответствующее значение."
+
 #. type: SH
 #: debian-bookworm
 #, no-wrap
@@ -704,16 +748,28 @@ msgstr ""
 "Linux."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
+#, no-wrap
+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 "2023-05-03"
-msgstr "3 мая 2023 г."
+msgid "2024-03-03"
+msgstr "3 марта 2024 г."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-rawhide
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
 #. type: TH
 #: opensuse-leap-15-6
@@ -726,3 +782,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"