Merging upstream version 4.23.0.

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

1 files changed, 26 insertions, 13 deletions

diff --git a/po/ru/man5/passwd.5.po b/po/ru/man5/passwd.5.po
index 67848c1d..de195ae6 100644
--- a/po/ru/man5/passwd.5.po
+++ b/po/ru/man5/passwd.5.po
@@ -4,14 +4,14 @@
 # Alexey, 2016.
 # Azamat Hackimov <azamat.hackimov@gmail.com>, 2014-2017.
 # kogamatranslator49 <r.podarov@yandex.ru>, 2015.
-# Kogan, Darima <silverdk99@gmail.com>, 2014.
+# Darima Kogan <silverdk99@gmail.com>, 2014.
 # Max Is <ismax799@gmail.com>, 2016.
 # Yuri Kozlov <yuray@komyakino.ru>, 2011-2019.
 # Иван Павлов <pavia00@gmail.com>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:03+0100\n"
+"POT-Creation-Date: 2024-06-01 06:08+0200\n"
 "PO-Revision-Date: 2019-10-12 08:58+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
@@ -38,7 +38,7 @@ msgid "2023-10-31"
 msgstr "31 октября 2023 г."
 
 #. type: TH
-#: fedora-40 fedora-rawhide mageia-cauldron
+#: fedora-40 mageia-cauldron
 #, no-wrap
 msgid "Linux man-pages 6.06"
 msgstr "Linux man-pages 6.06"
@@ -217,8 +217,8 @@ msgstr "I<пароль>"
 #, fuzzy
 #| msgid ""
 #| "This is either the encrypted user password, an asterisk (*), or the "
-#| "letter \\(aqx\\(aq.  (See B<pwconv>(8)  for an explanation of "
-#| "\\(aqx\\(aq.)"
+#| "letter \\(aqx\\(aq.  (See B<pwconv>(8)  for an explanation of \\(aqx"
+#| "\\(aq.)"
 msgid ""
 "This is either the encrypted user password, an asterisk (*), or the letter "
 "\\[aq]x\\[aq].  (See B<pwconv>(8)  for an explanation of \\[aq]x\\[aq].)"
@@ -354,7 +354,7 @@ msgstr "I</etc/passwd>"
 #: opensuse-tumbleweed
 #, no-wrap
 msgid "NOTES"
-msgstr "ЗАМЕЧАНИЯ"
+msgstr "ПРИМЕЧАНИЯ"
 
 #. type: Plain text
 #: fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
@@ -389,7 +389,7 @@ msgstr ""
 #: opensuse-tumbleweed
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "СМ. ТАКЖЕ"
+msgstr "СМОТРИТЕ ТАКЖЕ"
 
 #. type: Plain text
 #: fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
@@ -402,7 +402,13 @@ msgstr ""
 "B<getpwent>(3), B<getpwnam>(3), B<group>(5), B<shadow>(5), B<vipw>(8)"
 
 #. type: TH
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: 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-02-05"
 msgstr "5 февраля 2023 г."
@@ -416,5 +422,12 @@ msgstr "Linux man-pages 6.04"
 #. type: TH
 #: opensuse-tumbleweed
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+msgid "2024-05-02"
+msgstr "2 мая 2024 г."
+
+#. type: TH
+#: opensuse-tumbleweed
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages (unreleased)"
+msgstr "Linux man-pages 6.7"