Improved smartcard robustness.

1 files changed, 283 insertions, 282 deletions

diff --git a/po/fi.po b/po/fi.po
index d29df9f1a..f5786100d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -30,18 +30,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -50,7 +50,7 @@ msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -60,45 +60,45 @@ msgstr ""
 #. length of the 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -108,22 +108,22 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3262
+#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
+#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -164,7 +164,6 @@ msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
 #: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
-#: agent/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
@@ -177,7 +176,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -240,13 +239,13 @@ msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -319,8 +318,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -427,7 +426,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
 #: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
 #: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -451,142 +450,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
 #: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
 #: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
+#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
 #: g10/openfile.c:429 scd/scdaemon.c:989
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -603,55 +602,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Komennot:\n"
+" "
+
+#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Valitsimet:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
 
+#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -687,7 +707,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -697,21 +717,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -723,7 +743,7 @@ msgstr ""
 #. "%%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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -733,11 +753,11 @@ 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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -762,43 +782,43 @@ msgstr "muuta salasanaa"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1196,7 +1216,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
@@ -1206,7 +1226,7 @@ msgstr "tätä ei voi tehdä eräajossa\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
@@ -1518,18 +1538,18 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1824,27 +1844,19 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Komennot:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1973,17 +1985,6 @@ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:76 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Valitsimet:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
@@ -2408,7 +2409,7 @@ msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
@@ -3133,12 +3134,12 @@ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@ -3456,20 +3457,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3486,7 +3487,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -4290,12 +4291,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3133
+#: g10/keygen.c:3137
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4435,7 +4436,7 @@ msgstr "Halutun avaimen koko on %u bittiä\n"
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4451,7 +4452,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4467,40 +4468,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4508,12 +4509,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4524,7 +4525,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4542,44 +4543,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4590,7 +4591,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4605,23 +4606,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4629,12 +4630,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4646,7 +4647,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4658,50 +4659,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4710,12 +4711,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4723,7 +4724,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4731,26 +4732,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4810,45 +4811,45 @@ msgstr "     Avaimen sormenjälki ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
@@ -4898,7 +4899,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
@@ -4913,126 +4914,126 @@ msgstr "avainta \"%s\" ei löydy: %s\n"
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -5407,7 +5408,7 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
@@ -5438,7 +5439,12 @@ msgstr "käyttäjän peruma\n"
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei käsitelty"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5447,12 +5453,12 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6631,11 +6637,6 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "ei käsitelty"
-
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6666,40 +6667,40 @@ msgstr "ei voi avata tiedostoa: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -6729,58 +6730,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
 #: scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -6800,15 +6811,15 @@ msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6838,7 +6849,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
@@ -6847,11 +6858,11 @@ msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6873,115 +6884,105 @@ msgstr "muuta salasanaa"
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -7815,21 +7816,21 @@ msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7852,7 +7853,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7954,17 +7955,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"