Merging upstream version 4.23.0.

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

1 files changed, 29 insertions, 28 deletions

diff --git a/templates/man4/sk98lin.4.pot b/templates/man4/sk98lin.4.pot
index 56e8fc9c..c8a39784 100644
--- a/templates/man4/sk98lin.4.pot
+++ b/templates/man4/sk98lin.4.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-09 15:46+0100\n"
+"POT-Creation-Date: 2024-06-01 06:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,15 +24,15 @@ msgid "sk98lin"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux opensuse-tumbleweed
 #, no-wrap
-msgid "2023-10-31"
+msgid "2024-05-02"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux
 #, no-wrap
-msgid "Linux man-pages 6.06"
+msgid "Linux man-pages 6.8"
 msgstr ""
 
 #. type: SH
@@ -59,12 +59,12 @@ msgstr ""
 #: archlinux fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
 #: opensuse-tumbleweed
 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 ""
 
 #. type: SH
@@ -207,14 +207,16 @@ msgid ""
 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>"
 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<Link> I<Aggregation>: E<.UR http://www.st.rim.or.jp\\:/\\[ti]yumo> E<.UE>"
 msgstr ""
@@ -920,38 +922,37 @@ msgid "B<ifconfig>(8), B<insmod>(8), B<modprobe>(8)"
 msgstr ""
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-02-05"
+msgid "2023-10-31"
 msgstr ""
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.04"
+msgid "Linux man-pages 6.06"
 msgstr ""
 
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"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 ""
 
-#. type: Plain text
+#. type: TH
 #: opensuse-leap-15-6
-msgid ""
-"I<Link> I<Aggregation> : E<.UR http://www.st.rim.or.jp\\:/\\[ti]yumo> E<.UE>"
+#, no-wrap
+msgid "2023-02-05"
 msgstr ""
 
 #. type: TH
-#: opensuse-tumbleweed
+#: opensuse-leap-15-6
 #, no-wrap
-msgid "2023-07-28"
+msgid "Linux man-pages 6.04"
 msgstr ""
 
 #. type: TH
 #: opensuse-tumbleweed
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "Linux man-pages (unreleased)"
 msgstr ""