Merging upstream version 4.23.0.

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

1 files changed, 52 insertions, 60 deletions

diff --git a/po/ru/man4/sk98lin.4.po b/po/ru/man4/sk98lin.4.po
index f867f492..8190ccee 100644
--- a/po/ru/man4/sk98lin.4.po
+++ b/po/ru/man4/sk98lin.4.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-09 15:46+0100\n"
+"POT-Creation-Date: 2024-06-01 06:22+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 "sk98lin"
 msgstr "sk98lin"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux 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
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages 6.8"
+msgstr "Linux man-pages 6.7"
 
 #. type: SH
 #: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
@@ -76,12 +77,12 @@ msgstr "СИНТАКСИС"
 #| "j,...>] [B<Moderation=>I<i,j,...>] [B<IntsPerSec=>I<i,j,...>] "
 #| "[B<PrefPort=>I<i,j,...>] [B<RlmtMode=>I<i,j,...>]"
 msgid ""
-"B<insmod sk98lin.o> [B<Speed_A=> I<i,j,...>] [B<Speed_B=> I<i,j,...>] "
-"[B<AutoNeg_A=> I<i,j,...>] [B<AutoNeg_B=> I<i,j,...>] [B<DupCap_A=> I<i,j,..."
-">] [B<DupCap_B=> I<i,j,...>] [B<FlowCtrl_A=> I<i,j,...>] [B<FlowCtrl_B=> I<i,"
-"j,...>] [B<Role_A=> I<i,j,...>] [B<Role_B=> I<i,j,...>] [B<ConType=> I<i,"
-"j,...>] [B<Moderation=> I<i,j,...>] [B<IntsPerSec=> I<i,j,...>] "
-"[B<PrefPort=> I<i,j,...>] [B<RlmtMode=> I<i,j,...>]"
+"B<insmod sk98lin.o> [B<Speed_A=>I<i,j,...>] [B<Speed_B=>I<i,j,...>] "
+"[B<AutoNeg_A=>I<i,j,...>] [B<AutoNeg_B=>I<i,j,...>] [B<DupCap_A=>I<i,j,...>] "
+"[B<DupCap_B=>I<i,j,...>] [B<FlowCtrl_A=>I<i,j,...>] [B<FlowCtrl_B=>I<i,j,..."
+">] [B<Role_A=>I<i,j,...>] [B<Role_B=>I<i,j,...>] [B<ConType=>I<i,j,...>] "
+"[B<Moderation=>I<i,j,...>] [B<IntsPerSec=>I<i,j,...>] [B<PrefPort=>I<i,j,..."
+">] [B<RlmtMode=>I<i,j,...>]"
 msgstr ""
 "B<insmod sk98lin.o> [B<Speed_A=>I<i,j,...>] [B<Speed_B=>I<i,j,...>] "
 "[B<AutoNeg_A=>I<i,j,...>] [B<AutoNeg_B=>I<i,j,...>] [B<DupCap_A=>I<i,j,...>] "
@@ -277,7 +278,8 @@ msgstr ""
 "которые можно найти в Интернет:"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-tumbleweed
+#: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
 msgid ""
 "I<VLAN>: E<.UR http://www.candelatech.com\\:/\\[ti]greear\\:/vlan.html> E<."
 "UE>"
@@ -286,7 +288,8 @@ msgstr ""
 "UE>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-tumbleweed
+#: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
 msgid ""
 "I<Link> I<Aggregation>: E<.UR http://www.st.rim.or.jp\\:/\\[ti]yumo> E<.UE>"
 msgstr ""
@@ -867,8 +870,8 @@ msgid ""
 "I<Dynamic> Interrupt moderation might be applied on the adapter card, "
 "depending on the load of the system.  If the driver detects that the system "
 "load is too high, the driver tries to shield the system against too much "
-"network load by enabling interrupt moderation.  If\\[em]at a later "
-"time\\[em]the CPU utilization decreases again (or if the network load is "
+"network load by enabling interrupt moderation.  If\\[em]at a later time"
+"\\[em]the CPU utilization decreases again (or if the network load is "
 "negligible), the interrupt moderation will automatically be disabled."
 msgstr ""
 "I<Dynamic> Регулирование прерываний может применяться к адаптеру в "
@@ -883,10 +886,10 @@ msgstr ""
 #: opensuse-tumbleweed
 msgid ""
 "Interrupt moderation should be used when the driver has to handle one or "
-"more interfaces with a high network load, which\\[em]as a "
-"consequence\\[em]leads also to a high CPU utilization.  When moderation is "
-"applied in such high network load situations, CPU load might be reduced by "
-"20\\[en]30% on slow computers."
+"more interfaces with a high network load, which\\[em]as a consequence"
+"\\[em]leads also to a high CPU utilization.  When moderation is applied in "
+"such high network load situations, CPU load might be reduced by 20\\[en]30% "
+"on slow computers."
 msgstr ""
 "Регулирование прерываний должно использоваться, когда драйвер обрабатывает "
 "много трафика на одном или более интерфейсах, который, как следствие, также "
@@ -1128,7 +1131,7 @@ msgstr ""
 #: opensuse-tumbleweed
 #, no-wrap
 msgid "BUGS"
-msgstr "ДЕФЕКТЫ"
+msgstr "ОШИБКИ"
 
 #.  .SH AUTHORS
 #.  Ralph Roesler \[em] rroesler@syskonnect.de
@@ -1145,7 +1148,7 @@ msgstr "О дефектах сообщайте по адресу: linux@syskonne
 #: opensuse-tumbleweed
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "СМ. ТАКЖЕ"
+msgstr "СМОТРИТЕ ТАКЖЕ"
 
 #. type: Plain text
 #: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
@@ -1154,49 +1157,38 @@ msgid "B<ifconfig>(8), B<insmod>(8), B<modprobe>(8)"
 msgstr "B<ifconfig>(8), B<insmod>(8), B<modprobe>(8)"
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-02-05"
-msgstr "5 февраля 2023 г."
+msgid "2023-10-31"
+msgstr "31 октября 2023 г."
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.04"
-msgstr "Linux man-pages 6.04"
+msgid "Linux man-pages 6.06"
+msgstr "Linux man-pages 6.06"
 
-#. type: Plain text
-#: opensuse-leap-15-6
-#, fuzzy
-#| msgid ""
-#| "I<VLAN>: E<.UR http://www.candelatech.com\\:/\\[ti]greear\\:/vlan.html> "
-#| "E<.UE>"
-msgid ""
-"I<VLAN> : E<.UR http://www.candelatech.com\\:/\\[ti]greear\\:/vlan.html> E<."
-"UE>"
-msgstr ""
-"I<VLAN>: E<.UR http://www.candelatech.com\\:/\\[ti]greear\\:/vlan.html> E<."
-"UE>"
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
+msgstr "Linux man-pages 6.7"
 
-#. type: Plain text
+#. type: TH
 #: opensuse-leap-15-6
-#, fuzzy
-#| msgid ""
-#| "I<Link> I<Aggregation>: E<.UR http://www.st.rim.or.jp\\:/\\[ti]yumo> E<."
-#| "UE>"
-msgid ""
-"I<Link> I<Aggregation> : E<.UR http://www.st.rim.or.jp\\:/\\[ti]yumo> E<.UE>"
-msgstr ""
-"I<Link> I<Aggregation>: E<.UR http://www.st.rim.or.jp\\:/\\[ti]yumo> E<.UE>"
+#, no-wrap
+msgid "2023-02-05"
+msgstr "5 февраля 2023 г."
 
 #. type: TH
-#: opensuse-tumbleweed
+#: opensuse-leap-15-6
 #, no-wrap
-msgid "2023-07-28"
-msgstr "28 июля 2023 г."
+msgid "Linux man-pages 6.04"
+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"
+#, fuzzy, no-wrap
+#| msgid "Linux man-pages 6.7"
+msgid "Linux man-pages (unreleased)"
+msgstr "Linux man-pages 6.7"