Merging upstream version 2.2.43.

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

1 files changed, 1631 insertions, 1594 deletions

diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 590462e..50a4e7d 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2022 Free Software Foundation, Inc.
+# Copyright (C) 2024 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2022.
+# Automatically generated, 2024.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.40\n"
+"Project-Id-Version: GNU gnupg 2.2.43\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-10 11:58+0200\n"
-"PO-Revision-Date: 2022-10-10 11:58+0200\n"
+"POT-Creation-Date: 2024-04-16 10:11+0200\n"
+"PO-Revision-Date: 2024-04-16 10:11+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -53,45 +53,49 @@ msgstr "failed to acquire the pinentry lock: %s\n"
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:544
+#: agent/call-pinentry.c:546
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:545
+#: agent/call-pinentry.c:547
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:546
+#: agent/call-pinentry.c:548
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:549
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:550
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:551
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:552
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Do you really want to make your passphrase visible on the screen?"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:554
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:553
+#: agent/call-pinentry.c:555
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
+#: agent/call-pinentry.c:556
+msgid "Caps Lock is on"
+msgstr "Caps Lock is on"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1007
+#: agent/call-pinentry.c:1009
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -102,24 +106,24 @@ msgstr "Suggest"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1029
+#: agent/call-pinentry.c:1031
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
-#: agent/call-pinentry.c:1057
+#: agent/call-pinentry.c:1059
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "Note: The blanks are not part of the passphrase."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1116
+#: agent/call-pinentry.c:1118
 msgid "Passphrase Not Allowed"
 msgstr "Passphrase Not Allowed"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1183
+#: agent/call-pinentry.c:1185
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -129,11 +133,11 @@ msgstr "Quality:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1204
+#: agent/call-pinentry.c:1206
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1367
+#: agent/call-pinentry.c:1369
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -141,7 +145,7 @@ msgstr ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1370
+#: agent/call-pinentry.c:1372
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -149,17 +153,17 @@ msgstr ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1407 agent/call-pinentry.c:1615
+#: agent/call-pinentry.c:1409 agent/call-pinentry.c:1617
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1407 agent/call-pinentry.c:1615
-#: agent/protect-tool.c:724
+#: agent/call-pinentry.c:1409 agent/call-pinentry.c:1617
+#: agent/protect-tool.c:722
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
-#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
+#: agent/call-pinentry.c:1436 agent/call-pinentry.c:1695 agent/command.c:1666
+#: agent/command.c:1725 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -170,37 +174,37 @@ msgstr "does not match - try again"
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1457 agent/call-pinentry.c:1721
+#: agent/call-pinentry.c:1459 agent/call-pinentry.c:1723
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1468 agent/call-pinentry.c:1732
+#: agent/call-pinentry.c:1470 agent/call-pinentry.c:1734
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1480 agent/call-pinentry.c:1492
-#: agent/call-pinentry.c:1744 agent/call-pinentry.c:1756
+#: agent/call-pinentry.c:1482 agent/call-pinentry.c:1494
+#: agent/call-pinentry.c:1746 agent/call-pinentry.c:1758
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1481 agent/call-pinentry.c:1745
+#: agent/call-pinentry.c:1483 agent/call-pinentry.c:1747
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1489 agent/call-pinentry.c:1753
+#: agent/call-pinentry.c:1491 agent/call-pinentry.c:1755
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1494 agent/call-pinentry.c:1758
+#: agent/call-pinentry.c:1496 agent/call-pinentry.c:1760
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1513 agent/call-pinentry.c:1776
+#: agent/call-pinentry.c:1515 agent/call-pinentry.c:1778
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1513 agent/call-pinentry.c:1776
+#: agent/call-pinentry.c:1515 agent/call-pinentry.c:1778
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
@@ -212,19 +216,19 @@ msgstr "Note: Request from the web browser."
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command.c:1013 agent/command-ssh.c:2391 agent/command-ssh.c:2437
 #: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
 #: g10/card-util.c:718 g10/skclist.c:435
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/command.c:1493 agent/command.c:1658 agent/command-ssh.c:3079
 #: agent/genkey.c:382
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2423
+#: agent/command.c:2415
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -233,7 +237,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:2553
+#: agent/command.c:2545
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -246,25 +250,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1400 g10/keygen.c:4998
-#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
-#: g10/sign.c:1322 g10/tdbio.c:753
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:946
+#: g10/exec.c:554 g10/export.c:1335 g10/gpg.c:1420 g10/keygen.c:5279
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1025
+#: g10/sign.c:1353 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:903
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:239 g10/encrypt.c:678 g10/gpg.c:1401
-#: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
+#: g10/decrypt.c:153 g10/encrypt.c:366 g10/encrypt.c:853 g10/gpg.c:1421
+#: g10/import.c:365 g10/import.c:549 g10/import.c:777 g10/keygen.c:4290
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
-#: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
-#: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
-#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:420
-#: dirmngr/certcache.c:502 dirmngr/certcache.c:504 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1812
+#: g10/plaintext.c:654 g10/sign.c:997 g10/sign.c:1230 g10/sign.c:1337
+#: g10/sign.c:1482 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2194
+#: sm/gpgsm.c:2224 sm/gpgsm.c:2262 sm/qualified.c:66 dirmngr/certcache.c:420
+#: dirmngr/certcache.c:502 dirmngr/certcache.c:504 dirmngr/crlcache.c:2661
+#: dirmngr/dirmngr.c:1851
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
@@ -452,205 +456,205 @@ msgstr "Please enter the passphrase to%0Aprotect your new key"
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:165 scd/scdaemon.c:116 dirmngr/dirmngr.c:187
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:167 scd/scdaemon.c:121 dirmngr/dirmngr.c:176
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:168 scd/scdaemon.c:118 dirmngr/dirmngr.c:175
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:176
+#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:178
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:174 scd/scdaemon.c:124 dirmngr/dirmngr.c:191
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:183 g10/gpg.c:587 scd/scdaemon.c:126 sm/gpgsm.c:415
+#: dirmngr/dirmngr.c:194
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:187 g10/gpg.c:574 scd/scdaemon.c:130 sm/gpgsm.c:262
+#: dirmngr/dirmngr.c:198
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+#: agent/gpg-agent.c:189 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:264 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:200 tools/gpg-connect-agent.c:78 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
-#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:190 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:266 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:201
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:198 g10/gpg.c:591 sm/gpgsm.c:279 dirmngr/dirmngr.c:211
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:202 g10/gpg.c:597 scd/scdaemon.c:147 sm/gpgsm.c:286
+#: dirmngr/dirmngr.c:215
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:205
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:831 scd/scdaemon.c:175 sm/gpgsm.c:369
+#: agent/gpg-agent.c:233 g10/gpg.c:841 scd/scdaemon.c:175 sm/gpgsm.c:373
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:236
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:238
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:240
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:244
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:246
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:248
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted”"
 
-#: agent/gpg-agent.c:257
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|set minimal required length for new passphrases to N"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|require at least N non-alpha characters for a new passphrase"
 
-#: agent/gpg-agent.c:272
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:290
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:294
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:298
+#: agent/gpg-agent.c:294
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1108 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
-#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:458
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
+#: agent/gpg-agent.c:560 agent/preset-passphrase.c:100 agent/protect-tool.c:154
+#: g10/gpg.c:1128 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:608 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:469
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:158
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:569
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:574
+#: agent/gpg-agent.c:571
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -658,130 +662,130 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:619 g10/gpg.c:1304 scd/scdaemon.c:385 sm/gpgsm.c:748
-#: dirmngr/dirmngr.c:542
+#: agent/gpg-agent.c:616 g10/gpg.c:1324 scd/scdaemon.c:385 sm/gpgsm.c:756
+#: dirmngr/dirmngr.c:553
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:988 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1585
-#: sm/gpgsm.c:1591
+#: agent/gpg-agent.c:976 g10/gpg.c:3865 g10/gpg.c:3889 sm/gpgsm.c:1611
+#: sm/gpgsm.c:1617
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
-#: common/argparse.c:1858 g10/gpg.c:2517 scd/scdaemon.c:547 sm/gpgsm.c:1007
-#: dirmngr/dirmngr.c:1081 dirmngr/dirmngr.c:1937
+#: agent/gpg-agent.c:1204 agent/gpg-agent.c:2017 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2548 scd/scdaemon.c:547 sm/gpgsm.c:1015
+#: dirmngr/dirmngr.c:1118 dirmngr/dirmngr.c:1976
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1332 g10/gpg.c:3751 scd/scdaemon.c:671 sm/gpgsm.c:1522
-#: dirmngr/dirmngr.c:1190 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
+#: agent/gpg-agent.c:1320 g10/gpg.c:3809 scd/scdaemon.c:671 sm/gpgsm.c:1548
+#: dirmngr/dirmngr.c:1227 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:709
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1344
+#: agent/gpg-agent.c:2153 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1381
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1357
+#: agent/gpg-agent.c:2170 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1394
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2220
+#: agent/gpg-agent.c:2208
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2226
+#: agent/gpg-agent.c:2214
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "a gpg-agent is already running - not starting a new one\n"
 
-#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1393
+#: agent/gpg-agent.c:2226 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1430
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1396
+#: agent/gpg-agent.c:2231 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1433
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
-#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1442
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1417
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1454
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
+#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:768
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
+#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:771
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2352
+#: agent/gpg-agent.c:2340
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2356
+#: agent/gpg-agent.c:2344
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2143
+#: agent/gpg-agent.c:2502 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2721
+#: agent/gpg-agent.c:2709
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2726
+#: agent/gpg-agent.c:2714
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2801
+#: agent/gpg-agent.c:2789
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2806
+#: agent/gpg-agent.c:2794
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2357
+#: agent/gpg-agent.c:3016 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3104 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:262
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
@@ -807,8 +811,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:80
+#: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:71 sm/gpgsm.c:213
+#: dirmngr/dirmngr.c:173 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -816,8 +820,8 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
+#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:108
 msgid ""
 "@\n"
 "Options:\n"
@@ -827,11 +831,11 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/protect-tool.c:158
+#: agent/protect-tool.c:157
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 
-#: agent/protect-tool.c:160
+#: agent/protect-tool.c:159
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -839,15 +843,15 @@ msgstr ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:703 sm/import.c:774
+#: agent/protect-tool.c:701 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 
-#: agent/protect-tool.c:708 sm/export.c:710
+#: agent/protect-tool.c:706 sm/export.c:710
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 
-#: agent/protect-tool.c:714
+#: agent/protect-tool.c:712
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -855,7 +859,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -863,53 +867,53 @@ msgstr ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:730
+#: agent/protect-tool.c:728
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:732
+#: agent/protect-tool.c:730
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1709
-#: tools/gpgconf.c:470
+#: agent/trustlist.c:174 agent/trustlist.c:395 dirmngr/dirmngr.c:1748
+#: tools/gpgconf.c:502
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:190 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:211 agent/trustlist.c:219
+#: agent/trustlist.c:213 agent/trustlist.c:221
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s” ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:225
+#: agent/trustlist.c:227
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:269
+#: agent/trustlist.c:271
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:294 agent/trustlist.c:301
+#: agent/trustlist.c:296 agent/trustlist.c:303
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:335 common/helpfile.c:136
+#: agent/trustlist.c:341 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:460 agent/trustlist.c:529
+#: agent/trustlist.c:466 agent/trustlist.c:538
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -922,7 +926,7 @@ msgstr "error reading list of trusted root certificates\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:691
+#: agent/trustlist.c:700
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -931,11 +935,11 @@ msgstr ""
 "Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user "
 "certificates?"
 
-#: agent/trustlist.c:700 common/audit.c:467
+#: agent/trustlist.c:709 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
+#: agent/trustlist.c:709 agent/findkey.c:1663 agent/findkey.c:1677
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -948,7 +952,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:734
+#: agent/trustlist.c:743
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -960,20 +964,20 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:748
+#: agent/trustlist.c:757
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:748
+#: agent/trustlist.c:757
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:411
+#: agent/findkey.c:349
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:427
+#: agent/findkey.c:365
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -982,15 +986,15 @@ msgstr ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:441 agent/findkey.c:448
+#: agent/findkey.c:379 agent/findkey.c:386
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:449
+#: agent/findkey.c:387
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1656
+#: agent/findkey.c:1639
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -999,11 +1003,11 @@ msgstr ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1680 agent/findkey.c:1694
+#: agent/findkey.c:1663 agent/findkey.c:1677
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1691
+#: agent/findkey.c:1674
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1011,12 +1015,13 @@ msgstr ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 
-#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:91
 #, c-format
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 
-#: agent/pksign.c:187 sm/certcheck.c:100
+#: agent/pksign.c:187 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:455 dirmngr/validate.c:1139
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s key uses an unsafe (%u bit) hash\n"
@@ -1036,7 +1041,7 @@ msgstr "checking created signature failed: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1555
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1065,7 +1070,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "error creating a stream for a pipe: %s\n"
 
 #: common/exechelp-posix.c:504 common/exechelp-posix.c:579
-#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1435
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1472
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -1116,22 +1121,22 @@ msgstr "problem setting the gpg-agent options\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: common/sysutils.c:408
+#: common/sysutils.c:413
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Warning: unsafe ownership on %s “%s”\n"
 
-#: common/sysutils.c:440
+#: common/sysutils.c:445
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s”\n"
 
-#: common/sysutils.c:885
+#: common/sysutils.c:895
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:911
+#: common/sysutils.c:921
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1191,7 +1196,7 @@ msgstr "out of core in secure memory while allocating %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:910 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
@@ -1206,7 +1211,7 @@ msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “%s%s” is an obsolete option - it has no effect\n"
 
-#: common/miscellaneous.c:753
+#: common/miscellaneous.c:754
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag ‘%s’ ignored\n"
@@ -1304,7 +1309,7 @@ msgid "algorithm: %s"
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3557
+#: scd/app-openpgp.c:4081
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1379,11 +1384,11 @@ msgstr "Certificate chain valid"
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1235
+#: common/audit.c:1112 sm/certchain.c:1255
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1245
+#: common/audit.c:1115 sm/certchain.c:1265
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
@@ -1420,11 +1425,11 @@ msgstr "No help available for '%s'."
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:958
+#: common/gettime.c:1080
 msgid "[none]"
 msgstr "[none]"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
@@ -1506,7 +1511,7 @@ msgstr "invalid option"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "missing argument for option “%.50s”\n"
 
-#: common/argparse.c:558 g10/gpg.c:3525
+#: common/argparse.c:558 g10/gpg.c:3580
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s”\n"
@@ -1576,133 +1581,134 @@ msgstr "failed to create temporary file '%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1207
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1210
+#: common/dotlock.c:1231
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "waiting for lock (held by %d%s) %s...\n"
 
-#: common/dotlock.c:1211
+#: common/dotlock.c:1232
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1250
+#: common/dotlock.c:1270
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘%s’ not made: %s\n"
 
-#: common/dotlock.c:1277
+#: common/dotlock.c:1283
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:987 dirmngr/dirmngr.c:996
+#: common/init.c:194 sm/gpgsm.c:901 dirmngr/dirmngr.c:1024
+#: dirmngr/dirmngr.c:1033
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: g10/armor.c:423
+#: g10/armor.c:424
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:462
+#: g10/armor.c:463
 #, c-format
 msgid "invalid armor header: "
 msgstr "invalid armor header: "
 
-#: g10/armor.c:473
+#: g10/armor.c:474
 #, c-format
 msgid "armor header: "
 msgstr "armor header: "
 
-#: g10/armor.c:486
+#: g10/armor.c:487
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "invalid clearsig header\n"
 
-#: g10/armor.c:499
+#: g10/armor.c:500
 #, c-format
 msgid "unknown armor header: "
 msgstr "unknown armor header: "
 
-#: g10/armor.c:552
+#: g10/armor.c:553
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "nested clear text signatures\n"
 
-#: g10/armor.c:687
+#: g10/armor.c:688
 #, c-format
 msgid "unexpected armor: "
 msgstr "unexpected armor: "
 
-#: g10/armor.c:700
+#: g10/armor.c:701
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "invalid dash escaped line: "
 
-#: g10/armor.c:872 g10/armor.c:1492
+#: g10/armor.c:873 g10/armor.c:1493
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "invalid radix64 character %02X skipped\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:916
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "premature eof (no CRC)\n"
 
-#: g10/armor.c:949
+#: g10/armor.c:950
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "premature eof (in CRC)\n"
 
-#: g10/armor.c:957
+#: g10/armor.c:958
 #, c-format
 msgid "malformed CRC\n"
 msgstr "malformed CRC\n"
 
-#: g10/armor.c:961 g10/armor.c:1529
+#: g10/armor.c:962 g10/armor.c:1530
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC error; %06lX - %06lX\n"
 
-#: g10/armor.c:981
+#: g10/armor.c:982
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "premature eof (in trailer)\n"
 
-#: g10/armor.c:985
+#: g10/armor.c:986
 #, c-format
 msgid "error in trailer line\n"
 msgstr "error in trailer line\n"
 
-#: g10/armor.c:1305
+#: g10/armor.c:1306
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "no valid OpenPGP data found.\n"
 
-#: g10/armor.c:1310
+#: g10/armor.c:1311
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "invalid armor: line longer than %d characters\n"
 
-#: g10/armor.c:1314
+#: g10/armor.c:1315
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 
-#: g10/build-packet.c:1219
+#: g10/build-packet.c:1258
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ not human readable (%zu bytes: %s%s) ]"
 
-#: g10/build-packet.c:1271
+#: g10/build-packet.c:1310
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1711,32 +1717,32 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/build-packet.c:1283 g10/build-packet.c:1379
+#: g10/build-packet.c:1322 g10/build-packet.c:1418
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘@’ character\n"
 
-#: g10/build-packet.c:1289 g10/build-packet.c:1385
+#: g10/build-packet.c:1328 g10/build-packet.c:1424
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "a notation name must not contain more than one ‘@’ character\n"
 
-#: g10/build-packet.c:1307
+#: g10/build-packet.c:1346
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/build-packet.c:1363
+#: g10/build-packet.c:1402
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "a notation name may not contain an ‘=’ character\n"
 
-#: g10/build-packet.c:1369
+#: g10/build-packet.c:1408
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "a notation name must have only printable characters or spaces\n"
 
-#: g10/build-packet.c:1428 g10/build-packet.c:1439
+#: g10/build-packet.c:1467 g10/build-packet.c:1478
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNING: invalid notation data found\n"
@@ -1746,42 +1752,42 @@ msgstr "WARNING: invalid notation data found\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "failed to proxy %s inquiry to client\n"
 
-#: g10/call-agent.c:170
+#: g10/call-agent.c:171
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/call-agent.c:199 g10/call-dirmngr.c:153 sm/call-agent.c:98
+#: g10/call-agent.c:201 g10/call-dirmngr.c:153 sm/call-agent.c:98
 #: sm/call-dirmngr.c:165
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "error getting version from '%s': %s\n"
 
-#: g10/call-agent.c:205 g10/call-dirmngr.c:159 sm/call-agent.c:104
+#: g10/call-agent.c:207 g10/call-dirmngr.c:159 sm/call-agent.c:104
 #: sm/call-dirmngr.c:171
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server ‘%s’ is older than us (%s < %s)"
 
-#: g10/call-agent.c:211 g10/call-dirmngr.c:165 g10/call-dirmngr.c:464
+#: g10/call-agent.c:213 g10/call-dirmngr.c:165 g10/call-dirmngr.c:464
 #: sm/call-agent.c:110 sm/call-dirmngr.c:177
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNING: %s\n"
 
-#: g10/call-agent.c:214 g10/call-dirmngr.c:168 sm/call-agent.c:113
+#: g10/call-agent.c:216 g10/call-dirmngr.c:168 sm/call-agent.c:113
 #: sm/call-dirmngr.c:180
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr "Note: Outdated servers may lack important security fixes.\n"
 
-#: g10/call-agent.c:216 g10/call-dirmngr.c:170 sm/call-agent.c:115
+#: g10/call-agent.c:218 g10/call-dirmngr.c:170 sm/call-agent.c:115
 #: sm/call-dirmngr.c:182
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Note: Use the command “%s” to restart them.\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:213 g10/encrypt.c:531 g10/sign.c:412
-#: sm/call-agent.c:205 sm/encrypt.c:426 sm/sign.c:345
+#: g10/call-agent.c:320 g10/encrypt.c:340 g10/encrypt.c:704 g10/sign.c:414
+#: sm/call-agent.c:205 sm/encrypt.c:717 sm/sign.c:561
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
@@ -1824,23 +1830,23 @@ msgstr "unacceptable HTTP redirect from server was cleaned up"
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:462 g10/gpg.c:4458
+#: g10/call-dirmngr.c:462 g10/gpg.c:4514
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1933
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP card not available: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1924
+#: g10/card-util.c:91 g10/card-util.c:1939
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP card no. %s detected\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
-#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2268 g10/delkey.c:160 g10/keyedit.c:1426
+#: g10/keygen.c:4723 g10/revoke.c:214 g10/revoke.c:635
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
@@ -1850,15 +1856,15 @@ msgstr "can't do this in batch mode\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:2866
+#: g10/card-util.c:107 scd/app-openpgp.c:3243
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code not or not anymore available\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
-#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
-#: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
+#: g10/card-util.c:140 g10/card-util.c:1441 g10/card-util.c:1703
+#: g10/card-util.c:1797 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1943 g10/keygen.c:2121 g10/keygen.c:2327 g10/keygen.c:2618
+#: sm/certreqgen-ui.c:167 sm/certreqgen-ui.c:293 sm/certreqgen-ui.c:327
 msgid "Your selection? "
 msgstr "Your selection? "
 
@@ -1907,79 +1913,79 @@ msgstr "Cardholder's given name: "
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: Combined name too long (limit is %d characters).\n"
 
-#: g10/card-util.c:826
+#: g10/card-util.c:825
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:920 g10/decrypt-data.c:509 g10/import.c:399 g10/import.c:746
-#: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1748
-#: tools/gpgconf.c:483 tools/gpgconf.c:529
+#: g10/card-util.c:919 g10/decrypt-data.c:510 g10/import.c:400 g10/import.c:747
+#: g10/import.c:799 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1787
+#: tools/gpgconf.c:515 tools/gpgconf.c:561
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:953 g10/decrypt-data.c:512 g10/export.c:2467
+#: g10/card-util.c:952 g10/decrypt-data.c:513 g10/export.c:2595
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:980
+#: g10/card-util.c:979
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1018
+#: g10/card-util.c:1017
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1103
+#: g10/card-util.c:1102
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1110
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1119
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1142
+#: g10/card-util.c:1141
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1156
+#: g10/card-util.c:1155
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1177
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1201
+#: g10/card-util.c:1200
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1252
+#: g10/card-util.c:1251
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1253
+#: g10/card-util.c:1252
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
+#: g10/card-util.c:1265 g10/keygen.c:4743 g10/keygen.c:5846
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1351
+#: g10/card-util.c:1350
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1368
+#: g10/card-util.c:1367
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1989,97 +1995,97 @@ msgstr ""
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 
-#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1389 g10/keygen.c:2504 sm/certreqgen-ui.c:181
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
-#: sm/certreqgen-ui.c:194
+#: g10/card-util.c:1399 g10/keygen.c:2427 g10/keygen.c:2459
+#: sm/certreqgen-ui.c:196
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1407 g10/keygen.c:2512 sm/certreqgen-ui.c:186
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1426
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1429
+#: g10/card-util.c:1428
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1430
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1432
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1434 g10/keygen.c:2067 sm/certreqgen-ui.c:159
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1435 sm/certreqgen-ui.c:160
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1436
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
-#: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
-#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
+#: g10/card-util.c:1448 g10/card-util.c:1715 g10/card-util.c:1817
+#: g10/keyedit.c:901 g10/keygen.c:1975 g10/keygen.c:2003 g10/keygen.c:2128
+#: g10/keygen.c:2363 g10/keygen.c:2646 g10/revoke.c:837
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1522
+#: g10/card-util.c:1521
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "The card will now be re-configured to generate a key of %u bits\n"
 
-#: g10/card-util.c:1527
+#: g10/card-util.c:1526
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "The card will now be re-configured to generate a key of type: %s\n"
 
-#: g10/card-util.c:1563
+#: g10/card-util.c:1562
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error changing key attribute for key %d: %s\n"
 
-#: g10/card-util.c:1579 g10/card-util.c:2106
+#: g10/card-util.c:1578 g10/card-util.c:2121
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
+#: g10/card-util.c:1584 g10/card-util.c:1945 g10/card-util.c:2127
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "This command is not supported by this card\n"
 
-#: g10/card-util.c:1631
+#: g10/card-util.c:1630
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1645
+#: g10/card-util.c:1644
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Note: keys are already stored on the card!\n"
 
-#: g10/card-util.c:1648
+#: g10/card-util.c:1647
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1660
+#: g10/card-util.c:1659
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2090,166 +2096,166 @@ msgstr ""
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1695
+#: g10/card-util.c:1694
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1697 g10/card-util.c:1787
+#: g10/card-util.c:1696 g10/card-util.c:1788
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1698 g10/card-util.c:1789
+#: g10/card-util.c:1697 g10/card-util.c:1790
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1699 g10/card-util.c:1791
+#: g10/card-util.c:1698 g10/card-util.c:1792
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1784
+#: g10/card-util.c:1785
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1830
+#: g10/card-util.c:1840
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1935
+#: g10/card-util.c:1950
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Note: This command destroys all keys stored on the card!\n"
 
-#: g10/card-util.c:1938
+#: g10/card-util.c:1953
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1943
+#: g10/card-util.c:1958
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes”) "
 
-#: g10/card-util.c:2129
+#: g10/card-util.c:2144
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2158 g10/keyedit.c:1260
+#: g10/card-util.c:2173 g10/keyedit.c:1261
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2175
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2161 g10/keyedit.c:1263
+#: g10/card-util.c:2176 g10/keyedit.c:1264
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2178
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2181
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2182
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2183
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2184
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2185
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2186
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2173
+#: g10/card-util.c:2188
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2174
+#: g10/card-util.c:2189
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2175
+#: g10/card-util.c:2190
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2176
+#: g10/card-util.c:2191
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2177
+#: g10/card-util.c:2192
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2178
+#: g10/card-util.c:2193
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2179
+#: g10/card-util.c:2194
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2180
+#: g10/card-util.c:2195
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: g10/card-util.c:2181
+#: g10/card-util.c:2196
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2305
+#: g10/card-util.c:2320
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2346
+#: g10/card-util.c:2361
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2377
+#: g10/card-util.c:2392
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2379
+#: g10/card-util.c:2394
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2482 g10/keyedit.c:2229
+#: g10/card-util.c:2497 g10/keyedit.c:2263
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1023
+#: g10/decrypt.c:191 g10/encrypt.c:1227
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5251 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/delkey.c:83 g10/export.c:2044 g10/export.c:2358 g10/export.c:2479
+#: g10/getkey.c:2118 g10/gpg.c:5196 g10/keyedit.c:1448 g10/keyedit.c:2371
+#: g10/keyedit.c:2712 g10/keyedit.c:4535 g10/keylist.c:860 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s” not found: %s\n"
 
-#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
-#: g10/revoke.c:663 g10/tofu.c:2173
+#: g10/delkey.c:92 g10/export.c:2112 g10/getkey.c:2126 g10/getkey.c:4558
+#: g10/gpg.c:5205 g10/keyedit.c:2343 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/revoke.c:662 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error reading keyblock: %s\n"
@@ -2306,9 +2312,9 @@ msgstr "key"
 msgid "subkey"
 msgstr "subkey"
 
-#: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
-#: g10/keyedit.c:3113 g10/keyedit.c:3264
+#: g10/delkey.c:299 g10/keyedit.c:2214 g10/keyedit.c:2245 g10/keyedit.c:2424
+#: g10/keyedit.c:2555 g10/keyedit.c:2625 g10/keyedit.c:2669 g10/keyedit.c:2891
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3342
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2333,61 +2339,61 @@ msgstr "there is a secret key for public key “%s”!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use option “--delete-secret-keys” to delete it first.\n"
 
-#: g10/encrypt.c:116
+#: g10/encrypt.c:117
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:261 g10/sign.c:1470
+#: g10/encrypt.c:398 g10/sign.c:1501
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:268
+#: g10/encrypt.c:405
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "can't use a SKESK packet due to the S2K mode\n"
 
-#: g10/encrypt.c:282
+#: g10/encrypt.c:435
 #, c-format
-msgid "using cipher %s\n"
-msgstr "using cipher %s\n"
+msgid "using cipher %s.%s\n"
+msgstr "using cipher %s.%s\n"
 
-#: g10/encrypt.c:292 g10/encrypt.c:719
+#: g10/encrypt.c:448 g10/encrypt.c:907 g10/sign.c:1165
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:349 g10/encrypt.c:755 g10/sign.c:760
+#: g10/encrypt.c:507 g10/encrypt.c:943 g10/sign.c:761
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:446 g10/encrypt.c:521 g10/decrypt-data.c:266 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
+#: g10/encrypt.c:609 g10/encrypt.c:694 g10/decrypt-data.c:267 g10/gpg.c:4014
+#: g10/gpg.c:4054 sm/decrypt.c:1188 sm/encrypt.c:707 sm/gpgsm.c:1635
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:455 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:618 g10/gpg.c:4020 g10/gpg.c:4066 g10/sig-check.c:168
+#: g10/sign.c:392 sm/gpgsm.c:1645 sm/gpgsm.c:1655 sm/sign.c:728 sm/verify.c:522
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:553 sm/encrypt.c:491
+#: g10/encrypt.c:726 sm/encrypt.c:782
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:684
+#: g10/encrypt.c:859
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encrypt.c:802 g10/sign.c:1162
+#: g10/encrypt.c:993 g10/sign.c:1186
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2396,34 +2402,34 @@ msgstr ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:970
+#: g10/encrypt.c:1172
 #, c-format
-msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s encrypted for: “%s”\n"
+msgid "%s/%s.%s encrypted for: \"%s\"\n"
+msgstr "%s/%s.%s encrypted for: “%s”\n"
 
-#: g10/encrypt.c:998 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:1202 g10/pkclist.c:1044 g10/pkclist.c:1095
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:246 g10/mainproc.c:410
+#: g10/decrypt-data.c:247 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/decrypt-data.c:249 g10/mainproc.c:416
+#: g10/decrypt-data.c:250 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:372 g10/decrypt-data.c:425 sm/decrypt.c:550
+#: g10/decrypt-data.c:373 g10/decrypt-data.c:426 sm/decrypt.c:907
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 
-#: g10/decrypt-data.c:384 g10/decrypt-data.c:437
+#: g10/decrypt-data.c:385 g10/decrypt-data.c:438
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
@@ -2486,61 +2492,65 @@ msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 
-#: g10/export.c:119
+#: g10/export.c:124
 msgid "export signatures that are marked as local-only"
 msgstr "export signatures that are marked as local-only"
 
-#: g10/export.c:121
+#: g10/export.c:126
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "export attribute user IDs (generally photo IDs)"
 
-#: g10/export.c:123
+#: g10/export.c:128
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "export revocation keys marked as “sensitive”"
 
-#: g10/export.c:125
+#: g10/export.c:130
 msgid "remove unusable parts from key during export"
 msgstr "remove unusable parts from key during export"
 
-#: g10/export.c:127
+#: g10/export.c:132
 msgid "remove as much as possible from key during export"
 msgstr "remove as much as possible from key during export"
 
-#: g10/export.c:133
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "export only revocation certificates"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "use the GnuPG key backup format"
 
-#: g10/export.c:1291
+#: g10/export.c:1306
 msgid " - skipped"
 msgstr " - skipped"
 
-#: g10/export.c:1324 g10/import.c:2085 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1012 g10/sign.c:1326
+#: g10/export.c:1339 g10/import.c:2089 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:1029 g10/sign.c:1357
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "writing to ‘%s’\n"
 
-#: g10/export.c:1769
+#: g10/export.c:1784
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "key %s: key material on-card - skipped\n"
 
-#: g10/export.c:1964
+#: g10/export.c:2061
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "exporting secret keys not allowed\n"
 
-#: g10/export.c:2041
+#: g10/export.c:2138
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "key %s: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:2135
+#: g10/export.c:2263
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2432 g10/plaintext.c:153 g10/plaintext.c:162
+#: g10/export.c:2560 g10/plaintext.c:153 g10/plaintext.c:162
 #: g10/plaintext.c:168 g10/plaintext.c:191
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2550,322 +2560,322 @@ msgstr "error creating '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User ID not found]"
 
-#: g10/getkey.c:1441
+#: g10/getkey.c:1443
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘%s’ via %s\n"
 
-#: g10/getkey.c:1447
+#: g10/getkey.c:1449
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘%s’ via %s: %s\n"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1451
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1670
+#: g10/getkey.c:1672
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "checking for a fresh copy of an expired key via %s\n"
 
-#: g10/getkey.c:2085 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:2095 g10/revoke.c:654 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s” not found: %s\n"
 
-#: g10/getkey.c:2088 g10/pkclist.c:988
+#: g10/getkey.c:2098 g10/pkclist.c:1004
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:2164
+#: g10/getkey.c:2176
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Warning: not using ‘%s’ as default key: %s\n"
 
-#: g10/getkey.c:2172
+#: g10/getkey.c:2184
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "using “%s” as default secret key for signing\n"
 
-#: g10/getkey.c:2179
+#: g10/getkey.c:2191
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘%s’ ignored\n"
 
-#: g10/getkey.c:3024
+#: g10/getkey.c:3055
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3874
+#: g10/getkey.c:3915
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2137
+#: g10/getkey.c:4487 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:443 sm/gpgsm.c:212
+#: g10/gpg.c:450 sm/gpgsm.c:215
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:451
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:446 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:217
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:447 sm/gpgsm.c:215
+#: g10/gpg.c:454 sm/gpgsm.c:218
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:456
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:451 sm/gpgsm.c:217
+#: g10/gpg.c:458 sm/gpgsm.c:220
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:218
+#: g10/gpg.c:460 sm/gpgsm.c:221
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:455 sm/gpgsm.c:219
+#: g10/gpg.c:462 sm/gpgsm.c:222
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:464
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:460
+#: g10/gpg.c:467
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:462 sm/gpgsm.c:224
+#: g10/gpg.c:469 sm/gpgsm.c:227
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:463 sm/gpgsm.c:222
+#: g10/gpg.c:470 sm/gpgsm.c:225
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:465 sm/gpgsm.c:225
+#: g10/gpg.c:472 sm/gpgsm.c:228
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:468
+#: g10/gpg.c:475
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:471
+#: g10/gpg.c:478
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:483
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:479
+#: g10/gpg.c:486
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:490
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:485
+#: g10/gpg.c:493
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:488 sm/gpgsm.c:228
+#: g10/gpg.c:496 sm/gpgsm.c:231
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:498
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:492
+#: g10/gpg.c:500
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:502
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:504
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:505
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:506
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:499
+#: g10/gpg.c:507
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:501 sm/gpgsm.c:246
+#: g10/gpg.c:509 sm/gpgsm.c:249
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:513
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:514
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:515
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:518
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:520
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:528
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:531
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:532
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:534
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:546
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:548
+#: g10/gpg.c:556
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:552 sm/gpgsm.c:241
+#: g10/gpg.c:560 sm/gpgsm.c:244
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:554
+#: g10/gpg.c:562
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:594
+#: g10/gpg.c:602
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:596 sm/gpgsm.c:332
+#: g10/gpg.c:604 sm/gpgsm.c:336
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|encrypt to user ID NAME as well"
 
-#: g10/gpg.c:604
+#: g10/gpg.c:612
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
-#: g10/gpg.c:616
+#: g10/gpg.c:624
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+#: g10/gpg.c:649 kbx/kbxutil.c:90 sm/gpgsm.c:417 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:642
+#: g10/gpg.c:650
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:689 sm/gpgsm.c:304
+#: g10/gpg.c:699 sm/gpgsm.c:307
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:707 sm/gpgsm.c:314
+#: g10/gpg.c:717 sm/gpgsm.c:318
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:709 sm/gpgsm.c:316
+#: g10/gpg.c:719 sm/gpgsm.c:320
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+#: g10/gpg.c:723 g10/gpgv.c:82 sm/gpgsm.c:325
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:726
+#: g10/gpg.c:736
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:743
+#: g10/gpg.c:753
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:750 sm/gpgsm.c:347
+#: g10/gpg.c:760 sm/gpgsm.c:351
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:753
+#: g10/gpg.c:763
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:766
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:761
+#: g10/gpg.c:771
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:764 sm/gpgsm.c:350
+#: g10/gpg.c:774 sm/gpgsm.c:354
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:776 sm/gpgsm.c:357
+#: g10/gpg.c:786 sm/gpgsm.c:361
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
-#: g10/gpg.c:805 sm/gpgsm.c:324
+#: g10/gpg.c:815 sm/gpgsm.c:328
 msgid "Options to specify keys"
 msgstr "Options to specify keys"
 
-#: g10/gpg.c:807 sm/gpgsm.c:326
+#: g10/gpg.c:817 sm/gpgsm.c:330
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:815 sm/gpgsm.c:328
+#: g10/gpg.c:825 sm/gpgsm.c:332
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:866 sm/gpgsm.c:396
+#: g10/gpg.c:876 sm/gpgsm.c:401
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:885 sm/gpgsm.c:408 dirmngr/dirmngr.c:294
+#: g10/gpg.c:895 sm/gpgsm.c:413 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:953 sm/gpgsm.c:440
+#: g10/gpg.c:965 sm/gpgsm.c:446
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2873,7 +2883,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:956
+#: g10/gpg.c:968
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2893,11 +2903,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1130
+#: g10/gpg.c:1150
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1133
+#: g10/gpg.c:1153
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2907,7 +2917,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1144 sm/gpgsm.c:624
+#: g10/gpg.c:1164 sm/gpgsm.c:632
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2915,73 +2925,73 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1147
+#: g10/gpg.c:1167
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1154 g10/keyedit.c:3338
+#: g10/gpg.c:1174 g10/keylist.c:317
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1161
+#: g10/gpg.c:1181
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1168 g10/keyedit.c:3404
+#: g10/gpg.c:1188 g10/keylist.c:380
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1241 sm/gpgsm.c:698
+#: g10/gpg.c:1261 sm/gpgsm.c:706
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1436 sm/gpgsm.c:791
+#: g10/gpg.c:1456 sm/gpgsm.c:799
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1454
+#: g10/gpg.c:1474
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1652
+#: g10/gpg.c:1672
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1675
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1658
+#: g10/gpg.c:1678
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1664
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1679
+#: g10/gpg.c:1699
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2989,19 +2999,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1691
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -3009,451 +3019,455 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1694
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1910
+#: g10/gpg.c:1930
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2009
+#: g10/gpg.c:2031
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2011
+#: g10/gpg.c:2033
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2013
+#: g10/gpg.c:2035
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2015
+#: g10/gpg.c:2037
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2017
+#: g10/gpg.c:2039
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2021
+#: g10/gpg.c:2043
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2023
+#: g10/gpg.c:2045
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2025
+#: g10/gpg.c:2047
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2027
+#: g10/gpg.c:2049
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2029
+#: g10/gpg.c:2051
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2031
+#: g10/gpg.c:2053
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2033
+#: g10/gpg.c:2055
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2148
+#: g10/gpg.c:2057 g10/gpg.c:2059
+msgid "show preferences"
+msgstr "show preferences"
+
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2150
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help” to list choices)\n"
 
-#: g10/gpg.c:2240 g10/keyedit.c:1719
+#: g10/gpg.c:2271 g10/keyedit.c:1730
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:2878 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2919 g10/gpg.c:3776 g10/gpg.c:3788
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3053 g10/gpg.c:3065
+#: g10/gpg.c:3096 g10/gpg.c:3108
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3130
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” is not a proper mail address\n"
 
-#: g10/gpg.c:3119 sm/gpgsm.c:1121
+#: g10/gpg.c:3168 sm/gpgsm.c:1129
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3125 sm/gpgsm.c:1127
+#: g10/gpg.c:3174 sm/gpgsm.c:1135
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3228
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3201 g10/gpg.c:3415 g10/keyedit.c:5338
+#: g10/gpg.c:3250 g10/gpg.c:3470 g10/keyedit.c:5275
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3268
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3271
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3229
+#: g10/gpg.c:3278
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3281
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3238 g10/gpg.c:3253
+#: g10/gpg.c:3287 g10/gpg.c:3302
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3293
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3247
+#: g10/gpg.c:3296
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3259
+#: g10/gpg.c:3308
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3270
+#: g10/gpg.c:3319
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3321
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3325
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3329
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3331
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3284
+#: g10/gpg.c:3333
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3286
+#: g10/gpg.c:3335
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3288
+#: g10/gpg.c:3337
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3290
+#: g10/gpg.c:3339
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3358
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3513
+#: g10/gpg.c:3568
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3571
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1492
+#: g10/gpg.c:3758 sm/gpgsm.c:1509
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3769 sm/gpgsm.c:1515
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3778
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3781
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1205
+#: g10/gpg.c:3796 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1242
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3817
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1579
+#: g10/gpg.c:3859 g10/gpg.c:3883 sm/gpgsm.c:1605
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3871
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3877
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3892
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3894
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3896
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3898
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3845
+#: g10/gpg.c:3900
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3904
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3908
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3915
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3919
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3923
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3927
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3963
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:4026
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4170
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4182
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4255
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4284
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt in %s mode\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4345
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4348
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4756 g10/keyserver.c:1650
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4761
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4767
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4780
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4792
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4805
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4874
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4885
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:5009
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5161 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5174
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5230
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5241
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5586
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5588
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5621
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3466,7 +3480,7 @@ msgstr "|FILE|take the keys from the keyring FILE"
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
+#: g10/gpgv.c:86 sm/gpgsm.c:407 tools/gpgconf.c:117
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -3495,145 +3509,145 @@ msgstr "No help available"
 msgid "No help available for '%s'"
 msgstr "No help available for ‘%s’"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "import signatures that are marked as local-only"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "repair damage from the pks keyserver during import"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "do not clear the ownertrust values during import"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "do not update the trustdb after import"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "show key during import"
 msgstr "show key during import"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "only accept updates to existing keys"
 msgstr "only accept updates to existing keys"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "remove unusable parts from key after import"
 msgstr "remove unusable parts from key after import"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "remove as much as possible from key after import"
 msgstr "remove as much as possible from key after import"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "ignore key-signatures which are not self-signatures"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "run import filters and export key immediately"
 msgstr "run import filters and export key immediately"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "assume the GnuPG key backup format"
 msgstr "assume the GnuPG key backup format"
 
-#: g10/import.c:203
+#: g10/import.c:204
 msgid "repair keys on import"
 msgstr "repair keys on import"
 
-#: g10/import.c:392 g10/import.c:711
+#: g10/import.c:393 g10/import.c:712
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:728
+#: g10/import.c:729
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:814
+#: g10/import.c:815
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:817
+#: g10/import.c:818
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    skipped PGP-2 keys: %lu\n"
 
-#: g10/import.c:819
+#: g10/import.c:820
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      skipped new keys: %lu\n"
 
-#: g10/import.c:822
+#: g10/import.c:823
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          w/o user IDs: %lu\n"
 
-#: g10/import.c:825 sm/import.c:130
+#: g10/import.c:826 sm/import.c:130
 #, c-format
 msgid "              imported: %lu"
 msgstr "              imported: %lu"
 
-#: g10/import.c:829 sm/import.c:134
+#: g10/import.c:830 sm/import.c:134
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             unchanged: %lu\n"
 
-#: g10/import.c:831
+#: g10/import.c:832
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          new user IDs: %lu\n"
 
-#: g10/import.c:833
+#: g10/import.c:834
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           new subkeys: %lu\n"
 
-#: g10/import.c:835
+#: g10/import.c:836
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        new signatures: %lu\n"
 
-#: g10/import.c:837
+#: g10/import.c:838
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   new key revocations: %lu\n"
 
-#: g10/import.c:839 sm/import.c:136
+#: g10/import.c:840 sm/import.c:136
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      secret keys read: %lu\n"
 
-#: g10/import.c:841 sm/import.c:138
+#: g10/import.c:842 sm/import.c:138
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  secret keys imported: %lu\n"
 
-#: g10/import.c:843 sm/import.c:140
+#: g10/import.c:844 sm/import.c:140
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:845 sm/import.c:142
+#: g10/import.c:846 sm/import.c:142
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          not imported: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    signatures cleaned: %lu\n"
 
-#: g10/import.c:849
+#: g10/import.c:850
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      user IDs cleaned: %lu\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1277
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3642,171 +3656,176 @@ msgstr ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1319
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”: preference for cipher algorithm %s\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1334
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”: preference for digest algorithm %s\n"
 
-#: g10/import.c:1345
+#: g10/import.c:1346
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”: preference for compression algorithm %s\n"
 
-#: g10/import.c:1358
+#: g10/import.c:1359
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:1360
+#: g10/import.c:1361
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-distribute this key to avoid potential algorithm mismatch problems\n"
 
-#: g10/import.c:1385
+#: g10/import.c:1386
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1899 g10/import.c:3013
+#: g10/import.c:1902 g10/import.c:3038
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1905
+#: g10/import.c:1908
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1906 g10/import.c:2985
+#: g10/import.c:1909 g10/import.c:3010
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1950
+#: g10/import.c:1953
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "key %s: PKS subkey corruption repaired\n"
 
-#: g10/import.c:1971
+#: g10/import.c:1974
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "key %s: accepted non self-signed user ID “%s”\n"
 
-#: g10/import.c:1981 g10/import.c:2012
+#: g10/import.c:1985 g10/import.c:2016
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "key %s: no valid user IDs\n"
 
-#: g10/import.c:1983
+#: g10/import.c:1987
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:2062 g10/import.c:3399
+#: g10/import.c:2066 g10/import.c:3425
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
 
-#: g10/import.c:2068
+#: g10/import.c:2072
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2080
+#: g10/import.c:2084
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2112 g10/import.c:2214 g10/import.c:3476
+#: g10/import.c:2116 g10/import.c:2218 g10/import.c:3502
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2135
+#: g10/import.c:2139
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "key %s: public key “%s” imported\n"
 
-#: g10/import.c:2162
+#: g10/import.c:2166
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "key %s: doesn't match our copy\n"
 
-#: g10/import.c:2230
+#: g10/import.c:2234
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "key %s: “%s” 1 new user ID\n"
 
-#: g10/import.c:2233
+#: g10/import.c:2237
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "key %s: “%s” %d new user IDs\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "key %s: “%s” 1 new signature\n"
 
-#: g10/import.c:2239
+#: g10/import.c:2243
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "key %s: “%s” %d new signatures\n"
 
-#: g10/import.c:2242
+#: g10/import.c:2246
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "key %s: “%s” 1 new subkey\n"
 
-#: g10/import.c:2245
+#: g10/import.c:2249
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "key %s: “%s” %d new subkeys\n"
 
-#: g10/import.c:2248
+#: g10/import.c:2252
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "key %s: “%s” %d signature cleaned\n"
 
-#: g10/import.c:2251
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "key %s: “%s” %d signatures cleaned\n"
 
-#: g10/import.c:2254
+#: g10/import.c:2258
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "key %s: “%s” %d user ID cleaned\n"
 
-#: g10/import.c:2257
+#: g10/import.c:2261
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "key %s: “%s” %d user IDs cleaned\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2297
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “%s” not changed\n"
 
-#: g10/import.c:2652 g10/import.c:2847
+#: g10/import.c:2667 g10/import.c:2872
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2660
+#: g10/import.c:2675
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2668
+#: g10/import.c:2683
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
 
+#: g10/import.c:2845
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr "key %s: card reference is overridden by key material\n"
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card.  A single smartcard can have up to
@@ -3815,192 +3834,192 @@ msgstr "key %s: error sending to agent: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2837
+#: g10/import.c:2862
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "To migrate '%s', with each smartcard, run: %s\n"
 
-#: g10/import.c:2984
+#: g10/import.c:3009
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:3005 g10/import.c:3044
+#: g10/import.c:3030 g10/import.c:3069
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3032
+#: g10/import.c:3057
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:3194 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3219 g10/pkclist.c:72 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3195 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3220 g10/pkclist.c:74 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3196 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3221 g10/pkclist.c:76 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3197 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3222 g10/pkclist.c:78 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3198 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3223 g10/pkclist.c:80 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3323 g10/keylist.c:1258 g10/pkclist.c:84
+#: g10/import.c:3348 g10/keylist.c:1437 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3342 g10/keylist.c:1277 g10/pkclist.c:100
+#: g10/import.c:3367 g10/keylist.c:1456 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3392
+#: g10/import.c:3418
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "key %s: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:3423
+#: g10/import.c:3449
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "key %s: can't locate original keyblock: %s\n"
 
-#: g10/import.c:3430
+#: g10/import.c:3456
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "key %s: can't read original keyblock: %s\n"
 
-#: g10/import.c:3450
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3511
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “%s” revocation certificate imported\n"
 
-#: g10/import.c:3571
+#: g10/import.c:3597
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3588
+#: g10/import.c:3614
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 
-#: g10/import.c:3590
+#: g10/import.c:3616
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "key %s: invalid self-signature on user ID “%s”\n"
 
-#: g10/import.c:3607 g10/import.c:3635 g10/import.c:3691
+#: g10/import.c:3633 g10/import.c:3661 g10/import.c:3717
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3608
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3622
+#: g10/import.c:3648
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3637
+#: g10/import.c:3663
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3656
+#: g10/import.c:3682
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3680
+#: g10/import.c:3706
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3693
+#: g10/import.c:3719
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3708
+#: g10/import.c:3734
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3752
+#: g10/import.c:3781
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “%s”\n"
 
-#: g10/import.c:3779
+#: g10/import.c:3808
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3810
+#: g10/import.c:3839
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 
-#: g10/import.c:3821
+#: g10/import.c:3850
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "key %s: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:3839
+#: g10/import.c:3878
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3853
+#: g10/import.c:3902
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "key %s: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:3861
+#: g10/import.c:3910
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:4034
+#: g10/import.c:4083
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4099
+#: g10/import.c:4148
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 
-#: g10/import.c:4115
+#: g10/import.c:4164
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 
-#: g10/import.c:4181
+#: g10/import.c:4230
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “%s” revocation certificate added\n"
 
-#: g10/import.c:4219
+#: g10/import.c:4268
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
@@ -4039,14 +4058,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d duplicate signature removed\n"
 msgstr[1] "%d duplicate signatures removed\n"
 
-#: g10/key-check.c:715 g10/keylist.c:487
+#: g10/key-check.c:715 g10/keylist.c:654
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "%d signature not checked due to a missing key\n"
 msgstr[1] "%d signatures not checked due to missing keys\n"
 
-#: g10/key-check.c:723 g10/keylist.c:483
+#: g10/key-check.c:723 g10/keylist.c:650
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
@@ -4104,15 +4123,15 @@ msgstr "error opening key DB: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[revocation]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:274
+#: g10/keyedit.c:385 g10/pkclist.c:274
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4124,17 +4143,17 @@ msgstr ""
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:286
+#: g10/keyedit.c:389 g10/pkclist.c:286
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = I trust marginally\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:288
+#: g10/keyedit.c:390 g10/pkclist.c:288
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = I trust fully\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4144,50 +4163,50 @@ msgstr ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Skipping user ID “%s”, which is not a text ID.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID “%s” is revoked."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1667
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2724
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1672 g10/keyedit.c:2799
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “%s” is expired."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID “%s” is not self-signed."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID “%s” is signable.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Sign it? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4196,11 +4215,11 @@ msgstr ""
 "The self-signature on “%s”\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4209,12 +4228,12 @@ msgstr ""
 "Your current signature on “%s”\n"
 "has expired.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Do you want to issue a new signature to replace the expired one? (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4223,43 +4242,43 @@ msgstr ""
 "Your current signature on “%s”\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s” was already locally signed by key %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s” was already signed by key %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Do you want to sign it again anyway? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nothing to sign with key %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "This key is due to expire on %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Do you want your signature to expire at the same time? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4270,31 +4289,31 @@ msgstr ""
 "to the person named above?  If you don't know what to answer, enter "
 "“0”.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) I will not answer.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) I have not checked at all.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) I have done casual checking.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) I have done very careful checking.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘?’ for more information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4303,222 +4322,229 @@ msgstr ""
 "Are you sure that you want to sign this key with your\n"
 "key “%s” (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "This will be a self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "The signature will be marked as non-exportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "The signature will be marked as non-revocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr "I have not checked this key at all.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "I have checked this key casually.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "I have checked this key very carefully.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
-#: g10/keyedit.c:6485 g10/sign.c:466
+#: g10/keyedit.c:1032 g10/keyedit.c:6148 g10/keyedit.c:6231 g10/keyedit.c:6360
+#: g10/keyedit.c:6422 g10/sign.c:468
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1119
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "key %s: error changing passphrase: %s\n"
 
-#: g10/keyedit.c:1262
+#: g10/keyedit.c:1263
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "show key fingerprint"
 msgstr "show key fingerprint"
 
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "show the keygrip"
 msgstr "show the keygrip"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1268
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "select subkey N"
 msgstr "select subkey N"
 
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1272
 msgid "check signatures"
 msgstr "check signatures"
 
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "sign selected user IDs [* see below for related commands]"
 
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs locally"
 msgstr "sign selected user IDs locally"
 
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "sign selected user IDs with a trust signature"
 msgstr "sign selected user IDs with a trust signature"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "sign selected user IDs with a non-revocable signature"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "delete selected user IDs"
 msgstr "delete selected user IDs"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "add a subkey"
 msgstr "add a subkey"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a key to a smartcard"
 msgstr "add a key to a smartcard"
 
-#: g10/keyedit.c:1298
+#: g10/keyedit.c:1299
 msgid "move a key to a smartcard"
 msgstr "move a key to a smartcard"
 
-#: g10/keyedit.c:1300
+#: g10/keyedit.c:1301
 msgid "move a backup key to a smartcard"
 msgstr "move a backup key to a smartcard"
 
-#: g10/keyedit.c:1302
+#: g10/keyedit.c:1303
 msgid "delete selected subkeys"
 msgstr "delete selected subkeys"
 
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1305
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1307
 msgid "delete signatures from the selected user IDs"
 msgstr "delete signatures from the selected user IDs"
 
-#: g10/keyedit.c:1308
+#: g10/keyedit.c:1309
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "change the expiration date for the key or selected subkeys"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1311
 msgid "flag the selected user ID as primary"
 msgstr "flag the selected user ID as primary"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1315
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1317
 msgid "set preference list for the selected user IDs"
 msgstr "set preference list for the selected user IDs"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "set the preferred keyserver URL for the selected user IDs"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set a notation for the selected user IDs"
 msgstr "set a notation for the selected user IDs"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1324
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1329
+#: g10/keyedit.c:1330
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoke signatures on the selected user IDs"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "revoke selected user IDs"
 msgstr "revoke selected user IDs"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke key or selected subkeys"
 msgstr "revoke key or selected subkeys"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "enable key"
 msgstr "enable key"
 
-#: g10/keyedit.c:1337
+#: g10/keyedit.c:1338
 msgid "disable key"
 msgstr "disable key"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "show selected photo IDs"
 msgstr "show selected photo IDs"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "compact unusable user IDs and remove unusable signatures from key"
 
-#: g10/keyedit.c:1343
+#: g10/keyedit.c:1344
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "compact unusable user IDs and remove all signatures from key"
 
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1467
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Secret subkeys are available.\n"
 msgstr "Secret subkeys are available.\n"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1501
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Note: the local copy of the secret key will only be deleted with "
+"“save”.\n"
+
+#: g10/keyedit.c:1579
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1602
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4531,284 +4557,273 @@ msgstr ""
 "signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
+#: g10/keyedit.c:1660 g10/keyedit.c:2799 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1683
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Really sign all text user IDs? (y/N) "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1687
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Really sign all user IDs? (y/N) "
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1695
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1706
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Unknown signature type ‘%s’\n"
 
-#: g10/keyedit.c:1741 g10/keyedit.c:1765 g10/keyedit.c:1962
+#: g10/keyedit.c:1752 g10/keyedit.c:1776 g10/keyedit.c:1975
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1743 g10/keyedit.c:1767 g10/keyedit.c:1924 g10/keyedit.c:1964
+#: g10/keyedit.c:1754 g10/keyedit.c:1778 g10/keyedit.c:1937 g10/keyedit.c:1977
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use the ‘%s’ command.)\n"
 
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1757
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1760
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Really remove all selected user IDs? (y/N) "
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1761
 msgid "Really remove this user ID? (y/N) "
 msgstr "Really remove this user ID? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1818
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4860
+#: g10/keyedit.c:1830 g10/keyedit.c:4795
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1860
 msgid "Command expects a filename argument\n"
 msgstr "Command expects a filename argument\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1881
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Can't open '%s': %s\n"
 
-#: g10/keyedit.c:1887
+#: g10/keyedit.c:1900
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Error reading backup key from '%s': %s\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1935
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1941
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Do you really want to delete the selected keys? (y/N) "
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1943
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Do you really want to delete this key? (y/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1981
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Really revoke all selected user IDs? (y/N) "
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1982
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Really revoke this user ID? (y/N) "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:2000
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Do you really want to revoke the entire key? (y/N) "
 
-#: g10/keyedit.c:1998
+#: g10/keyedit.c:2011
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2013
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Do you really want to revoke this subkey? (y/N) "
 
-#: g10/keyedit.c:2058
+#: g10/keyedit.c:2071
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using a user provided trust database\n"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2116
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:2110
+#: g10/keyedit.c:2123
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Really update the preferences for the selected user IDs? (y/N) "
 
-#: g10/keyedit.c:2112
+#: g10/keyedit.c:2125
 msgid "Really update the preferences? (y/N) "
 msgstr "Really update the preferences? (y/N) "
 
-#: g10/keyedit.c:2186
+#: g10/keyedit.c:2199
 msgid "Save changes? (y/N) "
 msgstr "Save changes? (y/N) "
 
-#: g10/keyedit.c:2190
+#: g10/keyedit.c:2203
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
+#: g10/keyedit.c:2234
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "deleting copy of secret key failed: %s\n"
+
+#: g10/keyedit.c:2251 g10/keyedit.c:2896 g10/keyedit.c:3196 g10/keyedit.c:3349
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2506
+#: g10/keyedit.c:2542
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2568
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2598
+#: g10/keyedit.c:2634
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2629
+#: g10/keyedit.c:2704 g10/keygen.c:3898
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s” is not a fingerprint\n"
 
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2734
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s” is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2795 g10/keyedit.c:2798
+#: g10/keyedit.c:2871 g10/keyedit.c:2874
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2801
+#: g10/keyedit.c:2877
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2801
+#: g10/keyedit.c:2877
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2994 g10/keyedit.c:6076
+#: g10/keyedit.c:3072 g10/keyedit.c:6013
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3216
+#: g10/keyedit.c:3294
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s” is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3318
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s” not found\n"
 
-#: g10/keyedit.c:3363
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3380
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3437
-msgid "Features: "
-msgstr "Features: "
-
-#: g10/keyedit.c:3454
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3469 g10/keylist.c:376
+#: g10/keyedit.c:3413 g10/keylist.c:543
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3477 g10/keyedit.c:3478
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3726
+#: g10/keyedit.c:3661
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3733
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3757
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3828
+#: g10/keyedit.c:3763
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3805 g10/keyedit.c:3952 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3873 g10/keylist.c:2153
+#: g10/keyedit.c:3808 g10/keylist.c:2332
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3875 g10/keylist.c:2159
+#: g10/keyedit.c:3810 g10/keylist.c:2338
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3812 g10/keyedit.c:3954 g10/keylist.c:266 g10/keylist.c:2344
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3814
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
+#: g10/keyedit.c:3822 g10/keyedit.c:3842 g10/keylist.c:269
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3946
+#: g10/keyedit.c:3881
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3950
+#: g10/keyedit.c:3885
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3892
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3975
+#: g10/keyedit.c:3910
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4816,17 +4831,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
-#: g10/mainproc.c:2468 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
+#: g10/keyedit.c:3971 g10/keyedit.c:4402 g10/keyserver.c:371
+#: g10/mainproc.c:2472 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:849
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
-#: g10/mainproc.c:2470 g10/tofu.c:1792 g10/trust.c:113
+#: g10/keyedit.c:3973 g10/keyedit.c:4404 g10/keyserver.c:375
+#: g10/mainproc.c:2474 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4155
+#: g10/keyedit.c:4090
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4835,17 +4850,17 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4142
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4208
+#: g10/keyedit.c:4143
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:4267
+#: g10/keyedit.c:4202
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4855,72 +4870,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4272 g10/keyedit.c:4562
+#: g10/keyedit.c:4207 g10/keyedit.c:4497
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:4278
+#: g10/keyedit.c:4213
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:4293 g10/keygen.c:2899
+#: g10/keyedit.c:4228 g10/keygen.c:3058
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4330
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4340
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4409
+#: g10/keyedit.c:4344
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4351
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4367
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4436
+#: g10/keyedit.c:4371
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4406
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4473
+#: g10/keyedit.c:4408
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s” compacted: %s\n"
 
-#: g10/keyedit.c:4479
+#: g10/keyedit.c:4414
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s”: %d signature removed\n"
 msgstr[1] "User ID “%s”: %d signatures removed\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4422
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s”: already minimized\n"
 
-#: g10/keyedit.c:4488
+#: g10/keyedit.c:4423
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s”: already clean\n"
 
-#: g10/keyedit.c:4557
+#: g10/keyedit.c:4492
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4930,40 +4945,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4568
+#: g10/keyedit.c:4503
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4585
+#: g10/keyedit.c:4520
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4611
+#: g10/keyedit.c:4546 g10/keygen.c:3913
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4626
+#: g10/keyedit.c:4561
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4648
+#: g10/keyedit.c:4583
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4601
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4672
+#: g10/keyedit.c:4607
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4740
+#: g10/keyedit.c:4675
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4971,251 +4986,251 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4745
+#: g10/keyedit.c:4680
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4683
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4804
+#: g10/keyedit.c:4739
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4864
+#: g10/keyedit.c:4799
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4867
+#: g10/keyedit.c:4802
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4985
+#: g10/keyedit.c:4920
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4991
+#: g10/keyedit.c:4926
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:5108
+#: g10/keyedit.c:5043
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
+#: g10/keyedit.c:5084 g10/keyedit.c:5200 g10/keyedit.c:5313 g10/keyedit.c:5451
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s”\n"
 
-#: g10/keyedit.c:5320
+#: g10/keyedit.c:5257
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5399
+#: g10/keyedit.c:5336
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Are you sure you want to replace it? (y/N) "
 
-#: g10/keyedit.c:5400
+#: g10/keyedit.c:5337
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Are you sure you want to delete it? (y/N) "
 
-#: g10/keyedit.c:5460
+#: g10/keyedit.c:5397
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5607
+#: g10/keyedit.c:5544
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5677
+#: g10/keyedit.c:5614
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5739
+#: g10/keyedit.c:5676
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5840
+#: g10/keyedit.c:5777
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5862
+#: g10/keyedit.c:5799
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:5940
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s”\n"
 
-#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
+#: g10/keyedit.c:5943 g10/keyedit.c:6045 g10/keyedit.c:6093
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signed by your key %s on %s%s%s\n"
 
-#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
+#: g10/keyedit.c:5945 g10/keyedit.c:6047 g10/keyedit.c:6095
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6012
+#: g10/keyedit.c:5949
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6017
+#: g10/keyedit.c:5954
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:6022
+#: g10/keyedit.c:5959
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6082
+#: g10/keyedit.c:6019
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "You have signed these user IDs on key %s:\n"
 
-#: g10/keyedit.c:6111
+#: g10/keyedit.c:6048
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6118
+#: g10/keyedit.c:6055
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6080
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6166
+#: g10/keyedit.c:6103
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6136
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6247
+#: g10/keyedit.c:6184
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tried to revoke a non-user ID: %s\n"
 
-#: g10/keyedit.c:6257
+#: g10/keyedit.c:6194
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:6274
+#: g10/keyedit.c:6211
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:6370
+#: g10/keyedit.c:6307
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6408
+#: g10/keyedit.c:6345
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6470
+#: g10/keyedit.c:6407
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6567
+#: g10/keyedit.c:6504
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 
-#: g10/keygen.c:169
+#: g10/keygen.c:176
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘%s’\n"
 
-#: g10/keygen.c:322
+#: g10/keygen.c:333
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘%s’ duplicated\n"
 
-#: g10/keygen.c:329
+#: g10/keygen.c:340
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:331
+#: g10/keygen.c:342
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:333
+#: g10/keygen.c:344
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:493
+#: g10/keygen.c:518
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:972
+#: g10/keygen.c:1095
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1018
+#: g10/keygen.c:1141
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1075
+#: g10/keygen.c:1198
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
-#: g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1569 g10/keygen.c:1574 g10/keygen.c:1626 g10/keygen.c:1631
+#: g10/keygen.c:1785 g10/keygen.c:1790
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
+#: g10/keygen.c:1580 g10/keygen.c:1637 g10/keygen.c:1645 g10/keygen.c:1796
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1542
+#: g10/keygen.c:1671
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1852
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1855
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1729
+#: g10/keygen.c:1858
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1732
+#: g10/keygen.c:1861
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5229,161 +5244,161 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1753
+#: g10/keygen.c:1885
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1784
+#: g10/keygen.c:1919
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Possible actions for a %s key: "
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1925
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1930
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1798
+#: g10/keygen.c:1933
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1801
+#: g10/keygen.c:1936
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1804
+#: g10/keygen.c:1939
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:1930
+#: g10/keygen.c:2071
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA and RSA (default)\n"
 
-#: g10/keygen.c:1934
+#: g10/keygen.c:2075
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA and Elgamal\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:2078
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:2080
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:2086
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1947
+#: g10/keygen.c:2088
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1953
+#: g10/keygen.c:2094
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (set your own capabilities)\n"
 
-#: g10/keygen.c:1955
+#: g10/keygen.c:2096
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (set your own capabilities)\n"
 
-#: g10/keygen.c:1961
+#: g10/keygen.c:2102
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC and ECC\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:2104
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:2106
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC (set your own capabilities)\n"
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:2108
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC (encrypt only)\n"
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2112
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) Existing key\n"
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:2114
 #, c-format
 msgid "  (%d) Existing key from card\n"
 msgstr "  (%d) Existing key from card\n"
 
-#: g10/keygen.c:2069 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2210 sm/certreqgen-ui.c:204
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2082 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2223 sm/certreqgen-ui.c:212
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2084 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2225 sm/certreqgen-ui.c:214
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227
-#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
+#: g10/keygen.c:2244 g10/keygen.c:2254 g10/keygen.c:3375 g10/keygen.c:3386
+#: sm/certreqgen-ui.c:232 sm/certreqgen-ui.c:241
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233
+#: g10/keygen.c:2248 g10/keygen.c:3379 sm/certreqgen-ui.c:235
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2120 sm/certreqgen-ui.c:245
+#: g10/keygen.c:2261 sm/certreqgen-ui.c:247
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2297 g10/keygen.c:2311
+#: g10/keygen.c:2438 g10/keygen.c:2452
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2352
+#: g10/keygen.c:2493
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s keys may be between %u and %u bits long.\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2501
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "What keysize do you want for the subkey? (%u) "
 
-#: g10/keygen.c:2377 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2518 sm/certreqgen-ui.c:191
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2423
+#: g10/keygen.c:2564
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2611
+#: g10/keygen.c:2770
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5399,7 +5414,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2622
+#: g10/keygen.c:2781
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5415,38 +5430,38 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2645
+#: g10/keygen.c:2804
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2650
+#: g10/keygen.c:2809
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2663 g10/keygen.c:2688
+#: g10/keygen.c:2822 g10/keygen.c:2847
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2670
+#: g10/keygen.c:2829
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2671
+#: g10/keygen.c:2830
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2676
+#: g10/keygen.c:2835
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2677
+#: g10/keygen.c:2836
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2681
+#: g10/keygen.c:2840
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5454,11 +5469,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2694
+#: g10/keygen.c:2853
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2762
+#: g10/keygen.c:2921
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5472,7 +5487,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2777
+#: g10/keygen.c:2936
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5488,49 +5503,49 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2796
+#: g10/keygen.c:2955
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:2805
+#: g10/keygen.c:2964
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:2806
+#: g10/keygen.c:2965
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 
-#: g10/keygen.c:2810
+#: g10/keygen.c:2969
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:2813
+#: g10/keygen.c:2972
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:2823
+#: g10/keygen.c:2982
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2988
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:2838
+#: g10/keygen.c:2997
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:2844
+#: g10/keygen.c:3003
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:3039
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:3045
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5541,7 +5556,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:3050
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
@@ -5556,31 +5571,31 @@ msgstr "Please don't put the email address into the real name or the comment\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2916
+#: g10/keygen.c:3075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2926
+#: g10/keygen.c:3085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:3086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2932
+#: g10/keygen.c:3091
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:2933
+#: g10/keygen.c:3092
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2952
+#: g10/keygen.c:3111
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:2998
+#: g10/keygen.c:3157
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5592,13 +5607,13 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
+#: g10/keygen.c:4535 g10/keygen.c:4606 g10/keygen.c:4624 g10/keygen.c:4652
+#: g10/keygen.c:4996 g10/keygen.c:5523 g10/keygen.c:5818 g10/keygen.c:5923
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4287
+#: g10/keygen.c:4544
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5609,64 +5624,64 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:4289
+#: g10/keygen.c:4546
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4310
+#: g10/keygen.c:4567
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s” already exists\n"
 
-#: g10/keygen.c:4315
+#: g10/keygen.c:4572
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4321
+#: g10/keygen.c:4578
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:4722
+#: g10/keygen.c:4979
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 
-#: g10/keygen.c:4771
+#: g10/keygen.c:5028
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:4831
+#: g10/keygen.c:5088
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:4851
+#: g10/keygen.c:5108
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Note: backup of card key saved to ‘%s’\n"
 
-#: g10/keygen.c:5010 g10/keygen.c:5172
+#: g10/keygen.c:5291 g10/keygen.c:5456
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5166
+#: g10/keygen.c:5450
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5180
+#: g10/keygen.c:5464
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5210
+#: g10/keygen.c:5494
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5226
+#: g10/keygen.c:5510
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5674,111 +5689,127 @@ msgstr ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command “--edit-key” to generate a subkey for this purpose.\n"
 
-#: g10/keygen.c:5401 g10/keygen.c:5590
+#: g10/keygen.c:5685 g10/keygen.c:5874
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5592
+#: g10/keygen.c:5687 g10/keygen.c:5876
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5414 g10/keygen.c:5603
+#: g10/keygen.c:5698 g10/keygen.c:5887
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:5426 g10/keygen.c:5428
+#: g10/keygen.c:5710 g10/keygen.c:5712
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keygen.c:5435 g10/keygen.c:5437
+#: g10/keygen.c:5719 g10/keygen.c:5721
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Secret parts of primary key are stored on-card.\n"
 
-#: g10/keygen.c:5456 g10/keygen.c:5617
+#: g10/keygen.c:5740 g10/keygen.c:5901
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
-#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
+#: g10/keyid.c:668 g10/keyid.c:679 g10/keyid.c:690
 msgid "never     "
 msgstr "never     "
 
-#: g10/keylist.c:332
+#: g10/keylist.c:341
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:357
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:413
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keylist.c:430
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keylist.c:499
 msgid "Critical signature policy: "
 msgstr "Critical signature policy: "
 
-#: g10/keylist.c:334
+#: g10/keylist.c:501
 msgid "Signature policy: "
 msgstr "Signature policy: "
 
-#: g10/keylist.c:374
+#: g10/keylist.c:541
 msgid "Critical preferred keyserver: "
 msgstr "Critical preferred keyserver: "
 
-#: g10/keylist.c:427
+#: g10/keylist.c:594
 msgid "Critical signature notation: "
 msgstr "Critical signature notation: "
 
-#: g10/keylist.c:429
+#: g10/keylist.c:596
 msgid "Signature notation: "
 msgstr "Signature notation: "
 
-#: g10/keylist.c:479
+#: g10/keylist.c:646
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr[0] "%d good signature\n"
 msgstr[1] "%d good signatures\n"
 
-#: g10/keylist.c:492
+#: g10/keylist.c:659
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "%d signature not checked due to an error\n"
 msgstr[1] "%d signatures not checked due to errors\n"
 
-#: g10/keylist.c:580
+#: g10/keylist.c:747
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 msgstr[0] "Warning: %lu key skipped due to its large size\n"
 msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
 
-#: g10/keylist.c:603
+#: g10/keylist.c:770
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:2012
+#: g10/keylist.c:2191
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:2014
+#: g10/keylist.c:2193
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:2022
+#: g10/keylist.c:2201
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:2024 g10/keylist.c:2034
+#: g10/keylist.c:2203 g10/keylist.c:2213
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:2029 g10/keylist.c:2045
+#: g10/keylist.c:2208 g10/keylist.c:2224
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/keylist.c:2096
+#: g10/keylist.c:2275
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
@@ -5859,54 +5890,54 @@ msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” not a key ID: skipping\n"
 
-#: g10/keyserver.c:1237 g10/keyserver.c:1270
+#: g10/keyserver.c:1237 g10/keyserver.c:1272
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "refreshing %d key from %s\n"
 msgstr[1] "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1244
+#: g10/keyserver.c:1246
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 
-#: g10/keyserver.c:1336
+#: g10/keyserver.c:1338
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s” not found on keyserver\n"
 
-#: g10/keyserver.c:1339
+#: g10/keyserver.c:1341
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1504
+#: g10/keyserver.c:1506
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1619 g10/keyserver.c:1812
+#: g10/keyserver.c:1621 g10/keyserver.c:1814
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1634 g10/skclist.c:215 g10/skclist.c:243
+#: g10/keyserver.c:1636 g10/skclist.c:215 g10/skclist.c:243
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s”: %s\n"
 
-#: g10/keyserver.c:1638
+#: g10/keyserver.c:1640
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1681
+#: g10/keyserver.c:1683
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1699
+#: g10/keyserver.c:1701
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
@@ -5956,7 +5987,7 @@ msgstr "encrypted with %s key, ID %s\n"
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:686 g10/mainproc.c:1064
+#: g10/mainproc.c:686 g10/mainproc.c:1068
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
@@ -5981,12 +6012,12 @@ msgstr "assuming %s encrypted data\n"
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:839 g10/mainproc.c:883
+#: g10/mainproc.c:843 g10/mainproc.c:887
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:850
+#: g10/mainproc.c:854
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5996,179 +6027,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:853
+#: g10/mainproc.c:857
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:862
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:870
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:889
+#: g10/mainproc.c:893
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:914
+#: g10/mainproc.c:918
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:980
+#: g10/mainproc.c:984
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:987
+#: g10/mainproc.c:991
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1242
+#: g10/mainproc.c:1246
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1546 g10/mainproc.c:1589
+#: g10/mainproc.c:1550 g10/mainproc.c:1593
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1946
+#: g10/mainproc.c:1950
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s”"
 
-#: g10/mainproc.c:1948
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s”"
 
-#: g10/mainproc.c:1950
+#: g10/mainproc.c:1954
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s”"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1974
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2083
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:2095 g10/mainproc.c:2102
+#: g10/mainproc.c:2099 g10/mainproc.c:2106
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:2096 g10/mainproc.c:2103 sm/verify.c:476
+#: g10/mainproc.c:2100 g10/mainproc.c:2107 sm/verify.c:491
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:2107
+#: g10/mainproc.c:2111
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:2113
+#: g10/mainproc.c:2117
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s”\n"
 
-#: g10/mainproc.c:2164
+#: g10/mainproc.c:2168
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2206
+#: g10/mainproc.c:2210
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Note: Use ‘%s’ to make use of this info\n"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2426
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2460
+#: g10/mainproc.c:2464
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s”"
 
-#: g10/mainproc.c:2535
+#: g10/mainproc.c:2539 sm/verify.c:533
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "WARNING: This key is not suitable for signing in %s mode\n"
 
-#: g10/mainproc.c:2553
+#: g10/mainproc.c:2557
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2557
+#: g10/mainproc.c:2561
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2568
+#: g10/mainproc.c:2572
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2569
+#: g10/mainproc.c:2573
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2570
+#: g10/mainproc.c:2574
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2570 g10/trust.c:112 dirmngr/ocsp.c:795
+#: g10/mainproc.c:2574 g10/trust.c:112 dirmngr/ocsp.c:850
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2572
+#: g10/mainproc.c:2576
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2607
+#: g10/mainproc.c:2611
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2658
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2750 g10/mainproc.c:2769 g10/mainproc.c:2893
+#: g10/mainproc.c:2754 g10/mainproc.c:2773 g10/mainproc.c:2897
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2803
+#: g10/mainproc.c:2807
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:2812
+#: g10/mainproc.c:2816
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2897
+#: g10/mainproc.c:2901
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6275,7 +6306,7 @@ msgstr "Uncompressed"
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1410 sm/decrypt.c:1035 sm/encrypt.c:541 sm/verify.c:522
+#: g10/misc.c:1410 sm/decrypt.c:1403 sm/encrypt.c:833 sm/verify.c:548
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
 msgstr "operation forced to fail due to unfulfilled compliance rules\n"
@@ -6359,7 +6390,7 @@ msgstr "subpacket of type %d has critical bit set\n"
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/passphrase.c:251 sm/decrypt.c:341
+#: g10/passphrase.c:251 sm/decrypt.c:670
 msgid "Please enter the passphrase for decryption."
 msgstr "Please enter the passphrase for decryption."
 
@@ -6417,7 +6448,7 @@ msgstr ""
 "created %s%s.\n"
 "%s"
 
-#: g10/photoid.c:77
+#: g10/photoid.c:76
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6431,34 +6462,34 @@ msgstr ""
 "very large picture, your key will become very large as well!\n"
 "Keeping the image close to 240x288 is a good size to use.\n"
 
-#: g10/photoid.c:99
+#: g10/photoid.c:98
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Enter JPEG filename for photo ID: "
 
-#: g10/photoid.c:120
+#: g10/photoid.c:119
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "unable to open JPEG file '%s': %s\n"
 
-#: g10/photoid.c:131
+#: g10/photoid.c:136
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "This JPEG is really large (%d bytes) !\n"
 
-#: g10/photoid.c:133
+#: g10/photoid.c:139
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Are you sure you want to use it? (y/N) "
 
-#: g10/photoid.c:149
+#: g10/photoid.c:155
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "‘%s’ is not a JPEG file\n"
 
-#: g10/photoid.c:168
+#: g10/photoid.c:174
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:399
+#: g10/photoid.c:405
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6528,7 +6559,7 @@ msgstr ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 
-#: g10/pkclist.c:310 g10/revoke.c:805
+#: g10/pkclist.c:310 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Your decision? "
 
@@ -6683,45 +6714,45 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:844 g10/pkclist.c:863 g10/pkclist.c:1049 g10/pkclist.c:1091
+#: g10/pkclist.c:845 g10/pkclist.c:864 g10/pkclist.c:1065 g10/pkclist.c:1107
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:879
+#: g10/pkclist.c:880
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:898 g10/pkclist.c:1062
+#: g10/pkclist.c:900 g10/pkclist.c:1078
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:1002
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "can't encrypt to ‘%s’\n"
 
-#: g10/pkclist.c:1001
+#: g10/pkclist.c:1017
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "option ‘%s’ given, but no valid default keys given\n"
 
-#: g10/pkclist.c:1008
+#: g10/pkclist.c:1024
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
 
-#: g10/pkclist.c:1111
+#: g10/pkclist.c:1127
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1151
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:1161
+#: g10/pkclist.c:1177
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -6729,40 +6760,40 @@ msgstr ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:1186
+#: g10/pkclist.c:1202
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:1197 g10/pkclist.c:1275
+#: g10/pkclist.c:1213 g10/pkclist.c:1291
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:1219
+#: g10/pkclist.c:1235
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:1229
+#: g10/pkclist.c:1245
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:1265
+#: g10/pkclist.c:1281
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "unknown default recipient “%s”\n"
 
-#: g10/pkclist.c:1314
+#: g10/pkclist.c:1330
 #, c-format
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1693
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1718
+#: g10/pkclist.c:1735
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -6772,35 +6803,35 @@ msgstr "Note: key %s has no preference for %s\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:615
+#: g10/plaintext.c:620
 msgid "Detached signature.\n"
 msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:623
+#: g10/plaintext.c:628
 msgid "Please enter name of data file: "
 msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:660
+#: g10/plaintext.c:665
 #, c-format
 msgid "reading stdin ...\n"
 msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:705
+#: g10/plaintext.c:710
 #, c-format
 msgid "no signed data\n"
 msgstr "no signed data\n"
 
-#: g10/plaintext.c:723
+#: g10/plaintext.c:728
 #, c-format
 msgid "can't open signed data '%s'\n"
 msgstr "can't open signed data ‘%s’\n"
 
-#: g10/plaintext.c:758
+#: g10/plaintext.c:763
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "can't open signed data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:969
+#: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:1337
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "key %s is not suitable for decryption in %s mode\n"
@@ -6841,7 +6872,7 @@ msgid "Note: key has been revoked"
 msgstr "Note: key has been revoked"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:500
+#: g10/revoke.c:499
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet failed: %s\n"
@@ -6859,37 +6890,37 @@ msgstr "To be revoked by:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(This is a sensitive revocation key)\n"
 
-#: g10/revoke.c:321
+#: g10/revoke.c:320
 msgid "Secret key is not available.\n"
 msgstr "Secret key is not available.\n"
 
-#: g10/revoke.c:326
+#: g10/revoke.c:325
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Create a designated revocation certificate for this key? (y/N) "
 
-#: g10/revoke.c:335 g10/revoke.c:746
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII armored output forced.\n"
 
-#: g10/revoke.c:351 g10/revoke.c:479
+#: g10/revoke.c:350 g10/revoke.c:478
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
 
-#: g10/revoke.c:414
+#: g10/revoke.c:413
 msgid "Revocation certificate created.\n"
 msgstr "Revocation certificate created.\n"
 
-#: g10/revoke.c:420
+#: g10/revoke.c:419
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no revocation keys found for “%s”\n"
 
-#: g10/revoke.c:565
+#: g10/revoke.c:564
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "This is a revocation certificate for the OpenPGP key:"
 
-#: g10/revoke.c:581
+#: g10/revoke.c:580
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -6899,7 +6930,7 @@ msgstr ""
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 
-#: g10/revoke.c:584
+#: g10/revoke.c:583
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6913,7 +6944,7 @@ msgstr ""
 "a reason for the revocation.  For details see the description of\n"
 "of the gpg command “--generate-revocation” in the GnuPG manual."
 
-#: g10/revoke.c:590
+#: g10/revoke.c:589
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -6923,12 +6954,12 @@ msgstr ""
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 
-#: g10/revoke.c:609
+#: g10/revoke.c:608
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "revocation certificate stored as ‘%s.rev’\n"
 
-#: g10/revoke.c:653
+#: g10/revoke.c:652
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "secret key “%s” not found\n"
@@ -6936,21 +6967,21 @@ msgstr "secret key “%s” not found\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:679
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "‘%s’ matches multiple secret keys:\n"
 
-#: g10/revoke.c:707
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "error searching the keyring: %s\n"
 
-#: g10/revoke.c:730
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Create a revocation certificate for this key? (y/N) "
 
-#: g10/revoke.c:754
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6968,37 +6999,37 @@ msgstr ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 
-#: g10/revoke.c:788
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Please select the reason for the revocation:\n"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancel"
 
-#: g10/revoke.c:800
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probably you want to select %d here)\n"
 
-#: g10/revoke.c:841
+#: g10/revoke.c:840
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Enter an optional description; end it with an empty line:\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:868
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Reason for revocation: %s\n"
 
-#: g10/revoke.c:871
+#: g10/revoke.c:870
 msgid "(No description given)\n"
 msgstr "(No description given)\n"
 
-#: g10/revoke.c:876
+#: g10/revoke.c:875
 msgid "Is this okay? (y/N) "
 msgstr "Is this okay? (y/N) "
 
-#: g10/seskey.c:62 sm/encrypt.c:124
+#: g10/seskey.c:62 sm/encrypt.c:127
 #, c-format
 msgid "weak key created - retrying\n"
 msgstr "weak key created - retrying\n"
@@ -7018,51 +7049,46 @@ msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 
-#: g10/sig-check.c:78 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498
+#: g10/sig-check.c:78 g10/sign.c:404 sm/sign.c:742 sm/verify.c:514
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "key %s may not be used for signing in %s mode\n"
 
-#: g10/sig-check.c:82
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr "continuing verification anyway due to option %s\n"
-
-#: g10/sig-check.c:190
+#: g10/sig-check.c:183
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:219
+#: g10/sig-check.c:212
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNING: signing subkey %s is not cross-certified\n"
 
-#: g10/sig-check.c:221
+#: g10/sig-check.c:214
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "please see %s for more information\n"
 
-#: g10/sig-check.c:230
+#: g10/sig-check.c:223
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 
-#: g10/sig-check.c:351
+#: g10/sig-check.c:345
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgid_plural "public key %s is %lu seconds newer than the signature\n"
 msgstr[0] "public key %s is %lu second newer than the signature\n"
 msgstr[1] "public key %s is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:359
+#: g10/sig-check.c:353
 #, c-format
 msgid "public key %s is %lu day newer than the signature\n"
 msgid_plural "public key %s is %lu days newer than the signature\n"
 msgstr[0] "public key %s is %lu day newer than the signature\n"
 msgstr[1] "public key %s is %lu days newer than the signature\n"
 
-#: g10/sig-check.c:373 g10/sign.c:361
+#: g10/sig-check.c:367 g10/sign.c:361
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7073,7 +7099,7 @@ msgstr[0] ""
 msgstr[1] ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:382
+#: g10/sig-check.c:376
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7083,37 +7109,37 @@ msgstr[0] ""
 msgstr[1] ""
 "key %s was created %lu days in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:400
+#: g10/sig-check.c:394
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Note: signature key %s expired %s\n"
 
-#: g10/sig-check.c:411
+#: g10/sig-check.c:405
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Note: signature key %s has been revoked\n"
 
-#: g10/sig-check.c:500
+#: g10/sig-check.c:494
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:512
+#: g10/sig-check.c:506
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:579
+#: g10/sig-check.c:573
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 
-#: g10/sig-check.c:1176
+#: g10/sig-check.c:1170
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "key %s: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:1179
+#: g10/sig-check.c:1173
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
@@ -7140,24 +7166,24 @@ msgstr ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 
-#: g10/sign.c:476
+#: g10/sign.c:478
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:1045
+#: g10/sign.c:1062
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/sign.c:1187
+#: g10/sign.c:1215
 #, c-format
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:1464
+#: g10/sign.c:1495
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s encryption will be used\n"
@@ -7182,7 +7208,7 @@ msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "this is a PGP generated Elgamal key which is not secure for signatures!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:451
+#: g10/tdbdump.c:57 g10/trustdb.c:471
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
@@ -7227,7 +7253,7 @@ msgstr "error finding trust record in '%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "read error in '%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:466
+#: g10/tdbdump.c:237 g10/trustdb.c:486
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
@@ -7262,7 +7288,7 @@ msgstr "trustdb transaction too large\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624
+#: g10/tdbio.c:741 dirmngr/http.c:645 dirmngr/http.c:675
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
@@ -7732,128 +7758,128 @@ msgstr "error opening TOFU database: %s\n"
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 
-#: g10/trustdb.c:232
+#: g10/trustdb.c:251
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:255 g10/trustdb.c:284
+#: g10/trustdb.c:274 g10/trustdb.c:303
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:336
+#: g10/trustdb.c:355
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:375
+#: g10/trustdb.c:395
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:386
+#: g10/trustdb.c:406
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:430
+#: g10/trustdb.c:450
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:436
+#: g10/trustdb.c:456
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:531
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "You may try to re-create the trustdb using the commands:\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:540
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "If that does not work, please consult the manual\n"
 
-#: g10/trustdb.c:570
+#: g10/trustdb.c:590
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:576
+#: g10/trustdb.c:596
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:625
+#: g10/trustdb.c:645
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:631 g10/trustdb.c:2326
+#: g10/trustdb.c:651 g10/trustdb.c:2379
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:640
+#: g10/trustdb.c:660
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:656
+#: g10/trustdb.c:676
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:898 g10/trustdb.c:1485
+#: g10/trustdb.c:918 g10/trustdb.c:1526
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1118
+#: g10/trustdb.c:1159
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1123
+#: g10/trustdb.c:1164
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2047
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:2050
+#: g10/trustdb.c:2103
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2120
+#: g10/trustdb.c:2173
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2134
+#: g10/trustdb.c:2187
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2252
+#: g10/trustdb.c:2305
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2386
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -7966,72 +7992,76 @@ msgstr ""
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5149 scd/app-nks.c:1541 scd/app-openpgp.c:2449
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5168 scd/app-nks.c:1560 scd/app-openpgp.c:2465
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
 
-#: scd/app-p15.c:5214 scd/app-nks.c:1113
+#: scd/app-p15.c:5248 scd/app-nks.c:2112
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Please enter the PIN for the key to create qualified signatures."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5251 scd/app-openpgp.c:2791
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5219 scd/app-nks.c:1103
+#: scd/app-p15.c:5253 scd/app-nks.c:2102
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-p15.c:5222 scd/app-nks.c:1095
+#: scd/app-p15.c:5256 scd/app-nks.c:2093
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
-#: scd/app-nks.c:709 scd/app-openpgp.c:3666
+#: scd/app-nks.c:1479 scd/app-openpgp.c:4190
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus missing or not of size %d bits\n"
 
-#: scd/app-nks.c:717 scd/app-openpgp.c:3678
+#: scd/app-nks.c:1487 scd/app-openpgp.c:4202
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
 
-#: scd/app-nks.c:797 scd/app-openpgp.c:2327 scd/app-openpgp.c:2346
-#: scd/app-openpgp.c:2513 scd/app-openpgp.c:2531 scd/app-openpgp.c:2829
-#: scd/app-openpgp.c:2876 scd/app-openpgp.c:2991 scd/app-dinsig.c:302
+#: scd/app-nks.c:1660
+msgid "Note: PIN has not yet been enabled."
+msgstr "Note: PIN has not yet been enabled."
+
+#: scd/app-nks.c:1671 scd/app-openpgp.c:2649 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2843 scd/app-openpgp.c:2862 scd/app-openpgp.c:3206
+#: scd/app-openpgp.c:3253 scd/app-openpgp.c:3418 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
 
-#: scd/app-nks.c:830
+#: scd/app-nks.c:1707
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:1094
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Please enter a new PIN for the standard keys."
 
-#: scd/app-nks.c:1101
+#: scd/app-nks.c:2100
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:1111
+#: scd/app-nks.c:2110
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 
-#: scd/app-nks.c:1121
+#: scd/app-nks.c:2120
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8039,7 +8069,7 @@ msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:1123
+#: scd/app-nks.c:2122
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8047,47 +8077,47 @@ msgstr ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:1230 scd/app-openpgp.c:2910 scd/app-dinsig.c:532
+#: scd/app-nks.c:2295 scd/app-openpgp.c:3288 scd/app-dinsig.c:535
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:862
+#: scd/app-openpgp.c:938
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:875
+#: scd/app-openpgp.c:951
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:1422 scd/app-openpgp.c:3234 scd/app-openpgp.c:5635
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1429
+#: scd/app-openpgp.c:1611
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-openpgp.c:1436
+#: scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-openpgp.c:1546
+#: scd/app-openpgp.c:1736
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-openpgp.c:1664 scd/app-openpgp.c:4286
+#: scd/app-openpgp.c:1853 scd/app-openpgp.c:4880
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-openpgp.c:1771
+#: scd/app-openpgp.c:1961
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8095,42 +8125,43 @@ msgstr "reading public key failed: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:2436
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2281
+#: scd/app-openpgp.c:2603
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2288
+#: scd/app-openpgp.c:2610
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 
-#: scd/app-openpgp.c:2301
+#: scd/app-openpgp.c:2623
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2353 scd/app-openpgp.c:2538 scd/app-openpgp.c:2836
+#: scd/app-openpgp.c:2673 scd/app-openpgp.c:2869 scd/app-openpgp.c:3213
+#: scd/app-openpgp.c:3308 scd/app-openpgp.c:3321
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2414 scd/app-openpgp.c:2552
-#: scd/app-openpgp.c:4644
+#: scd/app-openpgp.c:2688 scd/app-openpgp.c:2736 scd/app-openpgp.c:2884
+#: scd/app-openpgp.c:5244
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:5644
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2454
+#: scd/app-openpgp.c:2781
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8138,20 +8169,20 @@ msgid_plural ""
 msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 
-#: scd/app-openpgp.c:2485
+#: scd/app-openpgp.c:2814
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:2823
+#: scd/app-openpgp.c:3200
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:2872
-msgid "||Please enter the Reset Code for the card"
-msgstr "||Please enter the Reset Code for the card"
+#: scd/app-openpgp.c:3249
+msgid "|R|Please enter the Reset Code for the card"
+msgstr "|R|Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:2882 scd/app-openpgp.c:2943
+#: scd/app-openpgp.c:3259 scd/app-openpgp.c:3298
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8159,133 +8190,133 @@ msgstr "Reset Code is too short; minimum length is %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:2905
+#: scd/app-openpgp.c:3283
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:2906
+#: scd/app-openpgp.c:3284
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:2906
+#: scd/app-openpgp.c:3284
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:2987
+#: scd/app-openpgp.c:3414
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:2988
+#: scd/app-openpgp.c:3415
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3050 scd/app-openpgp.c:4346
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:4940
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3056 scd/app-openpgp.c:4353
+#: scd/app-openpgp.c:3477 scd/app-openpgp.c:4947
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:3066
+#: scd/app-openpgp.c:3487
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-openpgp.c:3070
+#: scd/app-openpgp.c:3491
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-openpgp.c:3072
+#: scd/app-openpgp.c:3493
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-openpgp.c:3074
+#: scd/app-openpgp.c:3495
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-openpgp.c:3647 scd/app-openpgp.c:3999
+#: scd/app-openpgp.c:4171 scd/app-openpgp.c:4540
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:3688 scd/app-openpgp.c:3696
+#: scd/app-openpgp.c:4212 scd/app-openpgp.c:4220
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA prime %s missing or not of size %d bits\n"
 
-#: scd/app-openpgp.c:3829 scd/app-openpgp.c:4106
+#: scd/app-openpgp.c:4353 scd/app-openpgp.c:4659
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-openpgp.c:3993
+#: scd/app-openpgp.c:4534
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4263
+#: scd/app-openpgp.c:4857
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-openpgp.c:4271
+#: scd/app-openpgp.c:4865
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-openpgp.c:4277
+#: scd/app-openpgp.c:4871
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "key generation completed (%d second)\n"
 msgstr[1] "key generation completed (%d seconds)\n"
 
-#: scd/app-openpgp.c:4311
+#: scd/app-openpgp.c:4905
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:4361
+#: scd/app-openpgp.c:4955
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingerprint on card does not match requested one\n"
 
-#: scd/app-openpgp.c:4560
+#: scd/app-openpgp.c:5159
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:4618
+#: scd/app-openpgp.c:5217
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5055
+#: scd/app-openpgp.c:5649
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verification of Admin PIN is currently prohibited through this command\n"
 
-#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
+#: scd/app-openpgp.c:6034 scd/app-openpgp.c:6046
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
 
-#: scd/app-dinsig.c:298
+#: scd/app-dinsig.c:299
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Please enter your PIN at the reader's pinpad"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-dinsig.c:529
+#: scd/app-dinsig.c:532
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial New PIN"
 
@@ -8293,7 +8324,7 @@ msgstr "|N|Initial New PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:137 sm/gpgsm.c:271 dirmngr/dirmngr.c:204
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8351,18 +8382,18 @@ msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2178
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2218
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2186
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2226
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
-#: dirmngr/validate.c:1228
+#: sm/call-agent.c:1086 sm/certlist.c:144 sm/keylist.c:285
+#: dirmngr/validate.c:1271
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error getting key usage information: %s\n"
@@ -8372,11 +8403,11 @@ msgstr "error getting key usage information: %s\n"
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2164
+#: sm/certchain.c:199 sm/certchain.c:2201
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2164
+#: sm/certchain.c:200 sm/certchain.c:2201
 msgid "shell"
 msgstr "shell"
 
@@ -8385,270 +8416,271 @@ msgstr "shell"
 msgid "critical certificate extension %s is not supported"
 msgstr "critical certificate extension %s is not supported"
 
-#: sm/certchain.c:299 dirmngr/validate.c:242
+#: sm/certchain.c:299 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "issuer certificate is not marked as a CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:338
 msgid "critical marked policy without configured policies"
 msgstr "critical marked policy without configured policies"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:356
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "failed to open '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:368 sm/certchain.c:400 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Note: non-critical certificate policy not allowed"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:372 sm/certchain.c:404 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:595 sm/keydb.c:1084 sm/keydb.c:1171
+#: sm/certchain.c:611 sm/keydb.c:1091 sm/keydb.c:1178
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:640
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:660
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:685
+#: sm/certchain.c:739 dirmngr/ocsp.c:740
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:807
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:832
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:835
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:728
-#: sm/encrypt.c:345 sm/import.c:415 sm/keydb.c:1091 sm/keydb.c:1178
-#: sm/sign.c:337 sm/verify.c:118
+#: sm/certchain.c:1059 sm/certchain.c:1574 sm/certchain.c:2229
+#: sm/decrypt.c:1086 sm/encrypt.c:639 sm/import.c:416 sm/keydb.c:1098
+#: sm/keydb.c:1185 sm/sign.c:553 sm/verify.c:123
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1225
+#: sm/certchain.c:1245
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1240
+#: sm/certchain.c:1260
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1267
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "please make sure that the “dirmngr” is properly installed\n"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1273
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497
+#: sm/certchain.c:1302 sm/certchain.c:1370 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515
+#: sm/certchain.c:1317 sm/certchain.c:1402 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1298 sm/certchain.c:1383
+#: sm/certchain.c:1318 sm/certchain.c:1403
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1299 sm/certchain.c:1384
+#: sm/certchain.c:1319 sm/certchain.c:1404
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1312 dirmngr/validate.c:526
+#: sm/certchain.c:1332 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1313
+#: sm/certchain.c:1333
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1314
+#: sm/certchain.c:1334
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1356
+#: sm/certchain.c:1376
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1365
+#: sm/certchain.c:1385
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1402
+#: sm/certchain.c:1422
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1404
+#: sm/certchain.c:1424
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1405
+#: sm/certchain.c:1425
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1429
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1430
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1433
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1414
+#: sm/certchain.c:1434
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1444 dirmngr/validate.c:577
+#: sm/certchain.c:1464 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1453
+#: sm/certchain.c:1473
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "root certificate has now been marked as trusted\n"
 
-#: sm/certchain.c:1466
+#: sm/certchain.c:1486
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 
-#: sm/certchain.c:1472
+#: sm/certchain.c:1492
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interactive marking as trusted disabled for this session\n"
 
-#: sm/certchain.c:1531
+#: sm/certchain.c:1551
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "WARNING: creation time of signature not known - assuming current time"
 
-#: sm/certchain.c:1595
+#: sm/certchain.c:1615
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1673
+#: sm/certchain.c:1693
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1742 dirmngr/validate.c:575
+#: sm/certchain.c:1766 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1758
+#: sm/certchain.c:1782
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
+#: sm/certchain.c:1813 sm/import.c:176 sm/keylist.c:1403 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1801 dirmngr/validate.c:642
+#: sm/certchain.c:1825 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1834 dirmngr/validate.c:668
+#: sm/certchain.c:1859 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1866 dirmngr/validate.c:692
+#: sm/certchain.c:1891 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1925 dirmngr/validate.c:717
+#: sm/certchain.c:1950 dirmngr/validate.c:718
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747
+#: sm/certchain.c:1992 sm/certchain.c:2301 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1968
+#: sm/certchain.c:1993
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1969
+#: sm/certchain.c:1994
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2151
+#: sm/certchain.c:2186
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2160
+#: sm/certchain.c:2195
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
 
-#: sm/certcheck.c:110
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:464
+#: dirmngr/validate.c:1148
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
-#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1453 dirmngr/validate.c:903
-#: dirmngr/validate.c:927
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1490 dirmngr/validate.c:906
+#: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
 msgstr "out of core\n"
 
-#: sm/certcheck.c:370 sm/verify.c:213
+#: sm/certcheck.c:381 sm/verify.c:223
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:851
 msgid "none"
 msgstr "none"
 
@@ -8683,132 +8715,132 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:124 dirmngr/validate.c:1218
+#: sm/certlist.c:134 dirmngr/validate.c:1261
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:145 dirmngr/validate.c:1259
+#: sm/certlist.c:155 dirmngr/validate.c:1302
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:158 dirmngr/validate.c:1269
+#: sm/certlist.c:168 dirmngr/validate.c:1312
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1252
+#: sm/certlist.c:185 dirmngr/validate.c:1295
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1242
+#: sm/certlist.c:187 dirmngr/validate.c:1285
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1253
+#: sm/certlist.c:189 dirmngr/validate.c:1296
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:177 dirmngr/validate.c:1243
+#: sm/certlist.c:190 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certreqgen.c:465
+#: sm/certreqgen.c:469 sm/certreqgen.c:755
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "line %d: invalid algorithm\n"
 
-#: sm/certreqgen.c:481
+#: sm/certreqgen.c:485
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 
-#: sm/certreqgen.c:499
+#: sm/certreqgen.c:503
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "line %d: no subject name given\n"
 
-#: sm/certreqgen.c:508
+#: sm/certreqgen.c:512
 #, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
 msgstr "line %d: invalid subject name label ‘%.*s’\n"
 
-#: sm/certreqgen.c:511
+#: sm/certreqgen.c:515
 #, c-format
 msgid "line %d: invalid subject name '%s' at pos %d\n"
 msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 
-#: sm/certreqgen.c:528
+#: sm/certreqgen.c:532
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "line %d: not a valid email address\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:551
 #, c-format
 msgid "line %d: invalid serial number\n"
 msgstr "line %d: invalid serial number\n"
 
-#: sm/certreqgen.c:563
+#: sm/certreqgen.c:567
 #, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
 msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 
-#: sm/certreqgen.c:566
+#: sm/certreqgen.c:570
 #, c-format
 msgid "line %d: invalid issuer name '%s' at pos %d\n"
 msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 
-#: sm/certreqgen.c:578 sm/certreqgen.c:589
+#: sm/certreqgen.c:582 sm/certreqgen.c:593
 #, c-format
 msgid "line %d: invalid date given\n"
 msgstr "line %d: invalid date given\n"
 
-#: sm/certreqgen.c:602
+#: sm/certreqgen.c:606
 #, c-format
 msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:621
+#: sm/certreqgen.c:625
 #, c-format
 msgid "line %d: invalid hash algorithm given\n"
 msgstr "line %d: invalid hash algorithm given\n"
 
-#: sm/certreqgen.c:636
+#: sm/certreqgen.c:640
 #, c-format
 msgid "line %d: invalid authority-key-id\n"
 msgstr "line %d: invalid authority-key-id\n"
 
-#: sm/certreqgen.c:651
+#: sm/certreqgen.c:655
 #, c-format
 msgid "line %d: invalid subject-key-id\n"
 msgstr "line %d: invalid subject-key-id\n"
 
-#: sm/certreqgen.c:689
+#: sm/certreqgen.c:693
 #, c-format
 msgid "line %d: invalid extension syntax\n"
 msgstr "line %d: invalid extension syntax\n"
 
-#: sm/certreqgen.c:702
+#: sm/certreqgen.c:706
 #, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
 msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 
-#: sm/certreqgen.c:715
+#: sm/certreqgen.c:719
 #, c-format
 msgid "line %d: error getting key by keygrip '%s': %s\n"
 msgstr "line %d: error getting key by keygrip '%s': %s\n"
 
-#: sm/certreqgen.c:732
+#: sm/certreqgen.c:764
 #, c-format
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "line %d: key generation failed: %s <%s>\n"
 
-#: sm/certreqgen.c:1331
+#: sm/certreqgen.c:1480
 msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
@@ -8816,45 +8848,45 @@ msgstr ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
 
-#: sm/certreqgen-ui.c:159
+#: sm/certreqgen-ui.c:161
 #, c-format
 msgid "   (%d) Existing key\n"
 msgstr "   (%d) Existing key\n"
 
-#: sm/certreqgen-ui.c:160
+#: sm/certreqgen-ui.c:162
 #, c-format
 msgid "   (%d) Existing key from card\n"
 msgstr "   (%d) Existing key from card\n"
 
-#: sm/certreqgen-ui.c:318
+#: sm/certreqgen-ui.c:320
 #, c-format
 msgid "Possible actions for a %s key:\n"
 msgstr "Possible actions for a %s key:\n"
 
-#: sm/certreqgen-ui.c:319
+#: sm/certreqgen-ui.c:321
 #, c-format
 msgid "   (%d) sign, encrypt\n"
 msgstr "   (%d) sign, encrypt\n"
 
-#: sm/certreqgen-ui.c:320
+#: sm/certreqgen-ui.c:322
 #, c-format
 msgid "   (%d) sign\n"
 msgstr "   (%d) sign\n"
 
-#: sm/certreqgen-ui.c:321
+#: sm/certreqgen-ui.c:323
 #, c-format
 msgid "   (%d) encrypt\n"
 msgstr "   (%d) encrypt\n"
 
-#: sm/certreqgen-ui.c:345
+#: sm/certreqgen-ui.c:347
 msgid "Enter the X.509 subject name: "
 msgstr "Enter the X.509 subject name: "
 
-#: sm/certreqgen-ui.c:349
+#: sm/certreqgen-ui.c:351
 msgid "No subject name given\n"
 msgstr "No subject name given\n"
 
-#: sm/certreqgen-ui.c:353
+#: sm/certreqgen-ui.c:355
 #, c-format
 msgid "Invalid subject name label '%.*s'\n"
 msgstr "Invalid subject name label ‘%.*s’\n"
@@ -8864,89 +8896,89 @@ msgstr "Invalid subject name label ‘%.*s’\n"
 #. adjust it do the length of your translation.  The
 #. second string is merely passed to atoi so you can
 #. drop everything after the number.
-#: sm/certreqgen-ui.c:362
+#: sm/certreqgen-ui.c:364
 #, c-format
 msgid "Invalid subject name '%s'\n"
 msgstr "Invalid subject name ‘%s’\n"
 
-#: sm/certreqgen-ui.c:364
+#: sm/certreqgen-ui.c:366
 msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 
-#: sm/certreqgen-ui.c:376
+#: sm/certreqgen-ui.c:378
 msgid "Enter email addresses"
 msgstr "Enter email addresses"
 
-#: sm/certreqgen-ui.c:377
+#: sm/certreqgen-ui.c:379
 msgid " (end with an empty line):\n"
 msgstr " (end with an empty line):\n"
 
-#: sm/certreqgen-ui.c:381
+#: sm/certreqgen-ui.c:383
 msgid "Enter DNS names"
 msgstr "Enter DNS names"
 
-#: sm/certreqgen-ui.c:382 sm/certreqgen-ui.c:387
+#: sm/certreqgen-ui.c:384 sm/certreqgen-ui.c:389
 msgid " (optional; end with an empty line):\n"
 msgstr " (optional; end with an empty line):\n"
 
-#: sm/certreqgen-ui.c:386
+#: sm/certreqgen-ui.c:388
 msgid "Enter URIs"
 msgstr "Enter URIs"
 
-#: sm/certreqgen-ui.c:393
+#: sm/certreqgen-ui.c:395
 msgid "Create self-signed certificate? (y/N) "
 msgstr "Create self-signed certificate? (y/N) "
 
-#: sm/certreqgen-ui.c:420
+#: sm/certreqgen-ui.c:422
 msgid "These parameters are used:\n"
 msgstr "These parameters are used:\n"
 
-#: sm/certreqgen-ui.c:432
+#: sm/certreqgen-ui.c:434
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error creating temporary file: %s\n"
 
-#: sm/certreqgen-ui.c:438
+#: sm/certreqgen-ui.c:440
 msgid "Now creating self-signed certificate.  "
 msgstr "Now creating self-signed certificate.  "
 
-#: sm/certreqgen-ui.c:440
+#: sm/certreqgen-ui.c:442
 msgid "Now creating certificate request.  "
 msgstr "Now creating certificate request.  "
 
-#: sm/certreqgen-ui.c:441
+#: sm/certreqgen-ui.c:443
 msgid "This may take a while ...\n"
 msgstr "This may take a while ...\n"
 
-#: sm/certreqgen-ui.c:452
+#: sm/certreqgen-ui.c:454
 msgid "Ready.\n"
 msgstr "Ready.\n"
 
-#: sm/certreqgen-ui.c:455
+#: sm/certreqgen-ui.c:457
 msgid "Ready.  You should now send this request to your CA.\n"
 msgstr "Ready.  You should now send this request to your CA.\n"
 
-#: sm/certreqgen-ui.c:461
+#: sm/certreqgen-ui.c:463
 #, c-format
 msgid "resource problem: out of core\n"
 msgstr "resource problem: out of core\n"
 
-#: sm/decrypt.c:536
+#: sm/decrypt.c:893
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s encrypted data\n"
 
-#: sm/decrypt.c:803
+#: sm/decrypt.c:1165
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(this is the RC2 algorithm)\n"
 
-#: sm/decrypt.c:805
+#: sm/decrypt.c:1167
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(this does not seem to be an encrypted message)\n"
 
-#: sm/decrypt.c:958
+#: sm/decrypt.c:1325
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "encrypted to %s key %s\n"
@@ -8956,7 +8988,7 @@ msgstr "encrypted to %s key %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘%s’ not found: %s\n"
 
-#: sm/delete.c:122 sm/keydb.c:1189 sm/keydb.c:1288
+#: sm/delete.c:122 sm/keydb.c:1196 sm/keydb.c:1293
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -8976,128 +9008,128 @@ msgstr "certificate ‘%s’ deleted\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "deleting certificate “%s” failed: %s\n"
 
-#: sm/encrypt.c:331
+#: sm/encrypt.c:625
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:221
+#: sm/gpgsm.c:224
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:223
+#: sm/gpgsm.c:226
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:231
+#: sm/gpgsm.c:234
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:235
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:243
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:246
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:248
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:267
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:293
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:295
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:312
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:314
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:324
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:334
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:345
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:356
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:358
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:372
+#: sm/gpgsm.c:376
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:376
+#: sm/gpgsm.c:380
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:384
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:386
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:403
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:405
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:406
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:423
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:603
+#: sm/gpgsm.c:611
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:614
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9107,27 +9139,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:814
+#: sm/gpgsm.c:822
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Note: won't be able to encrypt to '%s': %s\n"
 
-#: sm/gpgsm.c:825
+#: sm/gpgsm.c:833
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:1666
+#: sm/gpgsm.c:1692
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1709
+#: sm/gpgsm.c:1735
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2063
+#: sm/gpgsm.c:2095
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9137,57 +9169,57 @@ msgstr "invalid command (there is no implicit command)\n"
 msgid "total number processed: %lu\n"
 msgstr "total number processed: %lu\n"
 
-#: sm/import.c:246
+#: sm/import.c:247
 #, c-format
 msgid "error storing certificate\n"
 msgstr "error storing certificate\n"
 
-#: sm/import.c:254
+#: sm/import.c:255
 #, c-format
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:472 sm/keydb.c:1209 sm/keydb.c:1300
+#: sm/import.c:473 sm/keydb.c:1214 sm/keydb.c:1305
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
 
-#: sm/import.c:531 sm/import.c:563
+#: sm/import.c:532 sm/import.c:564
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1440
+#: sm/import.c:753 tools/gpg-connect-agent.c:1440
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:1127
+#: sm/keydb.c:1134
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1139
+#: sm/keydb.c:1146
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1147
+#: sm/keydb.c:1154
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:1200
+#: sm/keydb.c:1205
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:1221 sm/keydb.c:1311
+#: sm/keydb.c:1226 sm/keydb.c:1316
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:711
+#: sm/keylist.c:719
 msgid "Error - "
 msgstr "Error - "
 
@@ -9223,7 +9255,7 @@ msgstr ""
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:215 sm/verify.c:686
+#: sm/qualified.c:215 sm/verify.c:711
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9243,54 +9275,59 @@ msgstr ""
 "“%s”\n"
 "Note, that this certificate will NOT create a qualified signature!"
 
-#: sm/sign.c:465
+#: sm/sign.c:715
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 
-#: sm/sign.c:508
+#: sm/sign.c:753
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hash algorithm used for signer %d: %s (%s)\n"
 
-#: sm/sign.c:560
+#: sm/sign.c:803
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/verify.c:463
+#: sm/sign.c:1019
+#, c-format
+msgid "%s/%s signature using %s key %s\n"
+msgstr "%s/%s signature using %s key %s\n"
+
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signature made "
 
-#: sm/verify.c:475
+#: sm/verify.c:490
 #, c-format
 msgid "[date not given]"
 msgstr "[date not given]"
 
-#: sm/verify.c:479
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "algorithm:"
 
-#: sm/verify.c:543
+#: sm/verify.c:568
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "invalid signature: message digest attribute does not match computed one\n"
 
-#: sm/verify.c:664
+#: sm/verify.c:689
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:665
+#: sm/verify.c:690
 #, c-format
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:683
+#: sm/verify.c:708
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9403,7 +9440,7 @@ msgstr "error fetching certificate by S/N: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1754 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1754 dirmngr/validate.c:484
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
@@ -9443,7 +9480,7 @@ msgstr "removing cache file ‘%s’\n"
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘%s’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2453
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
@@ -9672,154 +9709,154 @@ msgstr "S/N %s is valid, it is not listed in the CRL\n"
 msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1686 dirmngr/crlcache.c:1711
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1693 dirmngr/crlcache.c:1719
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964
+#: dirmngr/crlcache.c:1643 dirmngr/validate.c:976
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "unknown hash algorithm ‘%s’\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1650
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open for algorithm %d failed: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:500
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "update times of this CRL: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate not given; assuming a validity period of one day\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error inserting item into temporary cache file: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2095
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error checking validity of CRL issuer certificate: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2237
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2244
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2278
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2282
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problem removing stale temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2292
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2302
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2312
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2319
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2344
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2348
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "new CRL still too old; it expired on %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2373
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2384
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2435
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2467
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2481
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9828,12 +9865,12 @@ msgstr ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2541
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9841,55 +9878,55 @@ msgstr ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2547
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ERROR: This cached CRL may have been tampered with!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2572
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2590
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2621
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2624
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2671
+#: dirmngr/crlcache.c:2744
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2682
+#: dirmngr/crlcache.c:2755
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2728
+#: dirmngr/crlcache.c:2801
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -10066,135 +10103,135 @@ msgstr "absolute file name expected\n"
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:180
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:181
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:182
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:183
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:184
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:218
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:221
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|do not return more than N items in one query"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:229
 msgid "Network related options"
 msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:231
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for Keyservers"
 msgstr "Configuration for Keyservers"
 
-#: dirmngr/dirmngr.c:243
+#: dirmngr/dirmngr.c:246
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|use keyserver at URL"
 
-#: dirmngr/dirmngr.c:245
+#: dirmngr/dirmngr.c:248
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:251
 msgid "Configuration for HTTP servers"
 msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:253
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:252
+#: dirmngr/dirmngr.c:255
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:257
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:259
 msgid "use system's HTTP proxy setting"
 msgstr "use system's HTTP proxy setting"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:263
 msgid "Configuration of LDAP servers to use"
 msgstr "Configuration of LDAP servers to use"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "add new servers discovered in CRL distribution points to serverlist"
 
-#: dirmngr/dirmngr.c:277
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Configuration for OCSP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:296
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:308
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10204,11 +10241,11 @@ msgstr ""
 "(See the “info” manual for a complete listing of all commands and "
 "options)\n"
 
-#: dirmngr/dirmngr.c:461
+#: dirmngr/dirmngr.c:472
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:463
+#: dirmngr/dirmngr.c:474
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10216,103 +10253,103 @@ msgstr ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:543
+#: dirmngr/dirmngr.c:554
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:638 tools/gpgconf.c:706 tools/gpgconf.c:741
-#: tools/gpgconf.c:839
+#: dirmngr/dirmngr.c:649 tools/gpgconf.c:738 tools/gpgconf.c:773
+#: tools/gpgconf.c:871
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1337
+#: dirmngr/dirmngr.c:1374
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1573 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1610 dirmngr/server.c:1892
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1579 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1616 dirmngr/server.c:1898
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1725
+#: dirmngr/dirmngr.c:1764
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1785 dirmngr/dirmngr.c:1874
+#: dirmngr/dirmngr.c:1824 dirmngr/dirmngr.c:1913
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1852 tools/gpgconf-comp.c:3427
+#: dirmngr/dirmngr.c:1865 dirmngr/dirmngr.c:1891 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1887
+#: dirmngr/dirmngr.c:1926
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: garbage at end of line ignored\n"
 
-#: dirmngr/dirmngr.c:1956
+#: dirmngr/dirmngr.c:1995
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 
-#: dirmngr/dirmngr.c:1996
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2001
+#: dirmngr/dirmngr.c:2041
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2003
+#: dirmngr/dirmngr.c:2043
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2008
+#: dirmngr/dirmngr.c:2048
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2016
+#: dirmngr/dirmngr.c:2056
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2063
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/http.c:1996 dirmngr/ocsp.c:255
+#: dirmngr/http.c:2680 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3647 dirmngr/ocsp.c:229
+#: dirmngr/http.c:4408 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3653 dirmngr/ocsp.c:246
+#: dirmngr/http.c:4414 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3765
+#: dirmngr/http.c:4526
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
@@ -10482,204 +10519,204 @@ msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:524
+#: dirmngr/ocsp.c:582
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
+#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:587
+#: dirmngr/ocsp.c:642
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "no suitable certificate found to verify the OCSP response\n"
 
-#: dirmngr/ocsp.c:626 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:636
+#: dirmngr/ocsp.c:691
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "caller did not return the target certificate\n"
 
-#: dirmngr/ocsp.c:643
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "caller did not return the issuing certificate\n"
 
-#: dirmngr/ocsp.c:653
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:692
+#: dirmngr/ocsp.c:747
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:753
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:760
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:710
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:767
+#: dirmngr/ocsp.c:822
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error getting OCSP status for target certificate: %s\n"
 
-#: dirmngr/ocsp.c:792
+#: dirmngr/ocsp.c:847
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "certificate status is: %s  (this=%s  next=%s)\n"
 
-#: dirmngr/ocsp.c:793
+#: dirmngr/ocsp.c:848
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:799
+#: dirmngr/ocsp.c:854
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certificate has been revoked at: %s due to: %s\n"
 
-#: dirmngr/ocsp.c:834
+#: dirmngr/ocsp.c:889
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP responder returned a status in the future\n"
 
-#: dirmngr/ocsp.c:846
+#: dirmngr/ocsp.c:901
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP responder returned a non-current status\n"
 
-#: dirmngr/ocsp.c:861
+#: dirmngr/ocsp.c:916
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) failed: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2716 dirmngr/server.c:2731
+#: dirmngr/server.c:1454 dirmngr/server.c:1540 dirmngr/server.c:1977
+#: dirmngr/server.c:2048 dirmngr/server.c:2675 dirmngr/server.c:2690
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1583
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1595 dirmngr/server.c:1626 dirmngr/server.c:1786
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1734
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1767
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1794
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:3020
+#: dirmngr/server.c:3115
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:3031
+#: dirmngr/server.c:3126
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:3052
+#: dirmngr/server.c:3147
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3060
+#: dirmngr/server.c:3155
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "failed to the register commands with Assuan: %s\n"
 
-#: dirmngr/server.c:3093
+#: dirmngr/server.c:3188
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3112
+#: dirmngr/server.c:3207
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
 
-#: dirmngr/validate.c:238
+#: dirmngr/validate.c:239
 #, c-format
 msgid "accepting root CA not marked as a CA"
 msgstr "accepting root CA not marked as a CA"
 
-#: dirmngr/validate.c:264
+#: dirmngr/validate.c:265
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "CRL checking too deeply nested\n"
 
-#: dirmngr/validate.c:282
+#: dirmngr/validate.c:283
 msgid "not checking CRL for"
 msgstr "not checking CRL for"
 
-#: dirmngr/validate.c:287
+#: dirmngr/validate.c:288
 msgid "checking CRL for"
 msgstr "checking CRL for"
 
-#: dirmngr/validate.c:556
+#: dirmngr/validate.c:557
 #, c-format
 msgid "selfsigned certificate has a BAD signature"
 msgstr "selfsigned certificate has a BAD signature"
 
-#: dirmngr/validate.c:590
+#: dirmngr/validate.c:591
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "checking trustworthiness of root certificate failed: %s\n"
 
-#: dirmngr/validate.c:769
+#: dirmngr/validate.c:770
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "certificate chain is good\n"
 
-#: dirmngr/validate.c:1276
+#: dirmngr/validate.c:1319
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:112
 msgid "quiet"
 msgstr "quiet"
 
@@ -10841,63 +10878,63 @@ msgstr "check all programs"
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|list options"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|change options"
 
-#: tools/gpgconf.c:86
+#: tools/gpgconf.c:87
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|check options"
 
-#: tools/gpgconf.c:88
+#: tools/gpgconf.c:89
 msgid "apply global default values"
 msgstr "apply global default values"
 
-#: tools/gpgconf.c:90
+#: tools/gpgconf.c:91
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|update configuration files using FILE"
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:93
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "get the configuration directories for @GPGCONF@"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:95
 msgid "list global configuration file"
 msgstr "list global configuration file"
 
-#: tools/gpgconf.c:96
+#: tools/gpgconf.c:97
 msgid "check global configuration file"
 msgstr "check global configuration file"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "query the software version database"
 msgstr "query the software version database"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "reload all or a given component"
 msgstr "reload all or a given component"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "launch a given component"
 msgstr "launch a given component"
 
-#: tools/gpgconf.c:101
+#: tools/gpgconf.c:102
 msgid "kill a given component"
 msgstr "kill a given component"
 
-#: tools/gpgconf.c:109
+#: tools/gpgconf.c:110
 msgid "use as output file"
 msgstr "use as output file"
 
-#: tools/gpgconf.c:113
+#: tools/gpgconf.c:115
 msgid "activate changes at runtime, if possible"
 msgstr "activate changes at runtime, if possible"
 
-#: tools/gpgconf.c:157
+#: tools/gpgconf.c:161
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 
-#: tools/gpgconf.c:160
+#: tools/gpgconf.c:164
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10905,15 +10942,15 @@ msgstr ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:708 tools/gpgconf.c:743
+#: tools/gpgconf.c:740 tools/gpgconf.c:775
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
+#: tools/gpgconf.c:749 tools/gpgconf.c:799 tools/gpgconf.c:847
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:841
+#: tools/gpgconf.c:873
 msgid "No argument allowed"
 msgstr "No argument allowed"