Merging upstream version 4.23.0.

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

1 files changed, 59 insertions, 23 deletions

diff --git a/po/nb/man1/printf.1.po b/po/nb/man1/printf.1.po
index 02195bc4..433d91d0 100644
--- a/po/nb/man1/printf.1.po
+++ b/po/nb/man1/printf.1.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n 4.11.0\n"
-"POT-Creation-Date: 2024-02-15 18:06+0100\n"
+"POT-Creation-Date: 2024-05-01 15:48+0200\n"
 "PO-Revision-Date: 2021-09-03 20:09+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: Norwegian bokmål <>\n"
@@ -22,16 +22,16 @@ msgid "PRINTF"
 msgstr "PRINTF"
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable
 #, no-wrap
-msgid "January 2024"
-msgstr "Januar 2024"
+msgid "March 2024"
+msgstr "Mars 2024"
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "GNU coreutils 9.4"
-msgstr "GNU coreutils 9.4"
+msgid "GNU coreutils 9.5"
+msgstr "GNU coreutils 9.5"
 
 #. type: TH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -371,12 +371,16 @@ msgstr ""
 "håndtert."
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
+#, fuzzy
+#| msgid ""
+#| "NOTE: your shell may have its own version of printf, which usually "
+#| "supersedes the version described here.  Please refer to your shell's "
+#| "documentation for details about the options it supports."
 msgid ""
-"NOTE: your shell may have its own version of printf, which usually "
-"supersedes the version described here.  Please refer to your shell's "
-"documentation for details about the options it supports."
+"Your shell may have its own version of printf, which usually supersedes the "
+"version described here.  Please refer to your shell's documentation for "
+"details about the options it supports."
 msgstr ""
 "MERK: det er mulig at skallet ditt bruker en egen versjon av B<printf>, som "
 "ofte er nyere enn versjonen som beskrives her. Les dokumentasjonen for "
@@ -428,12 +432,12 @@ msgid "COPYRIGHT"
 msgstr "OPPHAVSRETT"
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
-"Copyright \\(co 2023 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
+"Copyright \\(co 2024 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
 "version 3 or later E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 msgstr ""
-"Copyright \\(co 2023 Free Software Foundation, Inc.  Lisens GPLv3+: GNU GPL "
+"Copyright \\(co 2024 Free Software Foundation, Inc.  Lisens GPLv3+: GNU GPL "
 "versjon 3 eller senere E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 
 #. type: Plain text
@@ -483,13 +487,24 @@ msgid "September 2022"
 msgstr "September 2022"
 
 #. type: TH
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm
 #, no-wrap
 msgid "GNU coreutils 9.1"
 msgstr "GNU coreutils 9.1"
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"NOTE: your shell may have its own version of printf, which usually "
+"supersedes the version described here.  Please refer to your shell's "
+"documentation for details about the options it supports."
+msgstr ""
+"MERK: det er mulig at skallet ditt bruker en egen versjon av B<printf>, som "
+"ofte er nyere enn versjonen som beskrives her. Les dokumentasjonen for "
+"skallet for mer informasjon om hvilke valg som støttes."
+
+#. type: Plain text
+#: debian-bookworm
 msgid ""
 "Copyright \\(co 2022 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
 "version 3 or later E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
@@ -498,16 +513,37 @@ msgstr ""
 "versjon 3 eller senere E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 
 #. type: TH
-#: mageia-cauldron
+#: debian-unstable fedora-40 mageia-cauldron
+#, no-wrap
+msgid "GNU coreutils 9.4"
+msgstr "GNU coreutils 9.4"
+
+#. type: Plain text
+#: debian-unstable fedora-40 mageia-cauldron
+msgid ""
+"Copyright \\(co 2023 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
+"version 3 or later E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
+msgstr ""
+"Copyright \\(co 2023 Free Software Foundation, Inc.  Lisens GPLv3+: GNU GPL "
+"versjon 3 eller senere E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
+
+#. type: TH
+#: fedora-40 opensuse-leap-15-6
 #, no-wrap
-msgid "April 2022"
-msgstr "April 2022"
+msgid "January 2024"
+msgstr "Januar 2024"
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "April 2024"
+msgstr "April 2024"
+
+#. type: TH
+#: mageia-cauldron
 #, no-wrap
-msgid "October 2021"
-msgstr "Oktober 2021"
+msgid "August 2023"
+msgstr "August 2023"
 
 #. type: TH
 #: opensuse-leap-15-6