Merging upstream version 4.23.0.

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

1 files changed, 69 insertions, 41 deletions

diff --git a/po/ru/man5/locale.5.po b/po/ru/man5/locale.5.po
index a8be7586..6c6eaf92 100644
--- a/po/ru/man5/locale.5.po
+++ b/po/ru/man5/locale.5.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:00+0100\n"
+"POT-Creation-Date: 2024-06-01 06:00+0200\n"
 "PO-Revision-Date: 2019-09-21 08:19+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -19,9 +19,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 "locale"
 msgstr "locale"
 
 #. 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
@@ -606,10 +607,11 @@ msgid "I<country_ab2>"
 msgstr "I<country_ab2>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid "followed by the two-letter abbreviation of the country (ISO 3166)."
-msgid "followed by the two-letter abbreviation of the country (ISO\\~3166)."
+msgid "followed by the two-letter abbreviation of the country (ISO\\ 3166)."
 msgstr "за которым указывается двухсимвольная аббревиатура страны (ISO 3166)."
 
 #. type: TP
@@ -620,10 +622,11 @@ msgid "I<country_ab3>"
 msgstr "I<country_ab3>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid "followed by the three-letter abbreviation of the country (ISO 3166)."
-msgid "followed by the three-letter abbreviation of the country (ISO\\~3166)."
+msgid "followed by the three-letter abbreviation of the country (ISO\\ 3166)."
 msgstr "за которым указывается трёхсимвольная аббревиатура страны (ISO 3166)."
 
 #. type: TP
@@ -634,10 +637,11 @@ msgid "I<country_num>"
 msgstr "I<country_num>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid "followed by the numeric country code (ISO 3166)."
-msgid "followed by the numeric country code (ISO\\~3166)."
+msgid "followed by the numeric country code (ISO\\ 3166)."
 msgstr "за которым указывается числовой код страны (ISO 3166)."
 
 #. type: TP
@@ -687,10 +691,11 @@ msgid "I<lang_ab>"
 msgstr "I<lang_ab>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid "followed by the two-letter abbreviation of the language (ISO 639)."
-msgid "followed by the two-letter abbreviation of the language (ISO\\~639)."
+msgid "followed by the two-letter abbreviation of the language (ISO\\ 639)."
 msgstr "за которым указывается двухсимвольная аббревиатура языка (ISO 639)."
 
 #. type: TP
@@ -701,12 +706,13 @@ msgid "I<lang_term>"
 msgstr "I<lang_term>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "followed by the three-letter abbreviation of the language (ISO 639-2/T)."
 msgid ""
-"followed by the three-letter abbreviation of the language (ISO\\~639-2/T)."
+"followed by the three-letter abbreviation of the language (ISO\\ 639-2/T)."
 msgstr ""
 "за которым указывается трёхсимвольная аббревиатура языка (ISO 639-2/T)."
 
@@ -718,7 +724,8 @@ msgid "I<lang_lib>"
 msgstr "I<lang_lib>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "followed by the three-letter abbreviation of the language for library use "
@@ -726,7 +733,7 @@ msgstr "I<lang_lib>"
 #| "I<lang_lib>."
 msgid ""
 "followed by the three-letter abbreviation of the language for library use "
-"(ISO\\~639-2/B).  Applications should in general prefer I<lang_term> over "
+"(ISO\\ 639-2/B).  Applications should in general prefer I<lang_term> over "
 "I<lang_lib>."
 msgstr ""
 "за которым указывается трёхсимвольная аббревиатура языка, используемая в "
@@ -1337,7 +1344,8 @@ msgid "marks the end of the redefinition of a collation rule."
 msgstr "помечает конец повторного определения правила сортировки."
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy, no-wrap
 #| msgid "I<reorde\\r-sections-after>"
 msgid "I<reorder-sections-after>"
@@ -1889,7 +1897,8 @@ msgid "I<int_curr_symbol>"
 msgstr "I<int_curr_symbol>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "followed by the international currency symbol.  This must be a 4-"
@@ -1897,8 +1906,8 @@ msgstr "I<int_curr_symbol>"
 #| "by the ISO 4217 standard (three characters) followed by a separator."
 msgid ""
 "followed by the international currency symbol.  This must be a 4-character "
-"string containing the international currency symbol as defined by the "
-"ISO\\~4217 standard (three characters) followed by a separator."
+"string containing the international currency symbol as defined by the ISO\\ "
+"4217 standard (three characters) followed by a separator."
 msgstr ""
 "за которым указывается международной символ валюты. Это должна быть строка "
 "из четырёх символов, в которой указан код международного символа валюты "
@@ -3470,7 +3479,7 @@ msgstr "POSIX.2."
 #: 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
@@ -3528,7 +3537,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
@@ -3545,7 +3554,7 @@ msgstr ""
 "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 "2023-02-05"
 msgstr "5 февраля 2023 г."
@@ -3557,34 +3566,34 @@ 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 "followed by the two-letter abbreviation of the country (ISO 3166)."
 msgstr "за которым указывается двухсимвольная аббревиатура страны (ISO 3166)."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the three-letter abbreviation of the country (ISO 3166)."
 msgstr "за которым указывается трёхсимвольная аббревиатура страны (ISO 3166)."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the numeric country code (ISO 3166)."
 msgstr "за которым указывается числовой код страны (ISO 3166)."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the two-letter abbreviation of the language (ISO 639)."
 msgstr "за которым указывается двухсимвольная аббревиатура языка (ISO 639)."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "followed by the three-letter abbreviation of the language (ISO 639-2/T)."
 msgstr ""
 "за которым указывается трёхсимвольная аббревиатура языка (ISO 639-2/T)."
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "followed by the three-letter abbreviation of the language for library use "
 "(ISO 639-2/B).  Applications should in general prefer I<lang_term> over "
@@ -3595,13 +3604,13 @@ msgstr ""
 "I<lang_term> вместо I<lang_lib>."
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "I<reorde\\r-sections-after>"
 msgstr "I<reorde\\r-sections-after>"
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "followed by the international currency symbol.  This must be a 4-character "
 "string containing the international currency symbol as defined by the ISO "
@@ -3612,13 +3621,32 @@ msgstr ""
 "согласно стандарту ISO 4217 (три символа) с последующим разделителем."
 
 #. 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"