Merging upstream version 4.23.0.

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

1 files changed, 61 insertions, 9 deletions

diff --git a/templates/man5/oomd.conf.5.pot b/templates/man5/oomd.conf.5.pot
index b599ae9a..6528a876 100644
--- a/templates/man5/oomd.conf.5.pot
+++ b/templates/man5/oomd.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:03+0100\n"
+"POT-Creation-Date: 2024-06-01 06:07+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 "OOMD\\&.CONF"
 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 ""
@@ -101,8 +101,7 @@ msgid "CONFIGURATION DIRECTORIES AND PRECEDENCE"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-tumbleweed
+#: archlinux fedora-40 mageia-cauldron opensuse-tumbleweed
 msgid ""
 "The default configuration is set during compilation, so configuration is "
 "only needed when it is necessary to deviate from those defaults\\&. The main "
@@ -116,8 +115,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: archlinux debian-bookworm fedora-40 mageia-cauldron opensuse-tumbleweed
 msgid ""
 "In addition to the \"main\" configuration file, drop-in configuration "
 "snippets are read from /usr/lib/systemd/*\\&.conf\\&.d/, /usr/local/lib/"
@@ -132,7 +130,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux fedora-40 mageia-cauldron
 msgid ""
 "When packages need to customize the configuration, they can install drop-ins "
 "under /usr/\\&. Files in /etc/ are reserved for the local administrator, who "
@@ -192,6 +190,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 247\\&."
 msgstr ""
 
@@ -238,6 +237,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 248\\&."
 msgstr ""
 
@@ -257,7 +257,7 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: debian-bookworm opensuse-tumbleweed
+#: debian-bookworm
 #, no-wrap
 msgid "systemd 254"
 msgstr ""
@@ -286,8 +286,60 @@ msgid ""
 "dash, to simplify the ordering of the files\\&."
 msgstr ""
 
+#. type: TH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "systemd 256~rc3"
+msgstr ""
+
 #. type: Plain text
-#: opensuse-tumbleweed
+#: debian-unstable fedora-rawhide
+msgid "/run/systemd/oomd\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/usr/lib/systemd/oomd\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/run/systemd/oomd\\&.conf\\&.d/*\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"The default configuration is set during compilation, so configuration is "
+"only needed when it is necessary to deviate from those defaults\\&. The main "
+"configuration file is loaded from one of the listed directories in order of "
+"priority, only the first file found is used: /etc/systemd/, /run/systemd/, /"
+"usr/local/lib/systemd/, /usr/lib/systemd/\\&. The vendor version of the file "
+"contains commented out entries showing the defaults as a guide to the "
+"administrator\\&. Local overrides can also be created by creating drop-ins, "
+"as described below\\&. The main configuration file can also be edited for "
+"this purpose (or a copy in /etc/ if it\\*(Aqs shipped under /usr/), however "
+"using drop-ins for local configuration is recommended over modifications to "
+"the main configuration file\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"In addition to the main configuration file, drop-in configuration snippets "
+"are read from /usr/lib/systemd/*\\&.conf\\&.d/, /usr/local/lib/systemd/*\\&."
+"conf\\&.d/, and /etc/systemd/*\\&.conf\\&.d/\\&. Those drop-ins have higher "
+"precedence and override the main configuration file\\&. Files in the *\\&."
+"conf\\&.d/ configuration subdirectories are sorted by their filename in "
+"lexicographic order, regardless of in which of the subdirectories they "
+"reside\\&. When multiple files specify the same option, for options which "
+"accept just a single value, the entry in the file sorted last takes "
+"precedence, and for options which accept a list of values, entries are "
+"collected as they occur in the sorted files\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
 "When packages need to customize the configuration, they can install drop-ins "
 "under /usr/\\&. Files in /etc/ are reserved for the local administrator, who "