Merging upstream version 4.23.0.

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

1 files changed, 54 insertions, 31 deletions

diff --git a/po/ru/man4/console_codes.4.po b/po/ru/man4/console_codes.4.po
index 7e060ded..4540ba86 100644
--- a/po/ru/man4/console_codes.4.po
+++ b/po/ru/man4/console_codes.4.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
@@ -31,16 +31,17 @@ msgid "console_codes"
 msgstr "console_codes"
 
 #. 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
@@ -64,7 +65,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 Linux console implements a large subset of the VT102 and ECMA-48/ISO "
@@ -75,7 +77,7 @@ msgstr "ОПИСАНИЕ"
 #| "Sequences without a mnemonic are neither ECMA-48 nor VT102."
 msgid ""
 "The Linux console implements a large subset of the VT102 and ECMA-48 / ISO/"
-"IEC\\~6429 / ANSI X3.64 terminal controls, plus certain private-mode "
+"IEC\\ 6429 / ANSI X3.64 terminal controls, plus certain private-mode "
 "sequences for changing the color palette, character-set mapping, and so on.  "
 "In the tabular descriptions below, the second column gives ECMA-48 or DEC "
 "mnemonics (the latter if prefixed with DEC) for the given function.  "
@@ -644,10 +646,11 @@ msgid "ESC % @"
 msgstr "ESC % @"
 
 #. type: tbl table
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy, no-wrap
 #| msgid "\\0\\0\\0Select default (ISO 646 / ISO 8859-1)"
-msgid "\\0\\0\\0Select default (ISO/IEC\\~646 / ISO/IEC\\~8859-1)"
+msgid "\\0\\0\\0Select default (ISO/IEC\\ 646 / ISO/IEC\\ 8859-1)"
 msgstr "\\0\\0\\0выбор по умолчанию (ISO 646/ISO 8859-1)"
 
 #. type: tbl table
@@ -724,10 +727,11 @@ msgid "ESC ( B"
 msgstr "ESC ( B"
 
 #. type: tbl table
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy, no-wrap
 #| msgid "Select default (ISO 8859-1 mapping)."
-msgid "Select default (ISO/IEC\\~8859-1 mapping)."
+msgid "Select default (ISO/IEC\\ 8859-1 mapping)."
 msgstr "выбор по умолчанию (таблица перекодировки ISO 8859-1)"
 
 #. type: tbl table
@@ -3179,10 +3183,10 @@ msgstr "Определить набор символов G3"
 msgid ""
 "The program B<xterm>(1)  (in VT100 mode) recognizes ESC c, ESC # 8, ESC "
 "E<gt>, ESC =, ESC D, ESC E, ESC H, ESC M, ESC N, ESC O, ESC P ... ESC \\e, "
-"ESC Z (it answers ESC [ ? 1 ; 2 c, \"I am a VT100 with advanced video "
-"option\")  and ESC \\[ha] ... ESC \\e with the same meanings as indicated "
-"above.  It accepts ESC (, ESC ), ESC *, ESC + followed by 0, A, B for the "
-"DEC special character and line drawing set, UK, and US-ASCII, respectively."
+"ESC Z (it answers ESC [ ? 1 ; 2 c, \"I am a VT100 with advanced video option"
+"\")  and ESC \\[ha] ... ESC \\e with the same meanings as indicated above.  "
+"It accepts ESC (, ESC ), ESC *, ESC + followed by 0, A, B for the DEC "
+"special character and line drawing set, UK, and US-ASCII, respectively."
 msgstr ""
 "Программа B<xterm>(1) (в режиме VT100) распознает ESC c, ESC # 8, ESC E<gt>, "
 "ESC =, ESC D, ESC E, ESC H, ESC M, ESC N, ESC O, ESC P ... ESC \\e, ESC Z "
@@ -3620,7 +3624,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
@@ -3636,7 +3640,7 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
 msgid "BUGS"
-msgstr "ДЕФЕКТЫ"
+msgstr "ОШИБКИ"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -3721,7 +3725,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
@@ -3730,7 +3734,7 @@ msgid "B<ioctl_console>(2), B<charsets>(7)"
 msgstr "B<ioctl_console>(2), B<charsets>(7)"
 
 #. type: TH
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "2023-02-05"
 msgstr "5 февраля 2023 г."
@@ -3742,7 +3746,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 Linux console implements a large subset of the VT102 and ECMA-48/ISO "
 "6429/ANSI X3.64 terminal controls, plus certain private-mode sequences for "
@@ -3760,13 +3764,13 @@ msgstr ""
 "принадлежат ни к ECMA-48, ни к VT102."
 
 #. type: tbl table
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "\\0\\0\\0Select default (ISO 646 / ISO 8859-1)"
 msgstr "\\0\\0\\0выбор по умолчанию (ISO 646/ISO 8859-1)"
 
 #. type: tbl table
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "Select default (ISO 8859-1 mapping)."
 msgstr "выбор по умолчанию (таблица перекодировки ISO 8859-1)"
@@ -3778,13 +3782,32 @@ msgid "Has no visible effect in xterm."
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+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.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"