Merging upstream version 4.23.0.

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

1 files changed, 145 insertions, 22 deletions

diff --git a/templates/man1/portablectl.1.pot b/templates/man1/portablectl.1.pot
index 67780678..0d2adedd 100644
--- a/templates/man1/portablectl.1.pot
+++ b/templates/man1/portablectl.1.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:09+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 "PORTABLECTL"
 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 ""
@@ -95,22 +95,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Portable service images are an efficient way to bundle multiple related "
 "services and other units together, and transfer them as a whole between "
-"systems\\&. When these images are attached the local system the contained "
-"units may run in most ways like regular system-provided units, either with "
-"full privileges or inside strict sandboxing, depending on the selected "
-"configuration\\&. For more details, see \\m[blue]B<Portable Services "
-"Documentation>\\m[]\\&\\s-2\\u[1]\\d\\s+2\\&."
+"systems\\&. When these images are attached to the local system, the "
+"contained units may run in most ways like regular system-provided units, "
+"either with full privileges or inside strict sandboxing, depending on the "
+"selected configuration\\&. For more details, see \\m[blue]B<Portable "
+"Services Documentation>\\m[]\\&\\s-2\\u[1]\\d\\s+2\\&."
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
-msgid "Specifically portable service images may be of the following kind:"
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
+msgid "Portable service images may be of the following kinds:"
 msgstr ""
 
 #. type: Plain text
@@ -170,6 +168,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 239\\&."
 msgstr ""
 
@@ -330,6 +329,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 248\\&."
 msgstr ""
 
@@ -627,8 +627,7 @@ msgid "B<--copy=>"
 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 ""
 "When attaching an image, select whether to prefer copying or symlinking of "
 "files installed into the host system\\&. Takes one of \"copy\" (to prefer "
@@ -703,6 +702,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 245\\&."
 msgstr ""
 
@@ -739,13 +739,13 @@ msgid "B<--extension=>I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
 msgid ""
 "Add an additional image I<PATH> as an overlay on top of I<IMAGE> when "
 "attaching/detaching\\&. This argument can be specified multiple times, in "
 "which case the order in which images are laid down follows the rules "
 "specified in B<systemd.exec>(5)  for the I<ExtensionImages=> directive and "
-"for the B<systemd-sysext>(8)  and\\&.  B<systemd-confext>(8)  tools\\&. The "
+"for the B<systemd-sysext>(8)  and B<systemd-confext>(8)  tools\\&. The "
 "images must contain an extension-release file with metadata that matches "
 "what is defined in the os-release of I<IMAGE>\\&. See: B<os-release>(5)\\&. "
 "Images can be block images, btrfs subvolumes or directories\\&. For more "
@@ -764,6 +764,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 249\\&."
 msgstr ""
 
@@ -785,6 +786,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid "Added in version 252\\&."
 msgstr ""
 
@@ -1044,8 +1046,7 @@ msgid "I<$SYSTEMD_LOG_LEVEL>"
 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 ""
 "The maximum log level of emitted messages (messages with a higher log level, "
 "i\\&.e\\&. less important ones, will be suppressed)\\&. Either one of (in "
@@ -1266,6 +1267,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
+msgid ""
+"Note that setting the regular I<$LESS> environment variable has no effect "
+"for B<less> invocations by systemd tools\\&."
+msgstr ""
+
+#. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-tumbleweed
 msgid "See B<less>(1)  for more discussion\\&."
@@ -1286,6 +1294,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron opensuse-tumbleweed
+msgid ""
+"Note that setting the regular I<$LESSCHARSET> environment variable has no "
+"effect for B<less> invocations by systemd tools\\&."
+msgstr ""
+
+#. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-tumbleweed
 msgid "I<$SYSTEMD_PAGERSECURE>"
@@ -1363,8 +1378,7 @@ msgid "SEE ALSO"
 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 ""
 "B<systemd>(1), B<systemd-sysext>(8), B<org.freedesktop.portable1>(5), "
 "B<systemd-portabled.service>(8)"
@@ -1397,13 +1411,30 @@ msgid "\\%https://systemd.io/PORTABLE_SERVICES"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm opensuse-tumbleweed
+#: debian-bookworm
 #, no-wrap
 msgid "systemd 254"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-tumbleweed
+#: debian-bookworm fedora-40
+msgid ""
+"Portable service images are an efficient way to bundle multiple related "
+"services and other units together, and transfer them as a whole between "
+"systems\\&. When these images are attached the local system the contained "
+"units may run in most ways like regular system-provided units, either with "
+"full privileges or inside strict sandboxing, depending on the selected "
+"configuration\\&. For more details, see \\m[blue]B<Portable Services "
+"Documentation>\\m[]\\&\\s-2\\u[1]\\d\\s+2\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40
+msgid "Specifically portable service images may be of the following kind:"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm
 msgid ""
 "Add an additional image I<PATH> as an overlay on top of I<IMAGE> when "
 "attaching/detaching\\&. This argument can be specified multiple times, in "
@@ -1416,3 +1447,95 @@ msgid ""
 "extensions, see the \"Extension Images\" paragraph on \\m[blue]B<Portable "
 "Services Documentation>\\m[]\\&\\s-2\\u[1]\\d\\s+2\\&."
 msgstr ""
+
+#. type: TH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "systemd 256~rc3"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"In place of the image path a \"\\&.v/\" versioned directory may be "
+"specified, see B<systemd.v>(7)  for details\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"In place of the directory path a \"\\&.v/\" versioned directory may be "
+"specified, see B<systemd.v>(7)  for details\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"When attaching an image, select whether to prefer copying or symlinking of "
+"files installed into the host system\\&. Takes one of \"copy\" (files will "
+"be copied), \"symlink\" (to prefer creation of symbolic links), \"auto\" for "
+"an intermediary mode where security profile drop-ins and images are "
+"symlinked while unit files are copied, or \"mixed\" (since v256) where "
+"security profile drop-ins are symlinked while unit files and images are "
+"copied\\&. Note that this option expresses a preference only, in cases where "
+"symbolic links cannot be created \\(em for example when the image operated "
+"on is a raw disk image, and hence not directly referentiable from the host "
+"file system \\(em copying of files is used unconditionally\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "B<--clean>"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"When detaching ensure the configuration, state, logs, cache, and runtime "
+"data directories of the portable service are removed from the host system\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "Added in version 256\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"The maximum log level of emitted messages (messages with a higher log level, "
+"i\\&.e\\&. less important ones, will be suppressed)\\&. Takes a comma-"
+"separated list of values\\&. A value may be either one of (in order of "
+"decreasing importance)  B<emerg>, B<alert>, B<crit>, B<err>, B<warning>, "
+"B<notice>, B<info>, B<debug>, or an integer in the range 0\\&...7\\&. See "
+"B<syslog>(3)  for more information\\&. Each value may optionally be prefixed "
+"with one of B<console>, B<syslog>, B<kmsg> or B<journal> followed by a colon "
+"to set the maximum log level for that specific log target (e\\&.g\\&.  "
+"B<SYSTEMD_LOG_LEVEL=debug,console:info> specifies to log at debug level "
+"except when logging to the console which should be at info level)\\&. Note "
+"that the global maximum log level takes priority over any per target maximum "
+"log levels\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"B<systemd>(1), B<systemd-sysext>(8), B<org.freedesktop.portable1>(5), "
+"B<systemd-portabled.service>(8), B<importctl>(1)"
+msgstr ""
+
+#. type: Plain text
+#: fedora-40
+msgid ""
+"Add an additional image I<PATH> as an overlay on top of I<IMAGE> when "
+"attaching/detaching\\&. This argument can be specified multiple times, in "
+"which case the order in which images are laid down follows the rules "
+"specified in B<systemd.exec>(5)  for the I<ExtensionImages=> directive and "
+"for the B<systemd-sysext>(8)  and\\&.  B<systemd-confext>(8)  tools\\&. The "
+"images must contain an extension-release file with metadata that matches "
+"what is defined in the os-release of I<IMAGE>\\&. See: B<os-release>(5)\\&. "
+"Images can be block images, btrfs subvolumes or directories\\&. For more "
+"information on portable services with extensions, see the \"Extension "
+"Images\" paragraph on \\m[blue]B<Portable Services "
+"Documentation>\\m[]\\&\\s-2\\u[1]\\d\\s+2\\&."
+msgstr ""