Merging upstream version 4.23.0.

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

1 files changed, 91 insertions, 8 deletions

diff --git a/templates/man5/pstore.conf.5.pot b/templates/man5/pstore.conf.5.pot
index 474f8c21..c5b809b7 100644
--- a/templates/man5/pstore.conf.5.pot
+++ b/templates/man5/pstore.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:04+0100\n"
+"POT-Creation-Date: 2024-06-01 06:12+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 "PSTORE\\&.CONF"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux fedora-40 mageia-cauldron
 #, no-wrap
 msgid "systemd 255"
 msgstr ""
@@ -60,8 +60,7 @@ msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron
+#: archlinux debian-bookworm fedora-40 mageia-cauldron
 msgid "/etc/systemd/pstore\\&.conf /etc/systemd/pstore\\&.conf\\&.d/*"
 msgstr ""
 
@@ -89,7 +88,7 @@ msgid "CONFIGURATION DIRECTORIES AND PRECEDENCE"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux fedora-40 mageia-cauldron
 msgid ""
 "The default configuration is set during compilation, so configuration is "
 "only needed when it is necessary to deviate from those defaults\\&. The main "
@@ -103,8 +102,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron
+#: archlinux debian-bookworm fedora-40 mageia-cauldron
 msgid ""
 "In addition to the \"main\" configuration file, drop-in configuration "
 "snippets are read from /usr/lib/systemd/*\\&.conf\\&.d/, /usr/local/lib/"
@@ -119,7 +117,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 "
@@ -275,3 +273,88 @@ msgid ""
 "prefix all filenames in those subdirectories with a two-digit number and a "
 "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
+#: debian-unstable fedora-rawhide
+msgid "/etc/systemd/pstore\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/run/systemd/pstore\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/usr/lib/systemd/pstore\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/etc/systemd/pstore\\&.conf\\&.d/*\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/run/systemd/pstore\\&.conf\\&.d/*\\&.conf"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "/usr/lib/systemd/pstore\\&.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
+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 "
+"may use this logic to override the configuration files installed by vendor "
+"packages\\&. Drop-ins have to be used to override package drop-ins, since "
+"the main configuration file has lower precedence\\&. It is recommended to "
+"prefix all filenames in those subdirectories with a two-digit number and a "
+"dash, to simplify the ordering of the files\\&. This also defines a concept "
+"of drop-in priorities to allow OS vendors to ship drop-ins within a specific "
+"range lower than the range used by users\\&. This should lower the risk of "
+"package drop-ins overriding accidentally drop-ins defined by users\\&. It is "
+"recommended to use the range 10-40 for drop-ins in /usr/ and the range 60-90 "
+"for drop-ins in /etc/ and /run/, to make sure that local and transient drop-"
+"ins take priority over drop-ins shipped by the OS vendor\\&."
+msgstr ""