Merging upstream version 4.23.0.

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

1 files changed, 41 insertions, 27 deletions

diff --git a/po/ru/man7/cp1251.7.po b/po/ru/man7/cp1251.7.po
index 61a4478f..d4b0120a 100644
--- a/po/ru/man7/cp1251.7.po
+++ b/po/ru/man7/cp1251.7.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:54+0100\n"
+"POT-Creation-Date: 2024-06-01 05:45+0200\n"
 "PO-Revision-Date: 2019-10-05 07:56+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -18,9 +18,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
@@ -32,16 +32,17 @@ msgid "cp1251"
 msgstr "CP1251"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2024-01-28"
-msgstr "28 января 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
@@ -67,7 +68,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
 #, fuzzy
 #| msgid ""
 #| "The Windows Code Pages include several 8-bit extensions to the ASCII "
@@ -75,7 +77,7 @@ msgstr "ОПИСАНИЕ"
 #| "characters used in Cyrillic scripts."
 msgid ""
 "The Windows Code Pages include several 8-bit extensions to the ASCII "
-"character set (also known as ISO/IEC\\~646-IRV).  CP\\ 1251 encodes the "
+"character set (also known as ISO/IEC\\ 646-IRV).  CP\\ 1251 encodes the "
 "characters used in Cyrillic scripts."
 msgstr ""
 "В страницы кодов Windows включены некоторые 8-битные расширения набора "
@@ -1279,13 +1281,6 @@ msgstr "A0"
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
-msgid "\\ "
-msgstr "\\ "
-
-#. type: tbl table
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-#, no-wrap
 msgid "NO-BREAK SPACE"
 msgstr "НЕРАЗРЫВНЫЙ ПРОБЕЛ"
 
@@ -4311,7 +4306,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
@@ -4324,7 +4319,7 @@ msgstr "CP\\ 1251 также известна как Windows Cyrillic."
 #: 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
@@ -4337,7 +4332,7 @@ msgstr ""
 "B<koi8-u>(7), B<utf-8>(7)"
 
 #. type: TH
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "2022-12-15"
 msgstr "15 декабря 2022 г."
@@ -4349,7 +4344,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 ""
 "The Windows Code Pages include several 8-bit extensions to the ASCII "
 "character set (also known as ISO 646-IRV).  CP\\ 1251 encodes the characters "
@@ -4360,13 +4355,32 @@ msgstr ""
 "символы, используемые в кириллических письменностях."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
+#, no-wrap
+msgid "2024-01-28"
+msgstr "28 января 2024 г."
+
+#. 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 "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
 #, 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"