Merging upstream version 4.23.0.

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

1 files changed, 115 insertions, 43 deletions

diff --git a/po/ru/man2/keyctl.2.po b/po/ru/man2/keyctl.2.po
index 5e6e7fdd..d5de2516 100644
--- a/po/ru/man2/keyctl.2.po
+++ b/po/ru/man2/keyctl.2.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:59+0100\n"
+"POT-Creation-Date: 2024-06-01 05:59+0200\n"
 "PO-Revision-Date: 2019-10-05 08:18+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 "keyctl"
 msgstr "keyctl"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-11-01"
-msgstr "1 ноября 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
@@ -320,9 +321,9 @@ msgstr ""
 #| "with the error B<ENOKEY>."
 msgid ""
 "The behavior if the key specified in I<arg2> does not exist depends on the "
-"value of I<arg3> (cast to I<int>).  If I<arg3> contains a nonzero value, "
-"then\\[em]if it is appropriate to do so (e.g., when looking up the user, "
-"user-session, or session key)\\[em]a new key is created and its real key ID "
+"value of I<arg3> (cast to I<int>).  If I<arg3> contains a nonzero value, then"
+"\\[em]if it is appropriate to do so (e.g., when looking up the user, user-"
+"session, or session key)\\[em]a new key is created and its real key ID "
 "returned as the function result.  Otherwise, the operation fails with the "
 "error B<ENOKEY>."
 msgstr ""
@@ -1030,10 +1031,16 @@ msgstr "Получить строку, описывающую атрибуты �
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#, fuzzy
+#| msgid ""
+#| "The ID of the key to be described is specified in I<arg2> (cast to "
+#| "I<key_serial_t>).  The descriptive string is returned in the buffer "
+#| "pointed to by I<arg3> (cast to I<char\\~*>); I<arg4> (cast to I<size_t>)  "
+#| "specifies the size of that buffer in bytes."
 msgid ""
 "The ID of the key to be described is specified in I<arg2> (cast to "
 "I<key_serial_t>).  The descriptive string is returned in the buffer pointed "
-"to by I<arg3> (cast to I<char\\~*>); I<arg4> (cast to I<size_t>)  specifies "
+"to by I<arg3> (cast to I<char\\ *>); I<arg4> (cast to I<size_t>)  specifies "
 "the size of that buffer in bytes."
 msgstr ""
 "Описываемый идентификатор ключа задаётся в I<arg2> (приводится к "
@@ -1335,11 +1342,19 @@ msgstr ""
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#, fuzzy
+#| msgid ""
+#| "The I<arg3> and I<arg4> arguments specify the key to be searched for: "
+#| "I<arg3> (cast as I<char\\~*>)  contains the key type (a null-terminated "
+#| "character string up to 32 bytes in size, including the terminating null "
+#| "byte), and I<arg4> (cast as I<char\\~*>)  contains the description of the "
+#| "key (a null-terminated character string up to 4096 bytes in size, "
+#| "including the terminating null byte)."
 msgid ""
 "The I<arg3> and I<arg4> arguments specify the key to be searched for: "
-"I<arg3> (cast as I<char\\~*>)  contains the key type (a null-terminated "
+"I<arg3> (cast as I<char\\ *>)  contains the key type (a null-terminated "
 "character string up to 32 bytes in size, including the terminating null "
-"byte), and I<arg4> (cast as I<char\\~*>)  contains the description of the "
+"byte), and I<arg4> (cast as I<char\\ *>)  contains the description of the "
 "key (a null-terminated character string up to 4096 bytes in size, including "
 "the terminating null byte)."
 msgstr ""
@@ -1538,7 +1553,8 @@ msgstr ""
 "I<void\\ *>); размер буфера задаётся в I<arg4> (приводится к I<size_t>)."
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "The payload may be a NULL pointer and the buffer size may be 0 if this is "
@@ -2307,9 +2323,14 @@ msgstr ""
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#, fuzzy
+#| msgid ""
+#| "The pointer to the payload vector is specified in I<arg3> (cast as "
+#| "I<const struct iovec\\~*>).  The number of items in the vector is "
+#| "specified in I<arg4> (cast as I<unsigned int>)."
 msgid ""
 "The pointer to the payload vector is specified in I<arg3> (cast as I<const "
-"struct iovec\\~*>).  The number of items in the vector is specified in "
+"struct iovec\\ *>).  The number of items in the vector is specified in "
 "I<arg4> (cast as I<unsigned int>)."
 msgstr ""
 "Указатель на вектор полезных данных передаётся в I<arg3> (приводится к "
@@ -2534,12 +2555,16 @@ msgstr ""
 "результату функцию формирования ключа (key derivation function, KDF)."
 
 #. 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 I<arg2> argument is a pointer to a set of parameters containing "
+#| "serial numbers for three I<\"user\"> keys used in the Diffie-Hellman "
+#| "calculation, packaged in a structure of the following form:"
 msgid ""
 "The I<arg2> argument is a pointer to a set of parameters containing serial "
-"numbers for three I<\"user\"> keys used in the Diffie-Hellman calculation, "
-"packaged in a structure of the following form:"
+"numbers for three I<\\[dq]user\\[dq]> keys used in the Diffie-Hellman "
+"calculation, packaged in a structure of the following form:"
 msgstr ""
 "В аргументе I<arg2> передаётся указатель на набор параметров, содержащих "
 "серийные номера трёх ключей I<\"user\">, используемых в вычислении Диффи-"
@@ -2598,8 +2623,13 @@ msgstr ""
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#, fuzzy
+#| msgid ""
+#| "The I<arg3> argument (cast to I<char\\~*>)  points to a buffer where the "
+#| "result of the calculation is placed.  The size of that buffer is "
+#| "specified in I<arg4> (cast to I<size_t>)."
 msgid ""
-"The I<arg3> argument (cast to I<char\\~*>)  points to a buffer where the "
+"The I<arg3> argument (cast to I<char\\ *>)  points to a buffer where the "
 "result of the calculation is placed.  The size of that buffer is specified "
 "in I<arg4> (cast to I<size_t>)."
 msgstr ""
@@ -2687,8 +2717,8 @@ msgstr ""
 msgid ""
 "The I<hashname> field is a null-terminated string which specifies a hash "
 "name (available in the kernel's crypto API; the list of the hashes available "
-"is rather tricky to observe; please refer to the E<.UR https://www.kernel."
-"org\\:/doc\\:/html\\:/latest\\:/crypto\\:/architecture.html> \"Kernel Crypto "
+"is rather tricky to observe; please refer to the E<.UR https://www.kernel.org"
+"\\:/doc\\:/html\\:/latest\\:/crypto\\:/architecture.html> \"Kernel Crypto "
 "API Architecture\" E<.UE> documentation for the information regarding how "
 "hash names are constructed and your kernel's source and configuration "
 "regarding what ciphers and templates with type B<CRYPTO_ALG_TYPE_SHASH> are "
@@ -2696,11 +2726,11 @@ msgid ""
 msgstr ""
 "В поле I<hashname> содержится строка, завершающаяся null, которой задаётся "
 "имя хэша (доступно в программном интерфейсе шифрования ядра; список хэшей "
-"сложно описать; в файле E<.UR https://www.kernel.org\\:/doc\\:/html\\:/"
-"latest\\:/crypto\\:/architecture.html> «Kernel Crypto API Architecture» E<."
-"UE> можно найти как компонуются имена хэшей из алгоритмов шифрования и "
-"шаблонов с типом B<CRYPTO_ALG_TYPE_SHASH> с учётом доступного исходного кода "
-"ядра и настроек) для применения к результату DH в операции KDF."
+"сложно описать; в файле E<.UR https://www.kernel.org\\:/doc\\:/html\\:/latest"
+"\\:/crypto\\:/architecture.html> «Kernel Crypto API Architecture» E<.UE> "
+"можно найти как компонуются имена хэшей из алгоритмов шифрования и шаблонов "
+"с типом B<CRYPTO_ALG_TYPE_SHASH> с учётом доступного исходного кода ядра и "
+"настроек) для применения к результату DH в операции KDF."
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -3562,11 +3592,14 @@ msgid "B<EOPNOTSUPP>"
 msgstr "B<EOPNOTSUPP>"
 
 #. 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<operation> was B<KEYCTL_READ> and the key type does not support reading "
+#| "(e.g., the type is I<\"login\">)."
 msgid ""
 "I<operation> was B<KEYCTL_READ> and the key type does not support reading (e."
-"g., the type is I<\"login\">)."
+"g., the type is I<\\[dq]login\\[dq]>)."
 msgstr ""
 "Значение I<operation> равно B<KEYCTL_READ> и тип ключа не поддерживает "
 "чтение (например, тип I<\"login\">)."
@@ -4095,7 +4128,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "СМ. ТАКЖЕ"
+msgstr "СМОТРИТЕ ТАКЖЕ"
 
 #.      .BR find_key_by_type_and_name (3)
 #.      There is a man page, but this function seems not to exist
@@ -4169,7 +4202,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "The payload may be a NULL pointer and the buffer size may be 0 if this is "
 "supported by the key type (e.g., it is a keyring)."
@@ -4179,6 +4212,26 @@ msgstr ""
 "ключей)."
 
 #. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"The I<arg2> argument is a pointer to a set of parameters containing serial "
+"numbers for three I<\"user\"> keys used in the Diffie-Hellman calculation, "
+"packaged in a structure of the following form:"
+msgstr ""
+"В аргументе I<arg2> передаётся указатель на набор параметров, содержащих "
+"серийные номера трёх ключей I<\"user\">, используемых в вычислении Диффи-"
+"Хеллмана, упакованных в следующую структуру:"
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"I<operation> was B<KEYCTL_READ> and the key type does not support reading (e."
+"g., the type is I<\"login\">)."
+msgstr ""
+"Значение I<operation> равно B<KEYCTL_READ> и тип ключа не поддерживает "
+"чтение (например, тип I<\"login\">)."
+
+#. type: Plain text
 #: debian-bookworm
 msgid "This system call first appeared in Linux 2.6.10."
 msgstr "Этот системный вызов впервые появился в Linux 2.6.10."
@@ -4192,7 +4245,7 @@ msgstr "Этот системный вызов является нестанда
 #: debian-bookworm
 #, no-wrap
 msgid "NOTES"
-msgstr "ЗАМЕЧАНИЯ"
+msgstr "ПРИМЕЧАНИЯ"
 
 #. type: Plain text
 #: debian-bookworm opensuse-leap-15-6
@@ -4678,16 +4731,28 @@ msgstr ""
 "}\n"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "2023-11-01"
+msgstr "1 ноября 2023 г."
+
+#. type: TH
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "2023-05-03"
-msgstr "3 мая 2023 г."
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
 
 #. 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 "2024-02-25"
+msgstr "25 февраля 2024 г."
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
 #. type: TH
 #: opensuse-leap-15-6
@@ -4700,3 +4765,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"