Merging upstream version 4.23.0.

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

1 files changed, 74 insertions, 29 deletions

diff --git a/po/ru/man2/shmop.2.po b/po/ru/man2/shmop.2.po
index bc4714de..25d8a772 100644
--- a/po/ru/man2/shmop.2.po
+++ b/po/ru/man2/shmop.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 "SHMOP"
 msgstr "SHMOP"
 
 #. 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
@@ -507,7 +508,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
@@ -696,35 +697,35 @@ msgid ""
 msgstr "Следующий сеанс работы в оболочке показывает работу с программой:"
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "/* svshm_string.h\n"
 "\\&\n"
 "   Licensed under GNU General Public License v2 or later.\n"
 "*/\n"
-"#include E<lt>sys/types.hE<gt>\n"
-"#include E<lt>sys/ipc.hE<gt>\n"
-"#include E<lt>sys/shm.hE<gt>\n"
-"#include E<lt>sys/sem.hE<gt>\n"
+"#ifndef SVSHM_STRING_H\n"
+"#define SVSHM_STRING_H\n"
+"\\&\n"
 "#include E<lt>stdio.hE<gt>\n"
 "#include E<lt>stdlib.hE<gt>\n"
-"#include E<lt>string.hE<gt>\n"
+"#include E<lt>sys/sem.hE<gt>\n"
 "\\&\n"
 "#define errExit(msg)    do { perror(msg); exit(EXIT_FAILURE); \\e\n"
 "                        } while (0)\n"
 "\\&\n"
 "union semun {                   /* Used in calls to semctl() */\n"
 "    int                 val;\n"
-"    struct semid_ds *   buf;\n"
-"    unsigned short *    array;\n"
+"    struct semid_ds     *buf;\n"
+"    unsigned short      *array;\n"
 "#if defined(__linux__)\n"
-"    struct seminfo *    __buf;\n"
+"    struct seminfo      *__buf;\n"
 "#endif\n"
 "};\n"
 "\\&\n"
 "#define MEM_SIZE 4096\n"
+"\\&\n"
+"#endif  // include guard\n"
 msgstr ""
 
 #. type: SS
@@ -906,7 +907,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
@@ -1360,16 +1361,53 @@ msgid ""
 msgstr ""
 
 #. 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
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
+
+#. type: Plain text
+#: fedora-40 fedora-rawhide mageia-cauldron
+#, no-wrap
+msgid ""
+"/* svshm_string.h\n"
+"\\&\n"
+"   Licensed under GNU General Public License v2 or later.\n"
+"*/\n"
+"#include E<lt>sys/types.hE<gt>\n"
+"#include E<lt>sys/ipc.hE<gt>\n"
+"#include E<lt>sys/shm.hE<gt>\n"
+"#include E<lt>sys/sem.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"
+"#define errExit(msg)    do { perror(msg); exit(EXIT_FAILURE); \\e\n"
+"                        } while (0)\n"
+"\\&\n"
+"union semun {                   /* Used in calls to semctl() */\n"
+"    int                 val;\n"
+"    struct semid_ds *   buf;\n"
+"    unsigned short *    array;\n"
+"#if defined(__linux__)\n"
+"    struct seminfo *    __buf;\n"
+"#endif\n"
+"};\n"
+"\\&\n"
+"#define MEM_SIZE 4096\n"
+msgstr ""
 
 #. 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
@@ -1382,3 +1420,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"