Merging upstream version 4.23.0.

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

1 files changed, 28 insertions, 9 deletions

diff --git a/templates/man7/systemd.time.7.pot b/templates/man7/systemd.time.7.pot
index b890e75f..ce1e2189 100644
--- a/templates/man7/systemd.time.7.pot
+++ b/templates/man7/systemd.time.7.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\\&.TIME"
 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 ""
@@ -278,6 +278,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "When parsing, systemd will accept a similar syntax, but some fields can be "
 "omitted, and the space between the date and time can be replaced with a "
@@ -289,6 +290,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "The timezone defaults to the current timezone if not specified "
 "explicitly\\&. It may be given after a space, like above, in which case it "
@@ -300,6 +302,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "It may also be affixed directly to the timestamp, in which case it must "
 "correspond to one of the formats defined in the \\m[blue]B<RFC "
@@ -310,6 +313,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "A timestamp can start with a field containing a weekday, which can be in an "
 "abbreviated (\"Wed\") or non-abbreviated (\"Wednesday\") English language "
@@ -320,6 +324,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "If the date is omitted, it defaults to today\\&. If the time is omitted, it "
 "defaults to 00:00:00\\&. Fractional seconds can be specified down to 1\\(mcs "
@@ -328,6 +333,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "There are special tokens that can be used in place of timestamps: \"now\" "
 "may be used to refer to the current time (or of the invocation of the "
@@ -338,6 +344,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "Relative times are also accepted: a time span (see above) prefixed with \"+"
 "\" is evaluated to the current time plus the specified time span\\&. "
@@ -349,6 +356,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "Finally, an integer prefixed with \"@\" is evaluated relative to the UNIX "
 "epoch \\(en 1970-01-01 00:00:00 UTC\\&."
@@ -365,6 +373,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid ""
 "  Fri 2012-11-23 11:12:13 → Fri 2012-11-23 11:12:13\n"
@@ -643,34 +652,38 @@ msgstr ""
 
 #. type: SH
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: IP
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid " 1."
 msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "RFC 3339"
 msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "\\%https://tools.ietf.org/html/rfc3339"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "systemd 254"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "When parsing, systemd will accept a similar syntax, but expects no timezone "
 "specification, unless it is given as the literal string \"UTC\" (for the UTC "
@@ -692,14 +705,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "A timestamp is considered invalid if a weekday is specified and the date "
 "does not match the specified day of the week\\&."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "When parsing, systemd will also accept a few special placeholders instead of "
 "timestamps: \"now\" may be used to refer to the current time (or of the "
@@ -709,7 +722,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "When parsing, systemd will also accept relative time specifications\\&. A "
 "time span (see above) that is prefixed with \"+\" is evaluated to the "
@@ -720,14 +733,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "Finally, a timespan prefixed with \"@\" is evaluated relative to the UNIX "
 "time epoch 1st Jan, 1970, 00:00\\&."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid ""
 "  Fri 2012-11-23 11:12:13 → Fri 2012-11-23 11:12:13\n"
@@ -748,3 +761,9 @@ msgid ""
 "                11min ago → Fri 2012-11-23 18:04:22\n"
 "              @1395716396 → Tue 2014-03-25 03:59:56\n"
 msgstr ""
+
+#. type: TH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "systemd 256~rc3"
+msgstr ""