Merging upstream version 4.23.0.

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

1 files changed, 46 insertions, 27 deletions

diff --git a/po/ru/man7/symlink.7.po b/po/ru/man7/symlink.7.po
index cfaf474a..676e27ae 100644
--- a/po/ru/man7/symlink.7.po
+++ b/po/ru/man7/symlink.7.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:09+0100\n"
+"POT-Creation-Date: 2024-06-01 06:25+0200\n"
 "PO-Revision-Date: 2019-10-15 18:55+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -20,9 +20,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
@@ -33,16 +33,17 @@ msgid "symlink"
 msgstr "symlink"
 
 #. 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
@@ -162,8 +163,8 @@ msgstr ""
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
 #: opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
-"There is a special class of symbolic-link-like objects known as \"magic "
-"links\", which can be found in certain pseudofilesystems such as B<proc>(5)  "
+"There is a special class of symbolic-link-like objects known as \"magic links"
+"\", which can be found in certain pseudofilesystems such as B<proc>(5)  "
 "(examples include I</proc/>pidI</exe> and I</proc/>pidI</fd/>*).  Unlike "
 "normal symbolic links, magic links are not resolved through pathname-"
 "expansion, but instead act as direct references to the kernel's own "
@@ -271,7 +272,7 @@ msgstr ""
 #.  became apparent.
 #. type: Plain text
 #. #-#-#-#-#  debian-unstable: symlink.7.pot (PACKAGE VERSION)  #-#-#-#-#
-#.  .PP
+#.  .P
 #.  The
 #.  4.4BSD
 #.  system differs from historical
@@ -346,7 +347,7 @@ msgstr ""
 #.  became apparent.
 #. type: Plain text
 #. #-#-#-#-#  opensuse-tumbleweed: symlink.7.pot (PACKAGE VERSION)  #-#-#-#-#
-#.  .PP
+#.  .P
 #.  The
 #.  4.4BSD
 #.  system differs from historical
@@ -848,9 +849,8 @@ msgstr ""
 msgid ""
 "The I<second rule> applies to symbolic links that refer to directories.  "
 "Symbolic links that refer to directories are never followed by default.  "
-"This is often referred to as a \"physical\" walk, as opposed to a "
-"\"logical\" walk (where symbolic links that refer to directories are "
-"followed)."
+"This is often referred to as a \"physical\" walk, as opposed to a \"logical"
+"\" walk (where symbolic links that refer to directories are followed)."
 msgstr ""
 "I<Второе правило> применяется к символьным ссылкам, которые указывают на "
 "каталоги. По умолчанию такие символьные ссылки никогда не разыменовываются. "
@@ -1012,7 +1012,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
@@ -1043,8 +1043,8 @@ msgstr "Linux man-pages 6.03"
 #. type: Plain text
 #: debian-bookworm
 msgid ""
-"There is a special class of symbolic-link-like objects known as \"magic "
-"links\", which can be found in certain pseudofilesystems such as B<proc>(5)  "
+"There is a special class of symbolic-link-like objects known as \"magic links"
+"\", which can be found in certain pseudofilesystems such as B<proc>(5)  "
 "(examples include I</proc/[pid]/exe> and I</proc/[pid]/fd/*>).  Unlike "
 "normal symbolic links, magic links are not resolved through pathname-"
 "expansion, but instead act as direct references to the kernel's own "
@@ -1067,19 +1067,38 @@ msgstr ""
 "установлен бит закрепления (sticky bit) (смотрите B<stat>(2))."
 
 #. type: TH
-#: debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-04-03"
-msgstr "3 апреля 2023 г."
+msgid "2023-10-31"
+msgstr "31 октября 2023 г."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pages 6.05.01"
+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 "2023-04-03"
+msgstr "3 апреля 2023 г."
 
 #. 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"