Merging upstream version 4.23.0.

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

1 files changed, 36 insertions, 9 deletions

diff --git a/templates/man8/systemd-timedated.service.8.pot b/templates/man8/systemd-timedated.service.8.pot
index 7e7b4438..8a8264b3 100644
--- a/templates/man8/systemd-timedated.service.8.pot
+++ b/templates/man8/systemd-timedated.service.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:11+0100\n"
+"POT-Creation-Date: 2024-06-01 06:29+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,7 +24,7 @@ msgid "SYSTEMD-TIMEDATED\\&.SERVICE"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux fedora-40 mageia-cauldron opensuse-tumbleweed
 #, no-wrap
 msgid "systemd 255"
 msgstr ""
@@ -146,10 +146,9 @@ msgid "LIST OF NETWORK TIME SYNCHRONIZATION SERVICES"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
 msgid ""
-"B<systemd-timesyncd> will look for files with a \"\\&.list\" extension in "
+"B<systemd-timedated> will look for files with a \"\\&.list\" extension in "
 "ntp-units\\&.d/ directories\\&. Each file is parsed as a list of unit names, "
 "one per line\\&. Empty lines and lines with comments (\"#\") are ignored\\&. "
 "Files are read from /usr/lib/systemd/ntp-units\\&.d/ and the corresponding "
@@ -176,11 +175,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
 msgid ""
 "If the environment variable I<$SYSTEMD_TIMEDATED_NTP_SERVICES> is set, "
-"B<systemd-timesyncd> will parse the contents of that variable as a colon-"
+"B<systemd-timedated> will parse the contents of that variable as a colon-"
 "separated list of unit names\\&. When set, this variable overrides the file-"
 "based list described above\\&."
 msgstr ""
@@ -216,7 +214,7 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "systemd 254"
 msgstr ""
@@ -239,3 +237,32 @@ msgid ""
 "install their configuration files in /usr/lib/ (distribution packages) or /"
 "usr/local/lib/ (local installs)\\&."
 msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 opensuse-leap-15-6
+msgid ""
+"If the environment variable I<$SYSTEMD_TIMEDATED_NTP_SERVICES> is set, "
+"B<systemd-timesyncd> will parse the contents of that variable as a colon-"
+"separated list of unit names\\&. When set, this variable overrides the file-"
+"based list described above\\&."
+msgstr ""
+
+#. type: TH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "systemd 256~rc3"
+msgstr ""
+
+#. type: Plain text
+#: fedora-40 opensuse-leap-15-6
+msgid ""
+"B<systemd-timesyncd> will look for files with a \"\\&.list\" extension in "
+"ntp-units\\&.d/ directories\\&. Each file is parsed as a list of unit names, "
+"one per line\\&. Empty lines and lines with comments (\"#\") are ignored\\&. "
+"Files are read from /usr/lib/systemd/ntp-units\\&.d/ and the corresponding "
+"directories under /etc/, /run/, /usr/local/lib/\\&. Files in /etc/ override "
+"files with the same name in /run/, /usr/local/lib/, and /usr/lib/\\&. Files "
+"in /run/ override files with the same name under /usr/\\&. Packages should "
+"install their configuration files in /usr/lib/ (distribution packages) or /"
+"usr/local/lib/ (local installs)\\&."
+msgstr ""