Merging upstream version 4.23.0.

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

1 files changed, 40 insertions, 26 deletions

diff --git a/po/ru/man7/tcp.7.po b/po/ru/man7/tcp.7.po
index 36a49850..e5cd0fbf 100644
--- a/po/ru/man7/tcp.7.po
+++ b/po/ru/man7/tcp.7.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 17:11+0100\n"
+"POT-Creation-Date: 2024-06-01 06:30+0200\n"
 "PO-Revision-Date: 2019-09-16 18:46+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -16,9 +16,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
@@ -29,16 +29,17 @@ msgid "tcp"
 msgstr ""
 
 #. 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
@@ -715,7 +716,7 @@ msgstr "I<tcp_app_win> (integer; по умолчанию: 31; начиная с
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
-"Enables RFC\\~7413 Fast Open support.  The flag is used as a bitmap with the "
+"Enables RFC\\ 7413 Fast Open support.  The flag is used as a bitmap with the "
 "following values:"
 msgstr ""
 
@@ -802,7 +803,7 @@ msgstr "I<tcp_mem> (начиная с Linux 2.4)"
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
-"Set server side RFC\\~7413 Fast Open key to generate Fast Open cookie when "
+"Set server side RFC\\ 7413 Fast Open key to generate Fast Open cookie when "
 "server side Fast Open support is enabled."
 msgstr ""
 
@@ -1890,8 +1891,8 @@ msgid ""
 "Set to one of the following values to enable or disable RFC\\ 1323 TCP "
 "timestamps:"
 msgstr ""
-"Устанавливается в одно из следующих значений для включения меток времени "
-"RFC\\ 1323 TCP:"
+"Устанавливается в одно из следующих значений для включения меток времени RFC"
+"\\ 1323 TCP:"
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -2614,8 +2615,8 @@ msgstr ""
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
-"Further details on the user timeout feature can be found in RFC\\ 793 and "
-"RFC\\ 5482 (\"TCP User Timeout Option\")."
+"Further details on the user timeout feature can be found in RFC\\ 793 and RFC"
+"\\ 5482 (\"TCP User Timeout Option\")."
 msgstr ""
 "Подробней о свойстве пользовательского времени задержки смотрите RFC\\ 793 и "
 "RFC\\ 5482 («TCP User Timeout Option»)."
@@ -2652,7 +2653,7 @@ msgstr "B<TCP_INFO> (начиная с Linux 2.4)"
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
-"This option enables Fast Open (RFC\\~7413) on the listener socket.  The "
+"This option enables Fast Open (RFC\\ 7413) on the listener socket.  The "
 "value specifies the maximum length of pending SYNs (similar to the backlog "
 "argument in B<listen>(2)).  Once enabled, the listener socket grants the TCP "
 "Fast Open cookie on incoming SYN with TCP Fast Open option."
@@ -3153,7 +3154,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
@@ -3180,7 +3181,7 @@ msgstr "Протокол IPv6 не описан."
 #: 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
@@ -3261,16 +3262,22 @@ 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 "2023-07-15"
-msgstr "15 июля 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
@@ -3354,3 +3361,10 @@ msgstr "0x04"
 #: opensuse-leap-15-6 opensuse-tumbleweed
 msgid "disables RACK's DUPACK threshold heuristic (Since Linux 4.18)."
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages (unreleased)"
+msgstr "Linux man-pages 6.7"