Merging upstream version 4.23.0.

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

1 files changed, 42 insertions, 13 deletions

diff --git a/templates/man5/motd.5.pot b/templates/man5/motd.5.pot
index ecdc6fc7..915d0543 100644
--- a/templates/man5/motd.5.pot
+++ b/templates/man5/motd.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:02+0100\n"
+"POT-Creation-Date: 2024-06-01 06:04+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 "motd"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable
 #, no-wrap
-msgid "2023-10-31"
+msgid "2024-05-02"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable
 #, no-wrap
-msgid "Linux man-pages 6.06"
+msgid "Linux man-pages 6.8"
 msgstr ""
 
 #. type: SH
@@ -92,12 +92,12 @@ msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
 msgid "B<login>(1), B<issue>(5)"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm debian-unstable
+#: debian-bookworm
 #, no-wrap
 msgid "2022-10-30"
 msgstr ""
@@ -112,31 +112,60 @@ msgstr ""
 #.  End of patch
 #.  .BR login (1)
 #. type: Plain text
-#: debian-bookworm debian-unstable
+#: debian-bookworm
 msgid ""
 "The contents of I</etc/motd> are displayed by B<pam_motd>(8)  B<login>(1)  "
 "after a successful login but just before it executes the login shell."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable
+#: debian-bookworm
 msgid ""
 "On Debian GNU/Linux, dynamic content configured at I</etc/pam.d/login> is "
 "also displayed by I<pam_exec>."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable
+#: debian-bookworm
 msgid "I</etc/pam.d/login>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable
+#: debian-bookworm
 msgid "B<login>(1), B<issue>(5)  B<pam_motd>(8)"
 msgstr ""
 
-#. type: TH
+#.  Patched in Debian, maybe other distribs
+#.  End of patch
+#.  .BR login (1)
+#. type: Plain text
+#: debian-unstable
+msgid ""
+"The contents of I</etc/motd> are displayed by B<pam_motd>(8)  after a "
+"successful login but just before it executes the login shell."
+msgstr ""
+
+#. type: Plain text
 #: debian-unstable
+msgid ""
+"On Debian GNU/Linux, dynamic content configured at I</etc/pam.d/login> is "
+"also displayed by I<pam_exec>"
+msgstr ""
+
+#. type: TH
+#: fedora-40 fedora-rawhide mageia-cauldron
+#, no-wrap
+msgid "2023-10-31"
+msgstr ""
+
+#. type: TH
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "Linux man-pages 6.06"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.7"
 msgstr ""