Fixed some card related problems.

1 files changed, 136 insertions, 136 deletions

diff --git a/po/et.po b/po/et.po
index bdfd9f55e..0ead0d6c4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-12-09 12:09+0100\n"
+"POT-Creation-Date: 2008-12-12 08:55+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -92,8 +92,8 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3248
-#: g10/keygen.c:3281 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:3249
+#: g10/keygen.c:3282 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -102,12 +102,12 @@ msgstr "`%s' ei õnnestu luua: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: 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:2733
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2734
 #: g10/keyring.c:1536 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:1978
-#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
@@ -391,7 +391,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:180
+#: scd/scdaemon.c:241 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -408,30 +408,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:640
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:557 agent/protect-tool.c:1067 kbx/kbxutil.c:429
-#: scd/scdaemon.c:385 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:996
+#: scd/scdaemon.c:385 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:656 g10/gpg.c:2086 scd/scdaemon.c:466 sm/gpgsm.c:968
+#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:466 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
 
 #: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2090
-#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:929
+#: scd/scdaemon.c:471 sm/gpgsm.c:975 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "võtmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:479 sm/gpgsm.c:979
+#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:479 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
@@ -1130,7 +1130,7 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2924 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2925 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
@@ -1146,8 +1146,8 @@ msgid "Reset Code not or not anymore available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
 #: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1597
-#: g10/keygen.c:1664 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
+#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -1331,7 +1331,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
-#: g10/keygen.c:1601 g10/keygen.c:1629 g10/keygen.c:1703 g10/revoke.c:685
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -2004,7 +2004,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:536
+#: g10/gpg.c:845 sm/gpgsm.c:537
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2032,7 +2032,7 @@ msgstr "Pakkimine: "
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:675
+#: g10/gpg.c:1115 sm/gpgsm.c:676
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
@@ -2296,7 +2296,7 @@ msgstr "%s:%d: vigased ekspordi võtmed\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1386
+#: g10/gpg.c:2984 sm/gpgsm.c:1389
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
@@ -2337,11 +2337,11 @@ msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA šiffrit\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1458
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1466 sm/gpgsm.c:1472
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
@@ -2554,15 +2554,15 @@ msgstr "[failinimi]"
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:4271
+#: g10/gpg.c:4273
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4275
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4306
+#: g10/gpg.c:4308
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3381,20 +3381,20 @@ msgstr "allkirjastamine ebaõnnestus: %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:3623
+#: g10/keyedit.c:1142 g10/keygen.c:3624
 msgid "This key is not protected.\n"
 msgstr "See võti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3610 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3611 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3626
+#: g10/keyedit.c:1150 g10/keygen.c:3627
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3630
+#: g10/keyedit.c:1156 g10/keygen.c:3631
 msgid "Key is protected.\n"
 msgstr "Võti on kaitstud.\n"
 
@@ -3411,7 +3411,7 @@ msgstr ""
 "Sisestage sellele salajasele võtmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2163
+#: g10/keyedit.c:1207 g10/keygen.c:2164
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
@@ -4192,54 +4192,54 @@ msgstr "liiga palju `%c' eelistusi\n"
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:405
+#: g10/keygen.c:406
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:889
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:931
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:987
+#: g10/keygen.c:988
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1268 g10/keygen.c:1273 g10/keygen.c:1408
-#: g10/keygen.c:3123
+#: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
+#: g10/keygen.c:3124
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1163 g10/keygen.c:1279 g10/keygen.c:1414 g10/keygen.c:3129
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3130
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1305
+#: g10/keygen.c:1306
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1532
 #, fuzzy
 msgid "Encrypt"
 msgstr "krüpteeri andmed"
 
-#: g10/keygen.c:1534
+#: g10/keygen.c:1535
 msgid "Authenticate"
 msgstr ""
 
@@ -4253,109 +4253,109 @@ msgstr ""
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1552
+#: g10/keygen.c:1553
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1575
+#: g10/keygen.c:1576
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1579
+#: g10/keygen.c:1580
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1590
+#: g10/keygen.c:1591
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1593
+#: g10/keygen.c:1594
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1649 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1654
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1656
+#: g10/keygen.c:1657
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1658
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1659
+#: g10/keygen.c:1660
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1662
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:1730
+#: g10/keygen.c:1731
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1741
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1747 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1767 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud võtmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1772 g10/keygen.c:1777 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:1849
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4371,7 +4371,7 @@ msgstr ""
 "      <n>m = võti aegub n kuuga\n"
 "      <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:1859
+#: g10/keygen.c:1860
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4387,40 +4387,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1882
+#: g10/keygen.c:1883
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1888
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1905 g10/keygen.c:1930
+#: g10/keygen.c:1906 g10/keygen.c:1931
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1913
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1914
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1919
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1920
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1924
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4428,19 +4428,19 @@ msgstr ""
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1937
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:1961
+#: g10/keygen.c:1962
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1973
 #, fuzzy
 msgid ""
 "\n"
@@ -4456,44 +4456,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1991
+#: g10/keygen.c:1992
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2000
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2002
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei või alata numbriga\n"
 
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2026
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2032
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:2053
+#: g10/keygen.c:2054
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:2059
+#: g10/keygen.c:2060
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4504,7 +4504,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2064
+#: g10/keygen.c:2065
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 
@@ -4519,23 +4519,23 @@ msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2080
+#: g10/keygen.c:2081
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2091
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
-#: g10/keygen.c:2091
+#: g10/keygen.c:2092
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
-#: g10/keygen.c:2110
+#: g10/keygen.c:2111
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2150
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4543,12 +4543,12 @@ msgstr ""
 "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2164
+#: g10/keygen.c:2165
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2170
+#: g10/keygen.c:2171
 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"
@@ -4560,7 +4560,7 @@ msgstr ""
 "kasutades seda programmi võtmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2194
+#: g10/keygen.c:2195
 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"
@@ -4572,50 +4572,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3063 g10/keygen.c:3090
+#: g10/keygen.c:3064 g10/keygen.c:3091
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3295 g10/keygen.c:3462
+#: g10/keygen.c:3296 g10/keygen.c:3463
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku võtme faili `%s'\n"
 
-#: g10/keygen.c:3297 g10/keygen.c:3465
+#: g10/keygen.c:3298 g10/keygen.c:3466
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/keygen.c:3300 g10/keygen.c:3468
+#: g10/keygen.c:3301 g10/keygen.c:3469
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3450
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3456
+#: g10/keygen.c:3457
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3477
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3484
+#: g10/keygen.c:3485
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3511
+#: g10/keygen.c:3512
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3522
+#: g10/keygen.c:3523
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4625,48 +4625,48 @@ msgstr ""
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:3535 g10/keygen.c:3680 g10/keygen.c:3801
+#: g10/keygen.c:3536 g10/keygen.c:3681 g10/keygen.c:3802
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:3590 g10/keygen.c:3731 g10/sign.c:241
+#: g10/keygen.c:3591 g10/keygen.c:3732 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/keygen.c:3592 g10/keygen.c:3733 g10/sign.c:243
+#: g10/keygen.c:3593 g10/keygen.c:3734 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/keygen.c:3603 g10/keygen.c:3744
+#: g10/keygen.c:3604 g10/keygen.c:3745
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "MÄRKUS: v3 võtmetele alamvõtmete loomine ei ole OpenPGP ühilduv\n"
 
-#: g10/keygen.c:3644 g10/keygen.c:3777
+#: g10/keygen.c:3645 g10/keygen.c:3778
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon tõesti? "
 
-#: g10/keygen.c:3950
+#: g10/keygen.c:3951
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:3998
+#: g10/keygen.c:3999
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/keygen.c:4024
+#: g10/keygen.c:4025
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
-#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "mitte kunagi"
 
@@ -5947,49 +5947,49 @@ msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:189
+#: g10/sig-check.c:211
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:190
+#: g10/sig-check.c:212
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "avalik võti %08lX on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:223
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:225
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:235
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:248
 #, fuzzy, c-format
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: g10/sig-check.c:302
+#: g10/sig-check.c:324
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:567
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:617
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "võti %08lX: alamvõtme allkirjaga sidumiseks puudub alamvõti\n"
@@ -7625,12 +7625,12 @@ msgstr "|NIMI|kasuta šifri algoritmi NIMI"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: sm/gpgsm.c:515
+#: sm/gpgsm.c:516
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: sm/gpgsm.c:518
+#: sm/gpgsm.c:519
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7641,60 +7641,60 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: sm/gpgsm.c:610
+#: sm/gpgsm.c:611
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: sm/gpgsm.c:708
+#: sm/gpgsm.c:709
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:719
+#: sm/gpgsm.c:720
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:770
+#: sm/gpgsm.c:771
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:790
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:810
+#: sm/gpgsm.c:811
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " j = jäta see võti vahele\n"
 
-#: sm/gpgsm.c:1322
+#: sm/gpgsm.c:1325
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: sm/gpgsm.c:1403
+#: sm/gpgsm.c:1406
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1505
+#: sm/gpgsm.c:1508
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1543
+#: sm/gpgsm.c:1546
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1714
+#: sm/gpgsm.c:1717
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1869
+#: sm/gpgsm.c:1872
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""