Merging upstream version 4.23.0.

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

1 files changed, 65 insertions, 41 deletions

diff --git a/po/ru/man7/man-pages.7.po b/po/ru/man7/man-pages.7.po
index 47bee36c..f9f331ce 100644
--- a/po/ru/man7/man-pages.7.po
+++ b/po/ru/man7/man-pages.7.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:01+0100\n"
+"POT-Creation-Date: 2024-06-01 06:01+0200\n"
 "PO-Revision-Date: 2019-10-06 08:59+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -22,9 +22,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
@@ -36,16 +36,17 @@ msgid "man-pages"
 msgstr "manpage"
 
 #. 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
@@ -475,7 +476,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "EXIT STATUS"
-msgstr "КОД РЕЗУЛЬТАТА"
+msgstr "КОД ЗАВЕРШЕНИЯ"
 
 #. type: SS
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -512,7 +513,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "ENVIRONMENT"
-msgstr "ОКРУЖЕНИЕ"
+msgstr "СРЕДА ОКРУЖЕНИЯ"
 
 #. type: tbl table
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -554,7 +555,7 @@ msgstr "ИСТОРИЯ"
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "NOTES"
-msgstr "ЗАМЕЧАНИЯ"
+msgstr "ПРИМЕЧАНИЯ"
 
 #. type: tbl table
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -568,7 +569,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "BUGS"
-msgstr "ДЕФЕКТЫ"
+msgstr "ОШИБКИ"
 
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -1360,14 +1361,14 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Given the distributed, autonomous nature of FOSS projects and their "
-#| "documentation, it is sometimes necessary\\(emand in many cases "
-#| "desirable\\(emthat the SEE ALSO section includes references to manual "
-#| "pages provided by other projects."
+#| "documentation, it is sometimes necessary\\(emand in many cases desirable"
+#| "\\(emthat the SEE ALSO section includes references to manual pages "
+#| "provided by other projects."
 msgid ""
 "Given the distributed, autonomous nature of FOSS projects and their "
-"documentation, it is sometimes necessary\\[em]and in many cases "
-"desirable\\[em]that the SEE ALSO section includes references to manual pages "
-"provided by other projects."
+"documentation, it is sometimes necessary\\[em]and in many cases desirable"
+"\\[em]that the SEE ALSO section includes references to manual pages provided "
+"by other projects."
 msgstr ""
 "Учитывая распределённую, автономную природу проектов FOSS и их "
 "документирование, иногда необходимо — и во многих случаях желательно — "
@@ -1398,7 +1399,8 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "In general, where more than one function prototype is shown in the SYNOPSIS, "
 "the prototypes should I<not> be separated by blank lines.  However, blank "
@@ -1876,7 +1878,8 @@ msgid "Formatting conventions (general)"
 msgstr "Общие соглашения по оформлению"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "Paragraphs should be separated by suitable markers (usually either I<.PP> "
@@ -2080,9 +2083,9 @@ msgstr ""
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
-"American English tends to use the forms \"backward\", \"upward\", "
-"\"toward\", and so on rather than the British forms \"backwards\", "
-"\"upwards\", \"towards\", and so on."
+"American English tends to use the forms \"backward\", \"upward\", \"toward"
+"\", and so on rather than the British forms \"backwards\", \"upwards\", "
+"\"towards\", and so on."
 msgstr ""
 "Американский вариант английского языка имеет обыкновение использовать формы "
 "«backward» (назад), «upward» (вверх), «toward» (к) и т. д., а в британском "
@@ -2152,7 +2155,8 @@ msgid "Indentation of structure definitions, shell session logs, and so on"
 msgstr "Отступ при определении структур, содержимого журналов сеансов оболочек и т. п."
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "When structure definitions, shell session logs, and so on are included in "
@@ -2174,7 +2178,8 @@ msgstr ""
 "IP>). Пример:"
 
 #. 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 ""
 #| "    .PP\n"
@@ -3108,8 +3113,8 @@ msgid ""
 "typographical contexts it renders as a long dash.)  Em-dashes should be "
 "written I<without> surrounding spaces."
 msgstr ""
-"Для написания тире — символический знак, который появится в конце этой "
-"фразы\\(emв *roff используется макрос «\\e(em» (на терминалах с ASCII тире, "
+"Для написания тире — символический знак, который появится в конце этой фразы"
+"\\(emв *roff используется макрос «\\e(em» (на терминалах с ASCII тире, "
 "обычно, отображается в виде двух переносов, но в других типографских "
 "контекстах оно может выглядеть как длинное тире). Тире должно записываться "
 "I<без> окружающих его пробелов."
@@ -3731,7 +3736,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
@@ -3814,7 +3819,7 @@ msgstr ""
 "также стоит отметить."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "In general, where more than one function prototype is shown in the SYNOPSIS, "
 "the prototypes should I<not> be separated by blank lines.  However, blank "
@@ -3822,7 +3827,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "Paragraphs should be separated by suitable markers (usually either I<.PP> or "
 "I<.IP>).  Do I<not> separate paragraphs using blank lines, as this results "
@@ -3834,7 +3839,7 @@ msgstr ""
 "и PDF)."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, fuzzy
 #| msgid ""
 #| "When structure definitions, shell session logs, and so on are included in "
@@ -3856,7 +3861,7 @@ msgstr ""
 "IP>). Пример:"
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, fuzzy, no-wrap
 #| msgid ""
 #| "    .PP\n"
@@ -3896,19 +3901,38 @@ msgstr ""
 "    .PP\n"
 
 #. type: TH
-#: debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-03-30"
-msgstr "30 марта 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
+#, no-wrap
+msgid "2023-03-30"
+msgstr "30 марта 2023 г."
 
 #. type: TH
 #: opensuse-leap-15-6
 #, 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"