Merging upstream version 4.23.0.

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

2 files changed, 74 insertions, 40 deletions

diff --git a/po/nl/man7/ascii.7.po b/po/nl/man7/ascii.7.po
index a4c3025c..5113a52c 100644
--- a/po/nl/man7/ascii.7.po
+++ b/po/nl/man7/ascii.7.po
@@ -1,22 +1,22 @@
 # Dutch translation of manpages
 # This file is distributed under the same license as the manpages-l10n package.
 # Copyright © of this file:
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2020-2021.
-# Luc Castermans <luc.castermans@gmail.com>, 2021-2023.
 #
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2020-2021.
+# Luc Castermans <luc.castermans@gmail.com>, 2021-2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:52+0100\n"
-"PO-Revision-Date: 2023-02-23 20:06+0100\n"
+"POT-Creation-Date: 2024-06-01 05:41+0200\n"
+"PO-Revision-Date: 2024-05-19 08:37+0200\n"
 "Last-Translator: Luc Castermans <luc.castermans@gmail.com>\n"
-"Language-Team: Dutch - The Netherlands <kde-i18n-nl@kde.org>\n"
+"Language-Team: Dutch <>\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 42.0\n"
+"X-Generator: Lokalize 22.12.3\n"
 
 #. type: TH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -26,16 +26,17 @@ msgid "ascii"
 msgstr "ascii"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2024-01-28"
-msgstr "28 januari 2024"
+msgid "2024-05-02"
+msgstr "2 mei 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
@@ -59,23 +60,24 @@ msgid "DESCRIPTION"
 msgstr "BESCHRIJVING"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, fuzzy
 #| msgid ""
 #| "ASCII is the American Standard Code for Information Interchange.  It is a "
-#| "7-bit code.  Many 8-bit codes (e.g., ISO 8859-1) contain ASCII as their "
-#| "lower half.  The international counterpart of ASCII is known as ISO 646-"
-#| "IRV."
+#| "7-bit code.  Many 8-bit codes (e.g., ISO/IEC\\~8859-1) contain ASCII as "
+#| "their lower half.  The international counterpart of ASCII is known as ISO/"
+#| "IEC\\~646-IRV."
 msgid ""
 "ASCII is the American Standard Code for Information Interchange.  It is a 7-"
-"bit code.  Many 8-bit codes (e.g., ISO/IEC\\~8859-1) contain ASCII as their "
-"lower half.  The international counterpart of ASCII is known as ISO/"
-"IEC\\~646-IRV."
+"bit code.  Many 8-bit codes (e.g., ISO/IEC\\ 8859-1) contain ASCII as their "
+"lower half.  The international counterpart of ASCII is known as ISO/IEC\\ "
+"646-IRV."
 msgstr ""
 "ASCII is de afkorting van American Standard Code for Information "
 "Interchange. Het is een 7-bit code. Veel 8-bit codes (b.v. ISO 8859-1) bevat "
 "ASCII als de onderste helft. De internationale tegenhanger van ASCII is "
-"bekend als ISO 646-IRV."
+"bekend als ISO/IEC\\~646-IRV."
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -3142,7 +3144,7 @@ msgid "Linux man-pages 6.03"
 msgstr "Linux man-pagina's 6.03"
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "ASCII is the American Standard Code for Information Interchange.  It is a 7-"
 "bit code.  Many 8-bit codes (e.g., ISO 8859-1) contain ASCII as their lower "
@@ -3154,19 +3156,32 @@ msgstr ""
 "bekend als ISO 646-IRV."
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-05-02"
-msgstr "2 mei 2023"
+msgid "2024-01-28"
+msgstr "28 januari 2024"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pagina's 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 "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"
diff --git a/po/nl/man7/intro.7.po b/po/nl/man7/intro.7.po
index ad2e993b..b3a7e9a8 100644
--- a/po/nl/man7/intro.7.po
+++ b/po/nl/man7/intro.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n 2.15\n"
-"POT-Creation-Date: 2024-03-01 16:59+0100\n"
+"POT-Creation-Date: 2024-06-01 05:56+0200\n"
 "PO-Revision-Date: 2021-02-18 19:55+0100\n"
 "Last-Translator: Luc Castermans <luc.castermans@gmail.com>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -25,17 +25,17 @@ msgid "intro"
 msgstr "intro"
 
 #. type: TH
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2022-10-30"
-msgstr "30 oktober 2022"
+msgid "2024-05-02"
+msgstr "2 mei 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
@@ -108,19 +108,38 @@ msgid "B<standards>(7)"
 msgstr "B<standards>(7)"
 
 #. type: TH
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid "2022-10-30"
+msgstr "30 oktober 2022"
+
+#. type: TH
 #: debian-bookworm
 #, no-wrap
 msgid "Linux man-pages 6.03"
 msgstr "Linux man-pagina's 6.03"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Linux man-pagina's 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 "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"