Merging upstream version 4.23.0.

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

1 files changed, 47 insertions, 27 deletions

diff --git a/po/ru/man4/hd.4.po b/po/ru/man4/hd.4.po
index 7d051426..071bb770 100644
--- a/po/ru/man4/hd.4.po
+++ b/po/ru/man4/hd.4.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-09 15:36+0100\n"
+"POT-Creation-Date: 2024-06-01 05:55+0200\n"
 "PO-Revision-Date: 2019-09-05 21:56+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -14,9 +14,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
@@ -27,16 +27,17 @@ msgid "hd"
 msgstr "hd"
 
 #. 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
@@ -91,17 +92,17 @@ msgstr ""
 #| "partitioning and BSD-disklabel partitioning are supported.  You can have "
 #| "at most 63 partitions on an IDE disk."
 msgid ""
-"General IDE block device names have the form B<hd>I<X> , or B<hd>I<XP> , "
-"where I<X> is a letter denoting the physical drive, and I<P> is a number "
-"denoting the partition on that physical drive.  The first form, B<hd>I<X> , "
-"is used to address the whole drive.  Partition numbers are assigned in the "
-"order the partitions are discovered, and only nonempty, nonextended "
-"partitions get a number.  However, partition numbers 1\\[en]4 are given to "
-"the four partitions described in the MBR (the \"primary\" partitions), "
-"regardless of whether they are unused or extended.  Thus, the first logical "
-"partition will be B<hd>I<X>B<5> \\&.  Both DOS-type partitioning and BSD-"
-"disklabel partitioning are supported.  You can have at most 63 partitions on "
-"an IDE disk."
+"General IDE block device names have the form B<hd>I<X>, or B<hd>I<XP>, where "
+"I<X> is a letter denoting the physical drive, and I<P> is a number denoting "
+"the partition on that physical drive.  The first form, B<hd>I<X>, is used to "
+"address the whole drive.  Partition numbers are assigned in the order the "
+"partitions are discovered, and only nonempty, nonextended partitions get a "
+"number.  However, partition numbers 1\\[en]4 are given to the four "
+"partitions described in the MBR (the \"primary\" partitions), regardless of "
+"whether they are unused or extended.  Thus, the first logical partition will "
+"be B<hd>I<X>B<5>\\&.  Both DOS-type partitioning and BSD-disklabel "
+"partitioning are supported.  You can have at most 63 partitions on an IDE "
+"disk."
 msgstr ""
 "Названия блочных устройств IDE имеют вид B<hd>I<X> или B<hd>I<XP>, где I<X> "
 "— буква, указывающая на физический диск, а I<P> — номер, указывающий на "
@@ -180,7 +181,7 @@ msgstr "I</dev/hd*>"
 #: 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
@@ -189,7 +190,7 @@ msgid "B<chown>(1), B<mknod>(1), B<sd>(4), B<mount>(8)"
 msgstr "B<chown>(1), B<mknod>(1), B<sd>(4), B<mount>(8)"
 
 #. 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 г."
@@ -201,13 +202,32 @@ msgid "Linux man-pages 6.03"
 msgstr "Linux man-pages 6.03"
 
 #. 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 "2023-10-31"
+msgstr "31 октября 2023 г."
+
+#. 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"