Merging upstream version 4.23.0.

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

1 files changed, 59 insertions, 94 deletions

diff --git a/po/ru/man3/stpncpy.3.po b/po/ru/man3/stpncpy.3.po
index 769d08a2..9336c024 100644
--- a/po/ru/man3/stpncpy.3.po
+++ b/po/ru/man3/stpncpy.3.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:09+0100\n"
+"POT-Creation-Date: 2024-06-01 06:24+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
@@ -34,16 +34,17 @@ msgid "stpncpy"
 msgstr "B<stpncpy>()"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2024-02-12"
-msgstr "12 февраля 2024 г."
+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
@@ -53,7 +54,8 @@ msgid "NAME"
 msgstr "ИМЯ"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "stpncpy, strncpy - fill a fixed-size buffer with non-null bytes from a "
 "string, padding with null bytes as needed"
@@ -87,7 +89,8 @@ msgid "B<#include E<lt>string.hE<gt>>\n"
 msgstr "B<#include E<lt>string.hE<gt>>\n"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "B<char *strncpy(char >I<dst>B<[restrict .>I<dsize>B<], const char *restrict >I<src>B<,>\n"
@@ -134,7 +137,8 @@ msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "These functions copy non-null bytes from the string pointed to by I<src> "
 "into the array pointed to by I<dst>.  If the source has too few non-null "
@@ -151,7 +155,8 @@ msgid "An implementation of these functions might be:"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy, no-wrap
 #| msgid "B<char *stpncpy(char *>I<dest>B<, const char *>I<src>B<, size_t >I<n>B<);>\n"
 msgid ""
@@ -318,7 +323,8 @@ msgid "POSIX.1-2008."
 msgstr "POSIX.1-2008."
 
 #. type: SH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid "HISTORY"
 msgstr "ИСТОРИЯ"
@@ -347,7 +353,8 @@ msgid "CAVEATS"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "The name of these functions is confusing.  These functions produce a null-"
 "padded character sequence, not a string (see B<string_copying>(7)).  For "
@@ -355,7 +362,8 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "strncpy(buf, \"1\", 5);       // { \\[aq]1\\[aq],   0,   0,   0,   0 }\n"
@@ -391,7 +399,8 @@ msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "#include E<lt>err.hE<gt>\n"
@@ -435,7 +444,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
@@ -458,7 +467,7 @@ msgid "Linux man-pages 6.03"
 msgstr "Linux man-pages 6.03"
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "stpncpy, strncpy - zero a fixed-width buffer and copy a string into a "
 "character sequence with truncation and zero the rest of it"
@@ -475,7 +484,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "These functions copy the string pointed to by I<src> into a null-padded "
 "character sequence at the fixed-width buffer pointed to by I<dst>.  If the "
@@ -515,7 +524,7 @@ msgid "POSIX.1-2001, POSIX.1-2008, C99, SVr4, 4.3BSD."
 msgstr "POSIX.1-2001, POSIX.1-2008, C99, SVr4, 4.3BSD."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "The name of these functions is confusing.  These functions produce a null-"
 "padded character sequence, not a string (see B<string_copying>(7))."
@@ -595,83 +604,22 @@ msgstr ""
 "}\n"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-07-20"
-msgstr "20 июля 2023 г."
+msgid "2024-02-12"
+msgstr "12 февраля 2024 г."
 
 #. 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"
-
-#. type: Plain text
-#: debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
-#, no-wrap
-msgid ""
-"B<char *strncpy(char >I<dst>B<[restrict .>I<sz>B<], const char *restrict >I<src>B<,>\n"
-"B<               size_t >I<sz>B<);>\n"
-"B<char *stpncpy(char >I<dst>B<[restrict .>I<sz>B<], const char *restrict >I<src>B<,>\n"
-"B<               size_t >I<sz>B<);>\n"
-msgstr ""
-
-#. type: Plain text
-#: debian-unstable opensuse-tumbleweed
-#, fuzzy, no-wrap
-#| msgid "B<char *stpncpy(char *>I<dest>B<, const char *>I<src>B<, size_t >I<n>B<);>\n"
-msgid ""
-"char *\n"
-"strncpy(char *restrict dst, const char *restrict src, size_t sz)\n"
-"{\n"
-"    stpncpy(dst, src, sz);\n"
-"    return dst;\n"
-"}\n"
-"\\&\n"
-"char *\n"
-"stpncpy(char *restrict dst, const char *restrict src, size_t sz)\n"
-"{\n"
-"    bzero(dst, sz);\n"
-"    return mempcpy(dst, src, strnlen(src, sz));\n"
-"}\n"
-msgstr "B<char *stpncpy(char *>I<dest>B<, const char *>I<src>B<, size_t >I<n>B<);>\n"
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
 
-#. type: Plain text
-#: debian-unstable opensuse-tumbleweed
+#. type: TH
+#: fedora-rawhide
 #, no-wrap
-msgid ""
-"#include E<lt>err.hE<gt>\n"
-"#include E<lt>stdio.hE<gt>\n"
-"#include E<lt>stdlib.hE<gt>\n"
-"#include E<lt>string.hE<gt>\n"
-"\\&\n"
-"int\n"
-"main(void)\n"
-"{\n"
-"    char    *p;\n"
-"    char    buf1[20];\n"
-"    char    buf2[20];\n"
-"    size_t  len;\n"
-"\\&\n"
-"    if (sizeof(buf2) E<lt> strlen(\"Hello world!\"))\n"
-"        warnx(\"strncpy: truncating character sequence\");\n"
-"    strncpy(buf2, \"Hello world!\", sizeof(buf2));\n"
-"    len = strnlen(buf2, sizeof(buf2));\n"
-"\\&\n"
-"    printf(\"[len = %zu]: \", len);\n"
-"    printf(\"%.*s\\en\", (int) len, buf2);  // \"Hello world!\"\n"
-"\\&\n"
-"    if (sizeof(buf1) E<lt> strlen(\"Hello world!\"))\n"
-"        warnx(\"stpncpy: truncating character sequence\");\n"
-"    p = stpncpy(buf1, \"Hello world!\", sizeof(buf1));\n"
-"    len = p - buf1;\n"
-"\\&\n"
-"    printf(\"[len = %zu]: \", len);\n"
-"    printf(\"%.*s\\en\", (int) len, buf1);  // \"Hello world!\"\n"
-"\\&\n"
-"    exit(EXIT_SUCCESS);\n"
-"}\n"
-msgstr ""
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
 #. type: TH
 #: opensuse-leap-15-6
@@ -684,3 +632,20 @@ msgstr "30 марта 2023 г."
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr "Linux man-pages 6.04"
+
+#. type: Plain text
+#: opensuse-leap-15-6
+#, no-wrap
+msgid ""
+"B<char *strncpy(char >I<dst>B<[restrict .>I<sz>B<], const char *restrict >I<src>B<,>\n"
+"B<               size_t >I<sz>B<);>\n"
+"B<char *stpncpy(char >I<dst>B<[restrict .>I<sz>B<], const char *restrict >I<src>B<,>\n"
+"B<               size_t >I<sz>B<);>\n"
+msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages (unreleased)"
+msgstr "Linux man-pages 6.7"