Merging upstream version 4.23.0.

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

1 files changed, 105 insertions, 4 deletions

diff --git a/templates/man8/systemd-cryptsetup.8.pot b/templates/man8/systemd-cryptsetup.8.pot
index fa39f9dd..e776911d 100644
--- a/templates/man8/systemd-cryptsetup.8.pot
+++ b/templates/man8/systemd-cryptsetup.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:10+0100\n"
+"POT-Creation-Date: 2024-06-01 06:26+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"
@@ -23,7 +23,7 @@ msgid "SYSTEMD-CRYPTSETUP"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux fedora-40 mageia-cauldron
 #, no-wrap
 msgid "systemd 255"
 msgstr ""
@@ -84,12 +84,12 @@ msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux mageia-cauldron
 msgid ""
 "systemd-cryptsetup is used to set up (with B<attach>) and tear down (with "
 "B<detach>) access to an encrypted block device\\&. It is primarily used via "
 "systemd-cryptsetup@\\&.service during early boot, but may also be be called "
-"manually\\&. The positional arguments I<VOLUME>, I<SOURCEDEVICE>, I<KEY-"
+"manually\\&. The positional arguments I<VOLUME>, I<SOURCE-DEVICE>, I<KEY-"
 "FILE>, and I<CRYPTTAB-OPTIONS> have the same meaning as the fields in "
 "B<crypttab>(5)\\&."
 msgstr ""
@@ -234,3 +234,104 @@ msgstr ""
 #: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
 msgid "\\%https://systemd.io/TPM2_PCR_MEASUREMENTS"
 msgstr ""
+
+#. type: TH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "systemd 256~rc3"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"systemd-cryptsetup is used to set up (with B<attach>) and tear down (with "
+"B<detach>) access to an encrypted block device\\&. It is primarily used via "
+"systemd-cryptsetup@\\&.service during early boot, but may also be called "
+"manually\\&. The positional arguments I<VOLUME>, I<SOURCE-DEVICE>, I<KEY-"
+"FILE>, and I<CRYPTTAB-OPTIONS> have the same meaning as the fields in "
+"B<crypttab>(5)\\&."
+msgstr ""
+
+#. type: SH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "CREDENTIALS"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"B<systemd-cryptsetup> supports the service credentials logic as implemented "
+"by I<ImportCredential=>/I<LoadCredential=>/I<SetCredential=> (see B<systemd."
+"exec>(5)  for details)\\&. The following credentials are used by \"systemd-"
+"crypsetup@root\\&.service\" (generated by B<systemd-gpt-auto-generator>) "
+"when passed in:"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "I<cryptsetup\\&.passphrase>"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "This credential specifies the passphrase of the LUKS volume\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "Added in version 256\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "I<cryptsetup\\&.tpm2-pin>"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "This credential specifies the TPM pin\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "I<cryptsetup\\&.fido2-pin>"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "This credential specifies the FIDO2 token pin\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "I<cryptsetup\\&.pkcs11-pin>"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "This credential specifies the PKCS11 token pin\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid "I<cryptsetup\\&.luks2-pin>"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"This credential specifies the PIN requested by generic LUKS2 token "
+"modules\\&."
+msgstr ""
+
+#. type: Plain text
+#: fedora-40
+msgid ""
+"systemd-cryptsetup is used to set up (with B<attach>) and tear down (with "
+"B<detach>) access to an encrypted block device\\&. It is primarily used via "
+"systemd-cryptsetup@\\&.service during early boot, but may also be be called "
+"manually\\&. The positional arguments I<VOLUME>, I<SOURCEDEVICE>, I<KEY-"
+"FILE>, and I<CRYPTTAB-OPTIONS> have the same meaning as the fields in "
+"B<crypttab>(5)\\&."
+msgstr ""