Imported Upstream version 2.4.3

[platform/upstream/gpg2.git] / po / et.po

diff --git a/po/et.po b/po/et.po
index 1aaeebe..9b58304 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -6,55 +6,104 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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"
 "Language: et\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
-
-#. TRANSLATORS: These are labels for buttons etc used in
-#. Pinentries.  An underscore indicates that the next letter
-#. should be used as an accelerator.  Double the underscore for
-#. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#. TRANSLATORS: These are labels for buttons etc as used in
+#. * Pinentries.  In your translation copy the text before the
+#. * second vertical bar verbatim; translate only the following
+#. * text.  An underscore indicates that the next letter should be
+#. * used as an accelerator.  Double the underscore to have
+#. * pinentry display a literal underscore.
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
-msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
+msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "vigane parool"
 
+#: agent/call-pinentry.c:564
+msgid "Caps Lock is on"
+msgstr ""
+
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for generating a passphrase.
+#: agent/call-pinentry.c:1019
+msgid "Suggest"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the generate button.  Please use an appropriate
+#. string to describe what this is about.  The 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.  The strcmp thingy is there to detect a
+#. non-translated string.
+#: agent/call-pinentry.c:1041
+msgid "pinentry.genpin.tooltip"
+msgstr ""
+
+#. TRANSLATORS: This is a text shown by pinentry if the option
+#. for formatted passphrase is enabled.  The length is
+#. limited to about 900 characters.
+#: agent/call-pinentry.c:1069
+msgid "Note: The blanks are not part of the passphrase."
+msgstr ""
+
+#. 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:1128
+#, fuzzy
+msgid "Passphrase Not Allowed"
+msgstr "liiga pikk parool\n"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -64,548 +113,802 @@ msgstr ""
 #. 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:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+msgid "PIN:"
+msgstr ""
+
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
+#, fuzzy
+msgid "Passphrase:"
+msgstr "halb parool"
+
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "halb parool"
+
 #. 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:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
+msgid "Repeat:"
+msgstr ""
+
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
-msgstr "Lubamatu sümbol nimes\n"
+msgstr "Lubamatu sümbol nimes\n"
 
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "halb parool"
-
-#, fuzzy, c-format
-msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
-
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#: agent/command.c:826
+msgid "Note: Request from the web browser."
+msgstr ""
 
-#, c-format
-msgid "can't open `%s': %s\n"
-msgstr "`%s' ei õnnestu avada: %s\n"
+#: agent/command.c:827
+msgid "Note: Request from a remote site."
+msgstr ""
 
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#, c-format
-msgid "detected card with S/N: %s\n"
-msgstr ""
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuda parooli"
 
+#: agent/command.c:2908
 #, fuzzy, c-format
-msgid "error getting default authentication keyID of card: %s\n"
-msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: agent/command.c:3049
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
 
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
-msgid "no suitable card key found: %s\n"
-msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
+#, fuzzy, c-format
+#| msgid "can't create `%s': %s\n"
+msgid "can't create '%s': %s\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
+
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
+#: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
+#, fuzzy, c-format
+#| msgid "can't open `%s': %s\n"
+msgid "can't open '%s': %s\n"
+msgstr "`%s' ei õnnestu avada: %s\n"
+
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+msgid "no suitable card key found: %s\n"
+msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "error getting list of cards: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muuda parooli"
-
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-msgid "does not match - try again"
-msgstr ""
-
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
-msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
-
-msgid "Please insert the card with serial number"
-msgstr ""
-
-msgid "Please remove the current card and insert the one with serial number"
-msgstr ""
+msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+#: agent/divert-scd.c:176
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
+msgid "Use the reader's pinpad for input."
 msgstr ""
 
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Korrake parooli: "
 
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Korrake parooli: "
 
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Korrake parooli: "
 
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
-msgstr "parooli ei korratud õieti; proovige uuesti"
+msgstr "parooli ei korratud õieti; proovige uuesti"
 
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
-msgstr "parooli ei korratud õieti; proovige uuesti"
+msgstr "parooli ei korratud õieti; proovige uuesti"
 
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
-msgstr "parooli ei korratud õieti; proovige uuesti"
+msgstr "parooli ei korratud õieti; proovige uuesti"
 
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
+#: agent/genkey.c:155
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjutan faili `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Kasutan seda võtit ikka? "
-
+#: agent/genkey.c:213
 #, c-format
 msgid ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
-"at least %u character long."
-msgid_plural ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
-"at least %u characters long."
-msgstr[0] ""
-msgstr[1] ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
 
+#: agent/genkey.c:215
 #, c-format
 msgid ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-"contain at least %u digit or%%0Aspecial character."
-msgid_plural ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-"contain at least %u digits or%%0Aspecial characters."
-msgstr[0] ""
-msgstr[1] ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
 
-#, c-format
-msgid ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase may not be "
-"a known term or match%%0Acertain pattern."
+#: agent/genkey.c:227
+msgid "Yes, protection is not needed"
 msgstr ""
 
+#: agent/genkey.c:244
+#, fuzzy, c-format
+#| msgid "Name must be at least 5 characters long\n"
+msgid "A passphrase should be at least %u character long."
+msgid_plural "A passphrase should be at least %u characters long."
+msgstr[0] "Nimes peab olema vähemalt 5 sümbolit\n"
+msgstr[1] "Nimes peab olema vähemalt 5 sümbolit\n"
+
+#: agent/genkey.c:263
 #, c-format
-msgid ""
-"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
-msgstr ""
+msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+msgstr[1] ""
 
+#: agent/genkey.c:290
 #, c-format
-msgid ""
-"You have not entered a passphrase - this is in general a bad idea!%0APlease "
-"confirm that you do not want to have any protection on your key."
+msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-msgid "Yes, protection is not needed"
+#: agent/genkey.c:305
+msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
+#: agent/genkey.c:326
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Kasutan seda võtit ikka? "
+
+#: agent/genkey.c:494
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
-"Te vajate oma salajase võtme kaitsmiseks parooli.\n"
+"Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Võtmed:\n"
-" "
 
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-msgid "verbose"
-msgstr "ole jutukas"
-
-msgid "be somewhat more quiet"
-msgstr "ole mõnevõrra vaiksem"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
+msgid "do not detach from the console"
+msgstr ""
 
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-msgid "do not grab keyboard and mouse"
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
+msgid "verbose"
+msgstr "ole jutukas"
+
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
+msgid "be somewhat more quiet"
+msgstr "ole mõnevõrra vaiksem"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "otsi võtmeid võtmeserverist"
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
+msgid "Options controlling the configuration"
+msgstr ""
 
+#: agent/gpg-agent.c:207
 #, fuzzy
-msgid "use a standard location for the socket"
-msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
+msgid "do not use the SCdaemon"
+msgstr "uuenda usalduse andmebaasi"
 
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:211
+msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
+#: agent/gpg-agent.c:215
 #, fuzzy
-msgid "do not use the SCdaemon"
-msgstr "uuenda usalduse andmebaasi"
+#| msgid "|NAME|set terminal charset to NAME"
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NIMI|terminali kooditabel on NIMI"
 
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
+#: agent/gpg-agent.c:222
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:224
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:227
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:249
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:251
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:253
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
+#: agent/gpg-agent.c:257
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "ei ole toetatud"
+#: agent/gpg-agent.c:269
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "do not allow bypassing the passphrase policy"
+msgstr ""
+
+#: agent/gpg-agent.c:274
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:276
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:279
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
 
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "ei ole toetatud"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|kasuta parooli moodi N"
 
+#: agent/gpg-agent.c:285
 #, fuzzy
-msgid "disallow the use of an external password cache"
+msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-msgid "|FILE|write environment settings also to FILE"
+#: agent/gpg-agent.c:288
+msgid "Options controlling the PIN-Entry"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+#, fuzzy
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "kasuta gpg-agenti"
+
+#: agent/gpg-agent.c:292
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:297
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:301
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:305
+msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. 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:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
+#: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
+#: agent/gpg-agent.c:580
 #, fuzzy
-msgid "Usage: gpg-agent [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
+#: agent/gpg-agent.c:582
 msgid ""
-"Syntax: gpg-agent [options] [command [args]]\n"
-"Secret key management for GnuPG\n"
+"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
+"Secret key management for @GNUPG@\n"
 msgstr ""
 
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
-msgid "invalid debug-level `%s' given\n"
+msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
-msgid "%s is too old (need %s, have %s)\n"
-msgstr ""
+msgid "selected digest algorithm is invalid\n"
+msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
+#, fuzzy, c-format
+#| msgid "reading options from `%s'\n"
+msgid "reading options from '%s'\n"
+msgstr "loen võtmeid failist `%s'\n"
 
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "võtmete fail `%s': %s\n"
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
+#, fuzzy, c-format
+#| msgid "WARNING: \"%s\" is a deprecated option\n"
+msgid "Note: '%s' is not considered an option\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
-msgid "reading options from `%s'\n"
-msgstr "loen võtmeid failist `%s'\n"
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "viga `%s' loomisel: %s\n"
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "%s ei õnnestu luua: %s\n"
 
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
-
-msgid "name of socket too long\n"
+msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "can't create socket: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
-
+#: agent/gpg-agent.c:2280
 #, c-format
-msgid "socket name `%s' is too long\n"
+msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#, fuzzy
+#: agent/gpg-agent.c:2286
+#, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#, fuzzy
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
+#, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
-msgid "error binding socket to `%s': %s\n"
+msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, fuzzy, c-format
-msgid "listen() failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
-msgid "listening on socket `%s'\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+msgid "listening on socket '%s'\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
 
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, fuzzy, c-format
-msgid "directory `%s' created\n"
+#| msgid "can't create directory `%s': %s\n"
+msgid "can't create directory '%s': %s\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
+#: g10/openfile.c:402
+#, fuzzy, c-format
+msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
-msgid "stat() failed for `%s': %s\n"
-msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
+msgid "stat() failed for '%s': %s\n"
+msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
-msgid "can't use `%s' as home directory\n"
-msgstr "%s: kataloogi ei õnnestu luua: %s\n"
+msgid "can't use '%s' as home directory\n"
+msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
-msgid "pth_select failed: %s - waiting 1s\n"
-msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
-msgstr "%s: jätsin vahele: %s\n"
+msgstr "%s: jätsin vahele: %s\n"
 
-#, fuzzy
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
+#, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Võtmed:\n"
+" "
 
+#: agent/preset-passphrase.c:106
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
-"@Käsud:\n"
+"@Käsud:\n"
 " "
 
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 "@\n"
-"Võtmed:\n"
+"Võtmed:\n"
 " "
 
+#: agent/protect-tool.c:156
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
+#: agent/protect-tool.c:706 sm/import.c:776
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
+#: agent/protect-tool.c:711 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
+#: agent/protect-tool.c:722
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "halb parool"
-
-#, fuzzy
+#: agent/protect-tool.c:733
+#, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Katkesta"
 
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
-msgid "error opening `%s': %s\n"
+msgid "error opening '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
-msgid "file `%s', line %d: %s\n"
-msgstr "võtit '%s' ei leitud: %s\n"
+msgid "file '%s', line %d: %s\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
-#, c-format
-msgid "statement \"%s\" ignored in `%s', line %d\n"
-msgstr ""
+#: agent/trustlist.c:212 agent/trustlist.c:220
+#, fuzzy, c-format
+msgid "statement \"%s\" ignored in '%s', line %d\n"
+msgstr "viga lugemisel: %s\n"
 
+#: agent/trustlist.c:226
 #, fuzzy, c-format
-msgid "system trustlist `%s' not available\n"
-msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
+msgid "system trustlist '%s' not available\n"
+msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
+#: agent/trustlist.c:270
 #, fuzzy, c-format
-msgid "bad fingerprint in `%s', line %d\n"
+msgid "bad fingerprint in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#, c-format
-msgid "invalid keyflag in `%s', line %d\n"
-msgstr ""
+#: agent/trustlist.c:295 agent/trustlist.c:302
+#, fuzzy, c-format
+msgid "invalid keyflag in '%s', line %d\n"
+msgstr "viga: vigane sõrmejälg\n"
 
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
-msgid "error reading `%s', line %d: %s\n"
+msgid "error reading '%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: agent/trustlist.c:465 agent/trustlist.c:537
+#, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -617,16 +920,20 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
+#: common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -638,6 +945,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:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -647,1145 +955,2025 @@ 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:756
 msgid "Correct"
 msgstr ""
 
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuda parooli"
 
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
+
+#: agent/findkey.c:1790 agent/findkey.c:1804
+#, fuzzy
+msgid "Delete key"
+msgstr "luba võti"
+
+#: agent/findkey.c:1801
+msgid ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key might remove your ability to access remote machines."
+msgstr ""
+
+#: agent/pksign.c:174 g10/seskey.c:286 sm/certcheck.c:91
+#, c-format
+msgid "DSA requires the hash length to be a multiple of 8 bits\n"
+msgstr ""
+
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: agent/pksign.c:200
+#, c-format
+msgid "a %zu bit hash is not valid for a %u bit %s key\n"
+msgstr ""
+
+#: agent/pksign.c:573
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: agent/cvt-openpgp.c:337
+#, c-format
+msgid "secret key parts are not available\n"
+msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
+
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
+#, fuzzy, c-format
+#| msgid "protection algorithm %d%s is not supported\n"
+msgid "public key algorithm %d (%s) is not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: agent/cvt-openpgp.c:493
+#, fuzzy, c-format
+#| msgid "protection algorithm %d%s is not supported\n"
+msgid "protection algorithm %d (%s) is not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: agent/cvt-openpgp.c:500
+#, fuzzy, c-format
+#| msgid "protection algorithm %d%s is not supported\n"
+msgid "protection hash algorithm %d (%s) is not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
+#: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
+#: common/exechelp-w32.c:472 common/exechelp-w32.c:496
+#: common/exechelp-w32.c:526
 #, fuzzy, c-format
-msgid "can't fdopen pipe for reading: %s\n"
-msgstr "faili ei õnnestu avada: %s\n"
+msgid "error creating a stream for a pipe: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
-msgid "error getting exit code of process %d: %s\n"
-msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "error running '%s': probably not installed\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
-msgid "error running `%s': exit status %d\n"
+msgid "error running '%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#, c-format
-msgid "error running `%s': probably not installed\n"
-msgstr ""
-
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
-msgid "error running `%s': terminated\n"
+msgid "error running '%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
-msgid "error creating socket: %s\n"
-msgstr "viga `%s' loomisel: %s\n"
-
-#, fuzzy
-msgid "host not found"
-msgstr "[Kasutaja id puudub]"
-
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
+#: common/exechelp-w32.c:832
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-msgid "communication problem with gpg-agent\n"
-msgstr "probleem gpg-agent programmiga suhtlemisel\n"
+#: common/simple-pwquery.c:261
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to '%s': %s\n"
+msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#, fuzzy
+#: common/simple-pwquery.c:271
+#, fuzzy, c-format
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#, fuzzy
-msgid "canceled by user\n"
-msgstr "katkestatud kasutaja poolt\n"
-
-#, fuzzy
-msgid "problem with the agent\n"
-msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-
+#: common/sysutils.c:176
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
+msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
 
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
+msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
+
+#: common/sysutils.c:885
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: common/sysutils.c:911
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "jah"
 
+#: common/yesno.c:46 common/yesno.c:87
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
 msgid "no"
 msgstr "ei"
 
+#: common/yesno.c:49 common/yesno.c:88
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
 msgid "quit"
-msgstr "välju"
+msgstr "välju"
 
+#: common/yesno.c:89
 msgid "qQ"
 msgstr "vV"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
 msgid "cancel|cancel"
 msgstr ""
 
+#: common/yesno.c:126
 msgid "oO"
 msgstr ""
 
+#: common/yesno.c:127
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
+#: common/miscellaneous.c:86
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
+#: common/miscellaneous.c:89
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-msgid "no running gpg-agent - starting one\n"
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: common/miscellaneous.c:154
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: common/miscellaneous.c:157
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+
+#: common/miscellaneous.c:706
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
+#: common/asshelp.c:342
+#, fuzzy, c-format
+msgid "waiting for the dirmngr to come up ... (%ds)\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: common/asshelp.c:344
+#, fuzzy, c-format
+msgid "waiting for the keyboxd to come up ... (%ds)\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: common/asshelp.c:345
+#, fuzzy, c-format
+msgid "waiting for the agent to come up ... (%ds)\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: common/asshelp.c:358
+#, fuzzy, c-format
+msgid "connection to the dirmngr established\n"
+msgstr "seda ei saa teha pakettmoodis\n"
+
+#: common/asshelp.c:360
+#, fuzzy, c-format
+msgid "connection to the keyboxd established\n"
+msgstr "seda ei saa teha pakettmoodis\n"
+
+#: common/asshelp.c:361
+#, fuzzy, c-format
+msgid "connection to the agent established\n"
+msgstr "seda ei saa teha pakettmoodis\n"
+
+#: common/asshelp.c:479
+#, fuzzy, c-format
+msgid "no running %s - starting '%s'\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: common/asshelp.c:582
+#, fuzzy, c-format
+msgid "connection to the agent is in restricted mode\n"
+msgstr "seda ei saa teha pakettmoodis\n"
+
+#: common/asshelp.c:719
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error getting version from '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: common/asshelp.c:725
 #, c-format
-msgid "waiting %d seconds for the agent to come up\n"
+msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-msgid "can't connect to the agent - trying fall back\n"
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
+#, fuzzy, c-format
+#| msgid "WARNING: %s overrides %s\n"
+msgid "WARNING: %s\n"
+msgstr "HOIATUS: %s määrab üle %s\n"
+
+#: common/asshelp.c:734
+#, c-format
+msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
+#: common/asshelp.c:736
+#, fuzzy, c-format
+#| msgid "Please use the command \"toggle\" first.\n"
+msgid "Note: Use the command \"%s\" to restart them.\n"
+msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
+
 #. TRANSLATORS: Copy the prefix between the vertical bars
 #. verbatim.  It will not be printed.
+#: common/audit.c:474
 msgid "|audit-log-result|Good"
 msgstr ""
 
+#: common/audit.c:477
 msgid "|audit-log-result|Bad"
 msgstr ""
 
+#: common/audit.c:479
 msgid "|audit-log-result|Not supported"
 msgstr ""
 
+#: common/audit.c:481
 #, fuzzy
 msgid "|audit-log-result|No certificate"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:483
 #, fuzzy
 msgid "|audit-log-result|Not enabled"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:485
 msgid "|audit-log-result|Error"
 msgstr ""
 
+#: common/audit.c:487
 #, fuzzy
 msgid "|audit-log-result|Not used"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:489
 #, fuzzy
 msgid "|audit-log-result|Okay"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:491
 #, fuzzy
 msgid "|audit-log-result|Skipped"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:493
 #, fuzzy
 msgid "|audit-log-result|Some"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:726
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:733
 #, fuzzy
 msgid "root certificate missing"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:759
 msgid "Data encryption succeeded"
 msgstr ""
 
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
 #, fuzzy
 msgid "Data available"
-msgstr "Võtme leiate: "
+msgstr "Võtme leiate: "
 
+#: common/audit.c:767
 #, fuzzy
 msgid "Session key created"
-msgstr "%s: võtmehoidla on loodud\n"
+msgstr "%s: võtmehoidla on loodud\n"
 
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "pakend: %s\n"
 
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
+#: common/audit.c:778 common/audit.c:925
 #, fuzzy
 msgid "seems to be not encrypted"
-msgstr "krüptimata"
+msgstr "krüptimata"
 
+#: common/audit.c:784 common/audit.c:933
 msgid "Number of recipients"
 msgstr ""
 
+#: common/audit.c:792 common/audit.c:956
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
+#: common/audit.c:825
 msgid "Data signing succeeded"
 msgstr ""
 
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
 #, fuzzy, c-format
 msgid "data hash algorithm: %s"
-msgstr "vigane räsialgoritm `%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
 
+#: common/audit.c:862
 #, fuzzy, c-format
 msgid "Signer %d"
 msgstr "Allkiri aegus %s\n"
 
+#: common/audit.c:866 common/audit.c:1065
 #, fuzzy, c-format
 msgid "attr hash algorithm: %s"
-msgstr "vigane räsialgoritm `%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
 
+#: common/audit.c:901
 msgid "Data decryption succeeded"
 msgstr ""
 
+#: common/audit.c:910
 #, fuzzy
 msgid "Encryption algorithm supported"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
+#: common/audit.c:993
 #, fuzzy
 msgid "Data verification succeeded"
-msgstr "allkirja kontroll jäeti ära\n"
+msgstr "allkirja kontroll jäeti ära\n"
 
+#: common/audit.c:1002
 #, fuzzy
 msgid "Signature available"
 msgstr "Allkiri aegus %s\n"
 
+#: common/audit.c:1024
 #, fuzzy
 msgid "Parsing data succeeded"
 msgstr "Korrektne allkiri kasutajalt \""
 
+#: common/audit.c:1036
 #, fuzzy, c-format
 msgid "bad data hash algorithm: %s"
-msgstr "vigane räsialgoritm `%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
 
+#: common/audit.c:1051
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Allkiri aegus %s\n"
 
+#: common/audit.c:1079
 #, fuzzy
 msgid "Certificate chain valid"
-msgstr "See võti on aegunud!"
+msgstr "See võti on aegunud!"
 
+#: common/audit.c:1090
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
-msgstr "Võtme leiate: "
+msgstr "Võtme leiate: "
 
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "halb sertifikaat"
 
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tundmatu versioon"
 
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
+#: common/audit.c:1309
 #, fuzzy, c-format
-msgid "No help available for `%s'."
+msgid "No help available for '%s'."
 msgstr "`%s' kohta abiinfo puudub"
 
+#: common/helpfile.c:90
 #, fuzzy
 msgid "ignoring garbage line"
-msgstr "viga lõpetaval real\n"
+msgstr "viga lõpetaval real\n"
 
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "tundmatu"
 
+#: common/ksba-io-support.c:365
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
+
+#: common/ttyio.c:447
+#, c-format
+msgid "Sorry, we are in batchmode - can't get input\n"
+msgstr ""
+
+#: common/ttyio.c:453
+#, c-format
+msgid "Sorry, no terminal at all requested - can't get input\n"
+msgstr ""
+
+#: common/ttyio.c:488 common/ttyio.c:498
+#, c-format
+msgid "too many errors; giving up\n"
+msgstr ""
+
+#: common/ttyio.c:550
+#, c-format
+msgid "Control-D detected\n"
+msgstr ""
+
+#: common/utf8conv.c:127
+#, fuzzy, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: common/utf8conv.c:135
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "faili ei õnnestu avada: %s\n"
+
+#: common/utf8conv.c:387 common/utf8conv.c:653
+#, fuzzy, c-format
+msgid "conversion from '%s' to '%s' failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: common/dotlock.c:723
+#, fuzzy, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: common/dotlock.c:785 common/homedir.c:178
+#, fuzzy, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: common/dotlock.c:1160
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: common/dotlock.c:1197
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: common/dotlock.c:1198
+msgid "(deadlock?) "
+msgstr ""
+
+#: common/dotlock.c:1237
+#, fuzzy, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "ei leia avalikku võtit %08lX: %s\n"
+
+#: common/dotlock.c:1264
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
+#, c-format
+msgid "%s is too old (need %s, have %s)\n"
+msgstr ""
+
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
+#: g10/armor.c:483
+#, c-format
 msgid "invalid armor header: "
-msgstr "vigane pakendi päis: "
+msgstr "vigane pakendi päis: "
 
+#: g10/armor.c:494
+#, c-format
 msgid "armor header: "
-msgstr "pakendi päis: "
+msgstr "pakendi päis: "
 
+#: g10/armor.c:509
+#, c-format
 msgid "invalid clearsig header\n"
-msgstr "vigane avateksti allkirja päis\n"
+msgstr "vigane avateksti allkirja päis\n"
 
-#, fuzzy
+#: g10/armor.c:522
+#, fuzzy, c-format
 msgid "unknown armor header: "
-msgstr "pakendi päis: "
+msgstr "pakendi päis: "
 
+#: g10/armor.c:582
+#, c-format
 msgid "nested clear text signatures\n"
-msgstr "avateksti allkirjad üksteise sees\n"
+msgstr "avateksti allkirjad üksteise sees\n"
 
-#, fuzzy
+#: g10/armor.c:727
+#, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
+#: g10/armor.c:740
+#, c-format
 msgid "invalid dash escaped line: "
-msgstr "vigane kriipsudega märgitud rida: "
+msgstr "vigane kriipsudega märgitud rida: "
 
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
+msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
 
+#: g10/armor.c:1076
+#, c-format
 msgid "premature eof (no CRC)\n"
-msgstr "enneaegne faililõpp (puudub CRC)\n"
+msgstr "enneaegne faililõpp (puudub CRC)\n"
 
+#: g10/armor.c:1110
+#, c-format
 msgid "premature eof (in CRC)\n"
-msgstr "enneaegne faililõpp (poolik CRC)\n"
+msgstr "enneaegne faililõpp (poolik CRC)\n"
 
+#: g10/armor.c:1118
+#, c-format
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#, fuzzy
+#: g10/armor.c:1142
+#, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
-msgstr "enneaegne faililõpp (lõpetaval real)\n"
+msgstr "enneaegne faililõpp (lõpetaval real)\n"
 
+#: g10/armor.c:1146
+#, c-format
 msgid "error in trailer line\n"
-msgstr "viga lõpetaval real\n"
+msgstr "viga lõpetaval real\n"
 
+#: g10/armor.c:1552
+#, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "vigane pakend: rida on pikem, kui %d sümbolit\n"
+msgstr "vigane pakend: rida on pikem, kui %d sümbolit\n"
 
+#: g10/armor.c:1566
+#, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"kvooditud sümbol pakendis - tõenäoliselt on kasutatud vigast MTA programmi\n"
+"kvooditud sümbol pakendis - tõenäoliselt on kasutatud vigast MTA programmi\n"
+
+#: g10/build-packet.c:1492
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "pole inimese poolt loetav"
 
+#: g10/build-packet.c:1544
+#, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
-"ning lõpus peab olema '='\n"
+"noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
+"ning lõpus peab olema '='\n"
 
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
+#, c-format
 msgid "a user notation name must contain the '@' character\n"
-msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
-#, fuzzy
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
+#, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
-msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
+#: g10/build-packet.c:1580
+#, c-format
 msgid "a notation value must not use any control characters\n"
-msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
+msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
+
+#: g10/build-packet.c:1636
+#, fuzzy, c-format
+msgid "a notation name may not contain an '=' character\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
+#: g10/build-packet.c:1642
+#, fuzzy, c-format
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
+"ning lõpus peab olema '='\n"
+
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
+#, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-msgid "not human readable"
-msgstr "pole inimese poolt loetav"
+#: g10/call-agent.c:155 sm/call-agent.c:214
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr ""
+
+#: g10/call-agent.c:181
+msgid "Enter passphrase: "
+msgstr "Sisestage parool: "
+
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
+#, fuzzy, c-format
+#| msgid "%s does not yet work with %s\n"
+msgid "%s is not compliant with %s mode\n"
+msgstr "%s ei tööta veel koos %s-ga\n"
+
+#: g10/call-agent.c:1088
+#, fuzzy, c-format
+msgid "error from TPM: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
+#, fuzzy, c-format
+msgid "problem with the agent: %s\n"
+msgstr "probleem agendiga: agent tagastas 0x%lx\n"
+
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
+#, fuzzy, c-format
+msgid "no dirmngr running in this session\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: g10/call-dirmngr.c:212
+#, fuzzy, c-format
+#| msgid "you may not use %s while in %s mode\n"
+msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/call-dirmngr.c:410
+msgid "WKD uses a cached result"
+msgstr ""
+
+#: g10/call-dirmngr.c:413
+msgid "Tor is not running"
+msgstr ""
+
+#: g10/call-dirmngr.c:415
+#, fuzzy
+msgid "Tor is not properly configured"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: g10/call-dirmngr.c:417
+#, fuzzy
+msgid "DNS is not properly configured"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: g10/call-dirmngr.c:419
+msgid "unacceptable HTTP redirect from server"
+msgstr ""
+
+#: g10/call-dirmngr.c:421
+msgid "unacceptable HTTP redirect from server was cleaned up"
+msgstr ""
+
+#: g10/call-dirmngr.c:423
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "server uses an invalid certificate"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
+#, fuzzy, c-format
+#| msgid "armor: %s\n"
+msgid "Note: %s\n"
+msgstr "pakend: %s\n"
 
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "salajane võti ei ole kättesaadav"
+msgstr "salajane võti ei ole kättesaadav"
 
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#, fuzzy
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
+#, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#, fuzzy
+#: g10/card-util.c:105 tools/gpg-card.c:2978
+#, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
-msgstr "See käsklus ei ole %s moodis lubatud.\n"
+msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#, fuzzy
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
+#, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
-msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
+msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
+#: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Teie valik? "
 
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "[not set]"
 msgstr ""
 
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+#: g10/card-util.c:591 tools/gpg-card.c:923
+msgid "Mr."
+msgstr ""
 
-#, fuzzy
-msgid "unspecified"
-msgstr "Põhjus puudub"
+#: g10/card-util.c:592 tools/gpg-card.c:924
+msgid "Ms."
+msgstr ""
 
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
-msgstr "ei töödeldud"
+msgstr "ei töödeldud"
 
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
-msgstr "vastavat avalikku võtit pole: %s\n"
-
-#, c-format
-msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "vastavat avalikku võtit pole: %s\n"
 
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
-
-#, c-format
-msgid "error reading `%s': %s\n"
+#| msgid "error reading `%s': %s\n"
+msgid "error reading '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
-msgid "error writing `%s': %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "error writing '%s': %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#, c-format
-msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr ""
-
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#, c-format
-msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr ""
-
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#, fuzzy
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
+#, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
-msgstr "lubamatu sümbol eelistuste sõnes\n"
+msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#, fuzzy
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
+#, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
-msgstr "lubamatu sümbol eelistuste sõnes\n"
+msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-msgid "Sex ((M)ale, (F)emale or space): "
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
+msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
-msgstr "viga: vigane sõrmejälg\n"
+msgstr "viga: vigane sõrmejälg\n"
 
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
-msgstr "näita sõrmejälge"
+msgstr "näita sõrmejälge"
 
-#, fuzzy
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
+#, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "viga: vigane sõrmejälg\n"
+msgstr "viga: vigane sõrmejälg\n"
 
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Võtme genereerimine ebaõnnestus: %s\n"
+msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
-msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 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"
-"      documentation of your card to see what sizes are allowed.\n"
+"Note: There is no guarantee that the card supports the requested\n"
+"      key type or size.  If the key generation does not succeed,\n"
+"      please check the documentation of your card to see which\n"
+"      key types and sizes are supported.\n"
 msgstr ""
 
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
-msgid "What keysize do you want for the Signature key? (%u) "
-msgstr "Millist võtmepikkust te soovite? (1024) "
-
-#, fuzzy, c-format
-msgid "What keysize do you want for the Encryption key? (%u) "
-msgstr "Millist võtmepikkust te soovite? (1024) "
-
-#, fuzzy, c-format
-msgid "What keysize do you want for the Authentication key? (%u) "
-msgstr "Millist võtmepikkust te soovite? (1024) "
+msgid "What keysize do you want? (%u) "
+msgstr "Millist võtmepikkust te soovite? (1024) "
 
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
+#: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "ümardatud üles %u bitini\n"
+msgstr "ümardatud üles %u bitini\n"
 
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
+#: g10/card-util.c:1479
+msgid "Changing card key attribute for: "
+msgstr ""
+
+#: g10/card-util.c:1481
+#, fuzzy
+msgid "Signature key\n"
+msgstr "Allkiri aegus %s\n"
+
+#: g10/card-util.c:1483
+#, fuzzy
+msgid "Encryption key\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/card-util.c:1485
+msgid "Authentication key\n"
+msgstr ""
+
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
+msgid "Please select what kind of key you want:\n"
+msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
+
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
+
+#: g10/card-util.c:1489
+#, fuzzy, c-format
+msgid "   (%d) ECC\n"
+msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
+
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
+msgid "Invalid selection.\n"
+msgstr "Vigane valik.\n"
+
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
+#: g10/card-util.c:1582
+#, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#: g10/card-util.c:1618
 #, fuzzy, c-format
-msgid "error changing size of key %d to %u bits: %s\n"
+msgid "error changing key attribute for key %d: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
+#, fuzzy, c-format
+msgid "error getting card info: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
+#, fuzzy, c-format
+#| msgid "This command is not allowed while in %s mode.\n"
+msgid "This command is not supported by this card\n"
+msgstr "See käsklus ei ole %s moodis lubatud.\n"
+
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#, fuzzy
-msgid "NOTE: keys are already stored on the card!\n"
-msgstr "jätsin vahele: avalik võti on juba olemas\n"
+#: g10/card-util.c:1700
+#, fuzzy, c-format
+msgid "Note: keys are already stored on the card!\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
-"   PIN = `%s'     Admin PIN = `%s'\n"
+"   PIN = '%s'     Admin PIN = '%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
 
+#: g10/card-util.c:1750
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
-msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
+msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-msgid "Invalid selection.\n"
-msgstr "Vigane valik.\n"
-
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
-msgstr "Palun valige tühistamise põhjus:\n"
+msgstr "Palun valige tühistamise põhjus:\n"
 
-#, fuzzy
-msgid "unknown key protection algorithm\n"
-msgstr "tundmatu kaitsealgoritm\n"
+#: g10/card-util.c:1898
+#, fuzzy, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, fuzzy
-msgid "secret parts of key are not available\n"
-msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
+#, fuzzy, c-format
+msgid "Note: This command destroys all keys stored on the card!\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
-msgid "secret key already stored on a card\n"
-msgstr "jätsin vahele: avalik võti on juba olemas\n"
+msgid "Continue? (y/N) "
+msgstr "Allkirjastan tõesti? "
+
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr ""
+
+#: g10/card-util.c:2209
+#, fuzzy, c-format
+msgid "error for setup KDF: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
+#: g10/card-util.c:2255
 #, fuzzy, c-format
-msgid "error writing key to card: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "error for setup UIF: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
-msgstr "välju sellest menüüst"
+msgstr "välju sellest menüüst"
 
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
-msgstr "vastuolulised käsud\n"
+msgstr "vastuolulised käsud\n"
 
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
-msgstr "näita seda abiinfot"
+msgstr "näita seda abiinfot"
 
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
-msgstr "Võtme leiate: "
+msgstr "Võtme leiate: "
 
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
-msgstr "muuda aegumise kuupäeva"
+msgstr "muuda aegumise kuupäeva"
 
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-msgid "change card holder's sex"
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
+msgid "change card holder's salutation"
 msgstr ""
 
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
-msgstr "näita sõrmejälge"
+msgstr "näita sõrmejälge"
 
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
-msgstr "genereeri uus võtmepaar"
+msgstr "genereeri uus võtmepaar"
 
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
+msgid "destroy all keys and data"
+msgstr ""
+
+#: g10/card-util.c:2302
+#, fuzzy
+#| msgid "|NAME|use NAME as default recipient"
+msgid "setup KDF for PIN authentication (on/single/off)"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#: g10/card-util.c:2303
+#, fuzzy
+#| msgid "change the ownertrust"
+msgid "change the key attribute"
+msgstr "muuda omaniku usaldust"
+
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
+#, fuzzy
+#| msgid "change the ownertrust"
+msgid "change the User Interaction Flag"
+msgstr "muuda omaniku usaldust"
+
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
-msgstr "vastuolulised käsud\n"
+msgstr "vastuolulised käsud\n"
 
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
-msgstr "vastuolulised käsud\n"
+msgstr "vastuolulised käsud\n"
 
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
 
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
+#, c-format
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Vigane käsklus (proovige \"help\")\n"
+msgstr "Vigane käsklus (proovige \"help\")\n"
 
+#: g10/decrypt.c:186 g10/encrypt.c:1234
+#, c-format
 msgid "--output doesn't work for this command\n"
-msgstr "võti --output ei tööta selle käsuga\n"
+msgstr "võti --output ei tööta selle käsuga\n"
 
-#, c-format
-msgid "can't open `%s'\n"
-msgstr "`%s' ei õnnestu avada\n"
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
+#, fuzzy, c-format
+#| msgid "can't open `%s'\n"
+msgid "can't open '%s'\n"
+msgstr "`%s' ei õnnestu avada\n"
 
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "võtit '%s' ei leitud: %s\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "viga võtmebloki lugemisel: %s\n"
+msgstr "viga võtmebloki lugemisel: %s\n"
 
-msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
+#: g10/delkey.c:148
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
-#, fuzzy
+#: g10/delkey.c:158 g10/delkey.c:171
+#, fuzzy, c-format
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "pakettmoodis ei õnnestu seda teha võtmeta \"--yes\"\n"
+msgstr "pakettmoodis ei õnnestu seda teha võtmeta \"--yes\"\n"
+
+#: g10/delkey.c:165 g10/delkey.c:172
+#, c-format
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
+
+#: g10/delkey.c:182
+msgid "Note: The public primary key and all its subkeys will be deleted.\n"
+msgstr ""
+
+#: g10/delkey.c:187
+msgid "Note: Only the shown public subkey will be deleted.\n"
+msgstr ""
+
+#: g10/delkey.c:192
+msgid "Note: Only the secret part of the shown primary key will be deleted.\n"
+msgstr ""
+
+#: g10/delkey.c:197
+msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
+msgstr ""
 
+#: g10/delkey.c:206
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Kustutan selle võtme võtmehoidlast? "
+msgstr "Kustutan selle võtme võtmehoidlast? "
 
+#: g10/delkey.c:216
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "See on salajane võti! - kas kustutan tõesti? "
-
-#, c-format
-msgid "deleting keyblock failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+msgstr "See on salajane võti! - kas kustutan tõesti? "
 
-msgid "ownertrust information cleared\n"
-msgstr "omaniku usalduse info puhastatud\n"
+#: g10/delkey.c:263
+#, fuzzy, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "avaliku võtme \"%s\" jaoks on salajane võti!\n"
+#: g10/delkey.c:265
+msgid "key"
+msgstr "key"
 
-msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
+#: g10/delkey.c:265
+#, fuzzy
+#| msgid "Pubkey: "
+msgid "subkey"
+msgstr "Avalik võti: "
 
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
-msgid "error creating passphrase: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
+msgid "update failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
 
+#: g10/delkey.c:308
 #, c-format
-msgid "using cipher %s\n"
-msgstr "kasutan ¨iffrit %s\n"
+msgid "deleting keyblock failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
+#: g10/delkey.c:322
 #, c-format
-msgid "`%s' already compressed\n"
-msgstr "`%s' on juba pakitud\n"
+msgid "ownertrust information cleared\n"
+msgstr "omaniku usalduse info puhastatud\n"
 
+#: g10/delkey.c:359
 #, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "HOIATUS: `%s' on tühi fail\n"
-
-msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr ""
-"RSA võtmeid pikkusega kuni 2048 bitti saab krüpteerida ainult --pgp2 moodis\n"
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "avaliku võtme \"%s\" jaoks on salajane võti!\n"
 
+#: g10/delkey.c:361
 #, c-format
-msgid "reading from `%s'\n"
-msgstr "loen failist `%s'\n"
-
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "kõikide krüpteeritavate võtmetega ei saa IDEA ¨iffrit kasutada.\n"
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
 
+#: g10/encrypt.c:109
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"sümmetrilise ¨ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+"sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
+#: g10/encrypt.c:136 g10/encrypt.c:683
 #, fuzzy, c-format
-msgid ""
-"WARNING: forcing compression algorithm %s (%d) violates recipient "
-"preferences\n"
-msgstr ""
-"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
 #, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid "(use option \"%s\" to override)\n"
 msgstr ""
-"sümmetrilise ¨ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
-
-#, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%s ei ole moodis %s lubatud.\n"
 
-#, c-format
-msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s krüpteeritud andmed\n"
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, fuzzy, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "krüpteeritud tundmatu algoritmiga %d\n"
+msgid "error creating passphrase: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
-msgid ""
-"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "HOIATUS: teade on krüptitud sümmeetrilise ¨ifri nõrga võtmega.\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "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 "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
 
-msgid "problem handling encrypted packet\n"
-msgstr "probleem krüptitud paketi käsitlemisel\n"
+#: g10/encrypt.c:514
+#, fuzzy, c-format
+#| msgid "using cipher %s\n"
+msgid "using cipher %s.%s\n"
+msgstr "kasutan šiffrit %s\n"
 
-msgid "no remote program execution supported\n"
-msgstr "mittelokaalse programmi käivitamist ei toetata\n"
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
+#, fuzzy, c-format
+#| msgid "`%s' already compressed\n"
+msgid "'%s' already compressed\n"
+msgstr "`%s' on juba pakitud\n"
 
-msgid ""
-"external program calls are disabled due to unsafe options file permissions\n"
-msgstr ""
-"väliste programmide käivitamine on blokeeritud, kuna seadete failil on\n"
-"ebaturvalised õigused\n"
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
+#, fuzzy, c-format
+#| msgid "WARNING: `%s' is an empty file\n"
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "HOIATUS: `%s' on tühi fail\n"
 
-#, fuzzy
-msgid "this platform requires temporary files when calling external programs\n"
-msgstr ""
-"see platvorm nõuab väliste programmide käivitamiseks ajutiste failide "
-"kasutamist\n"
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
+#, fuzzy, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
+#: g10/encrypt.c:867
 #, fuzzy, c-format
-msgid "unable to execute program `%s': %s\n"
-msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
+#| msgid "reading from `%s'\n"
+msgid "reading from '%s'\n"
+msgstr "loen failist `%s'\n"
 
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
-msgid "unable to execute shell `%s': %s\n"
-msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#, c-format
-msgid "system error while calling external program: %s\n"
-msgstr "süsteemi viga välise programmi kasutamisel: %s\n"
+#: g10/encrypt.c:1179
+#, fuzzy, c-format
+#| msgid "%s/%s encrypted for: \"%s\"\n"
+msgid "%s/%s.%s encrypted for: \"%s\"\n"
+msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
 
-msgid "unnatural exit of external program\n"
-msgstr "väline programm lõpetas erandlikult\n"
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
+#, fuzzy, c-format
+#| msgid "you may not use %s while in %s mode\n"
+msgid "option '%s' may not be used in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
 
-msgid "unable to execute external program\n"
-msgstr "välist programmi ei õnnestu käivitada\n"
+#: g10/decrypt-data.c:245
+#, fuzzy, c-format
+#| msgid "%s encrypted data\n"
+msgid "%s encrypted data\n"
+msgstr "%s krüpteeritud andmed\n"
 
+#: g10/decrypt-data.c:248
 #, c-format
-msgid "unable to read external program response: %s\n"
-msgstr "ei õnnestu lugeda välise programmi vastust: %s\n"
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
-msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
-msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "HOIATUS: teade on krüptitud sümmeetrilise šifri nõrga võtmega.\n"
 
+#: g10/decrypt-data.c:383 g10/decrypt-data.c:436
 #, c-format
-msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr "HOIATUS: ei õnnestu eemaldada ajutist kataloogi `%s': %s\n"
+msgid "problem handling encrypted packet\n"
+msgstr "probleem krüptitud paketi käsitlemisel\n"
 
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
-"Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
+"Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
 
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
-"`%s' jaoks pole tühistamise võtmeid\n"
+"`%s' jaoks pole tühistamise võtmeid\n"
 "\n"
 
-#, fuzzy
-msgid "remove the passphrase from exported subkeys"
-msgstr "tühista sekundaarne võti"
-
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
-msgstr "mittekasutatav salajane võti"
+msgstr "mittekasutatav salajane võti"
 
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-msgid "export keys in an S-expression based format"
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: g10/export.c:141
+msgid "use the GnuPG key backup format"
 msgstr ""
 
+#: g10/export.c:145
 #, fuzzy
-msgid "exporting secret keys not allowed\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#, fuzzy, c-format
-msgid "key %s: not protected - skipped\n"
-msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n"
+#: g10/export.c:1525
+#, fuzzy
+#| msgid "%s: skipped: %s\n"
+msgid " - skipped"
+msgstr "%s: jätsin vahele: %s\n"
 
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
-msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
+#| msgid "writing to `%s'\n"
+msgid "writing to '%s'\n"
+msgstr "kirjutan faili `%s'\n"
 
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
-
-msgid "about to export an unprotected subkey\n"
-msgstr ""
+msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
 
+#: g10/export.c:2191
 #, fuzzy, c-format
-msgid "failed to unprotect the subkey: %s\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+msgid "exporting secret keys not allowed\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
 
+#: g10/export.c:2346
 #, fuzzy, c-format
-msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "HOIATUS: salajases võtmes %08lX puudub lihtne SK kontrollsumma\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
 
+#: g10/export.c:2468
+#, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-msgid "too many entries in pk cache - disabled\n"
-msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n"
-
+#: g10/getkey.c:252
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
+#: g10/getkey.c:1325
 #, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n"
-
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "viga `%s' loomisel: %s\n"
 
+#: g10/getkey.c:1331
 #, fuzzy, c-format
-msgid "error retrieving `%s' via %s: %s\n"
+msgid "error retrieving '%s' via %s: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
-msgstr "näita sõrmejälge"
+msgstr "näita sõrmejälge"
+
+#: g10/getkey.c:1575
+#, c-format
+msgid "checking for a fresh copy of an expired key via %s\n"
+msgstr ""
+
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "salajast võtit `%s' ei leitud: %s\n"
+
+#: g10/getkey.c:2021 g10/pkclist.c:1032
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "vigased impordi võtmed\n"
+
+#: g10/getkey.c:2099
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "Warning: not using '%s' as default key: %s\n"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+
+#: g10/getkey.c:2107
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key for signing\n"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+
+#: g10/getkey.c:2114
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr ""
 
+#: g10/getkey.c:2990
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
-"Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
+"Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
+#: g10/getkey.c:3868
 #, fuzzy, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "avalikul alamvõtmel %08lX puudub salajane alamvõti - ignoreerin\n"
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
 
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
+msgid "valid values for option '%s':\n"
+msgstr "vigased impordi võtmed\n"
 
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
-msgstr "krüpteeri andmed"
+msgstr "krüpteeri andmed"
 
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
-msgstr "krüpteerimine kasutades ainult sümmeetrilist ¨ifrit"
+msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
 
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
-msgstr "dekrüpteeri andmed (vaikimisi)"
+msgstr "dekrüpteeri andmed (vaikimisi)"
 
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
-msgstr "näita võtmeid"
+msgstr "näita võtmeid"
 
+#: g10/gpg.c:477
 msgid "list keys and signatures"
-msgstr "näita võtmeid ja allkirju"
+msgstr "näita võtmeid ja allkirju"
 
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
-msgstr "kontrolli võtmete allkirju"
+msgstr "kontrolli võtmete allkirju"
 
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
-msgstr "näita võtmeid ja sõrmejälgi"
+msgstr "näita võtmeid ja sõrmejälgi"
 
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
-msgstr "näita salajasi võtmeid"
+msgstr "näita salajasi võtmeid"
 
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
-msgstr "genereeri uus võtmepaar"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/gpg.c:488
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly generate a new key pair"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/gpg.c:491
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly add a new user-id"
+msgstr "genereeri uus võtmepaar"
 
+#: g10/gpg.c:497
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a user-id"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/gpg.c:500
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly set a new expiration date"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/gpg.c:504
+msgid "full featured key pair generation"
+msgstr ""
+
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
-msgstr "genereeri tühistamise sertifikaat"
+msgstr "genereeri tühistamise sertifikaat"
 
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
-msgstr "eemalda võtmed avalike võtmete hoidlast"
+msgstr "eemalda võtmed avalike võtmete hoidlast"
 
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
-msgstr "eemalda võtmed salajaste võtmete hoidlast"
+msgstr "eemalda võtmed salajaste võtmete hoidlast"
+
+#: g10/gpg.c:514
+#, fuzzy
+#| msgid "sign a key"
+msgid "quickly sign a key"
+msgstr "allkirjasta võti"
 
+#: g10/gpg.c:516
+#, fuzzy
+#| msgid "sign a key locally"
+msgid "quickly sign a key locally"
+msgstr "allkirjasta võti lokaalselt"
+
+#: g10/gpg.c:518
+#, fuzzy
+#| msgid "generate a new key pair"
+msgid "quickly revoke a key signature"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/gpg.c:519
 msgid "sign a key"
-msgstr "allkirjasta võti"
+msgstr "allkirjasta võti"
 
+#: g10/gpg.c:520
 msgid "sign a key locally"
-msgstr "allkirjasta võti lokaalselt"
+msgstr "allkirjasta võti lokaalselt"
 
+#: g10/gpg.c:521
 msgid "sign or edit a key"
-msgstr "allkirjasta või toimeta võtit"
+msgstr "allkirjasta või toimeta võtit"
 
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
+#: g10/gpg.c:527
 msgid "export keys"
-msgstr "ekspordi võtmed"
+msgstr "ekspordi võtmed"
 
-msgid "export keys to a key server"
-msgstr "ekspordi võtmed võtmeserverisse"
+#: g10/gpg.c:528
+msgid "export keys to a keyserver"
+msgstr "ekspordi võtmed võtmeserverisse"
 
-msgid "import keys from a key server"
-msgstr "impordi võtmed võtmeserverist"
+#: g10/gpg.c:529
+msgid "import keys from a keyserver"
+msgstr "impordi võtmed võtmeserverist"
 
-msgid "search for keys on a key server"
-msgstr "otsi võtmeid võtmeserverist"
+#: g10/gpg.c:532
+msgid "search for keys on a keyserver"
+msgstr "otsi võtmeid võtmeserverist"
 
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
-msgstr "uuenda võtmeid võtmeserverist"
+msgstr "uuenda võtmeid võtmeserverist"
 
+#: g10/gpg.c:543
 msgid "import/merge keys"
-msgstr "impordi/mesti võtmed"
+msgstr "impordi/mesti võtmed"
 
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
-msgstr "|algo [failid]|trüki teatelühendid"
+msgstr "|algo [failid]|trüki teatelühendid"
 
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-msgid "create ascii armored output"
-msgstr "loo ascii pakendis väljund"
-
-#, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|NIMI|krüpti NIMEle"
+#: g10/gpg.c:577
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr ""
 
-#, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "kasuta seda kasutaja IDd"
+#: g10/gpg.c:620
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
-msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|määra pakkimise tase N (0 blokeerib)"
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NIMI|krüpti NIMEle"
 
-msgid "use canonical text mode"
-msgstr "kasuta kanoonilist tekstimoodi"
+#: g10/gpg.c:630
+msgid "|SPEC|set up email aliases"
+msgstr ""
 
-#, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
+#: g10/gpg.c:641
+msgid "use strict OpenPGP behavior"
+msgstr ""
 
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
-msgstr "ära tee mingeid muutusi"
+msgstr "ära tee mingeid muutusi"
 
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
-msgstr "küsi enne ülekirjutamist"
+msgstr "küsi enne ülekirjutamist"
 
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:718 sm/gpgsm.c:322
+msgid "Options controlling the input"
 msgstr ""
 
-msgid ""
-"@\n"
-"(See the man page for a complete listing of all commands and options)\n"
+#: g10/gpg.c:736 sm/gpgsm.c:333
+msgid "Options controlling the output"
 msgstr ""
-"@\n"
-"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-msgid ""
-"@\n"
-"Examples:\n"
-"\n"
-" -se -r Bob [file]          sign and encrypt for user Bob\n"
-" --clearsign [file]         make a clear text signature\n"
-" --detach-sign [file]       make a detached signature\n"
-" --list-keys [names]        show keys\n"
-" --fingerprint [names]      show fingerprints\n"
-msgstr ""
-"@\n"
-"Näited:\n"
-"\n"
-" -se -r Bob [fail]          allkirjasta ja krüpti kasutajale Bob\n"
-" --clearsign [fail]         loo avateksti allkiri\n"
-" --detach-sign [fail]       loo eraldiseisev allkiri\n"
-" --list-keys [nimed]        näita võtmeid\n"
-" --fingerprint [nimed]      näita sõrmejälgi\n"
+#: g10/gpg.c:738 sm/gpgsm.c:335
+msgid "create ascii armored output"
+msgstr "loo ascii pakendis väljund"
+
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#: g10/gpg.c:755
+msgid "use canonical text mode"
+msgstr "kasuta kanoonilist tekstimoodi"
 
+#: g10/gpg.c:773
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|määra pakkimise tase N (0 blokeerib)"
+
+#: g10/gpg.c:779 sm/gpgsm.c:370
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:782
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+
+#: g10/gpg.c:785
+#, fuzzy
+#| msgid "import keys from a keyserver"
+msgid "import missing key from a signature"
+msgstr "impordi võtmed võtmeserverist"
+
+#: g10/gpg.c:790
+#, fuzzy
+msgid "include the public key in signatures"
+msgstr "kontrolli võtmete allkirju"
+
+#: g10/gpg.c:793 sm/gpgsm.c:373
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:805 sm/gpgsm.c:380
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:836 sm/gpgsm.c:345
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "näita salajasi võtmeid"
+
+#: g10/gpg.c:838 sm/gpgsm.c:347
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NIMI|krüpti NIMEle"
+
+#: g10/gpg.c:846 sm/gpgsm.c:349
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "kasuta seda kasutaja IDd"
+
+#: g10/gpg.c:893 sm/gpgsm.c:421
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:991 sm/gpgsm.c:467
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
+
+#: g10/gpg.c:994
+#, fuzzy
+#| msgid ""
+#| "@\n"
+#| "Examples:\n"
+#| "\n"
+#| " -se -r Bob [file]          sign and encrypt for user Bob\n"
+#| " --clear-sign [file]         make a clear text signature\n"
+#| " --detach-sign [file]       make a detached signature\n"
+#| " --list-keys [names]        show keys\n"
+#| " --fingerprint [names]      show fingerprints\n"
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clear-sign [file]        make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Näited:\n"
+"\n"
+" -se -r Bob [fail]          allkirjasta ja krüpti kasutajale Bob\n"
+" --clear-sign [fail]         loo avateksti allkiri\n"
+" --detach-sign [fail]       loo eraldiseisev allkiri\n"
+" --list-keys [nimed]        näita võtmeid\n"
+" --fingerprint [nimed]      näita sõrmejälgi\n"
+
+#: g10/gpg.c:1187
+#, fuzzy
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
 #| "sign, check, encrypt or decrypt\n"
 #| "default operation depends on the input data\n"
 msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
-"Süntaks: gpg [võtmed] [failid]\n"
-"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
-"vaikimisi operatsioon sõltub sisendandmetest\n"
+"Süntaks: gpg [võtmed] [failid]\n"
+"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
+"vaikimisi operatsioon sõltub sisendandmetest\n"
 
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1793,899 +2981,1258 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
+#: g10/gpg.c:1204
 msgid "Pubkey: "
-msgstr "Avalik võti: "
+msgstr "Avalik võti: "
 
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
-msgstr "¦iffer: "
+msgstr "Šiffer: "
 
+#: g10/gpg.c:1218
 msgid "Hash: "
-msgstr "Räsi: "
+msgstr "Räsi: "
 
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-msgid "usage: gpg [options] "
-msgstr "kasuta: gpg [võtmed] "
+#: g10/gpg.c:1300 sm/gpgsm.c:735
+#, fuzzy, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "kasuta: gpg [võtmed] "
 
+#: g10/gpg.c:1499 sm/gpgsm.c:828
+#, c-format
 msgid "conflicting commands\n"
-msgstr "vastuolulised käsud\n"
+msgstr "vastuolulised käsud\n"
 
+#: g10/gpg.c:1517
 #, fuzzy, c-format
-msgid "no = sign found in group definition `%s'\n"
-msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
+msgid "no = sign found in group definition '%s'\n"
+msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
+#: g10/gpg.c:1716
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir `%s'\n"
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
+#: g10/gpg.c:1719
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file `%s'\n"
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
+#: g10/gpg.c:1722
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension `%s'\n"
+msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
+#: g10/gpg.c:1728
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
+#: g10/gpg.c:1731
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
+#: g10/gpg.c:1734
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
+#: g10/gpg.c:1740
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
+#: g10/gpg.c:1743
 #, fuzzy, c-format
 msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
+#: g10/gpg.c:1746
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
+#: g10/gpg.c:1752
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
+msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
+#: g10/gpg.c:1755
 #, fuzzy, c-format
 msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
+msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
+#: g10/gpg.c:1758
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
+msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
+#: g10/gpg.c:1974
 #, fuzzy, c-format
-msgid "unknown configuration item `%s'\n"
+msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
+#: g10/gpg.c:2074
+#, fuzzy
+msgid "show key usage information during key listings"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
-msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
-msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
+msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
-msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#, c-format
-msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "sea eelistuste nimekiri"
+
+#: g10/gpg.c:2224
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
 
+#: g10/gpg.c:2226
 #, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "See käsklus ei ole %s moodis lubatud.\n"
+
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
+#, fuzzy, c-format
+#| msgid "NOTE: %s is not for normal use!\n"
+msgid "Note: %s is not for normal use!\n"
+msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
 
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
-msgid "`%s' is not a valid signature expiration\n"
+msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
+#: g10/gpg.c:3229
+#, fuzzy, c-format
+msgid "\"%s\" is not a proper mail address\n"
+msgstr "Selline e-posti aadress ei ole lubatud\n"
+
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
+#, fuzzy, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
+#, fuzzy, c-format
+msgid "invalid request origin '%s'\n"
+msgstr "vigased impordi võtmed\n"
+
+#: g10/gpg.c:3327
 #, fuzzy, c-format
-msgid "`%s' is not a valid character set\n"
+msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#, fuzzy
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
+#, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
-msgstr "ei saa parsida võtmeserveri URI\n"
+msgstr "ei saa parsida võtmeserveri URI\n"
 
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: vigased ekspordi võtmed\n"
+msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#, fuzzy
+#: g10/gpg.c:3370
+#, fuzzy, c-format
 msgid "invalid keyserver options\n"
-msgstr "vigased ekspordi võtmed\n"
+msgstr "vigased ekspordi võtmed\n"
 
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: vigased impordi võtmed\n"
+msgstr "%s:%d: vigased impordi võtmed\n"
 
+#: g10/gpg.c:3380
+#, c-format
 msgid "invalid import options\n"
-msgstr "vigased impordi võtmed\n"
+msgstr "vigased impordi võtmed\n"
 
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
+#, fuzzy, c-format
+msgid "invalid filter option: %s\n"
+msgstr "vigased impordi võtmed\n"
+
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: vigased ekspordi võtmed\n"
+msgstr "%s:%d: vigased ekspordi võtmed\n"
 
+#: g10/gpg.c:3395
+#, c-format
 msgid "invalid export options\n"
-msgstr "vigased ekspordi võtmed\n"
+msgstr "vigased ekspordi võtmed\n"
 
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: vigased impordi võtmed\n"
+msgstr "%s:%d: vigased impordi võtmed\n"
 
-#, fuzzy
+#: g10/gpg.c:3415
+#, fuzzy, c-format
 msgid "invalid list options\n"
-msgstr "vigased impordi võtmed\n"
+msgstr "vigased impordi võtmed\n"
 
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-msgid "validate signatures with PKA data"
-msgstr ""
-
-msgid "elevate the trust of signatures with valid PKA data"
-msgstr ""
-
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: vigased ekspordi võtmed\n"
+msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#, fuzzy
+#: g10/gpg.c:3451
+#, fuzzy, c-format
 msgid "invalid verify options\n"
-msgstr "vigased ekspordi võtmed\n"
+msgstr "vigased ekspordi võtmed\n"
 
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
+msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: vigased ekspordi võtmed\n"
+msgstr "%s:%d: vigased ekspordi võtmed\n"
 
+#: g10/gpg.c:3671
+#, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
+#: g10/gpg.c:3680
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "vigased impordi võtmed\n"
+
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
+#, c-format
 msgid "WARNING: program may create a core file!\n"
-msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
+msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "HOIATUS: %s määrab üle %s\n"
+msgstr "HOIATUS: %s määrab üle %s\n"
 
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s ja %s ei oma koos mõtet!\n"
+msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#, fuzzy, c-format
-msgid "will not run with insecure memory due to %s\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
-
-msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
+#, c-format
+msgid "WARNING: running with faked system time: "
 msgstr ""
-"--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n"
-
-msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n"
 
-msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-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:3936
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
 
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
+#, c-format
 msgid "selected cipher algorithm is invalid\n"
-msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
-
-msgid "selected digest algorithm is invalid\n"
-msgstr "valitud lühendi algoritm ei ole lubatud\n"
+msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#, fuzzy
+#: g10/gpg.c:3979
+#, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
-msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
+msgstr "valitud šifri algoritm ei ole lubatud\n"
 
+#: g10/gpg.c:3985
+#, c-format
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
+msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
+#: g10/gpg.c:4000
+#, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
+#: g10/gpg.c:4002
+#, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#, fuzzy
+#: g10/gpg.c:4004
+#, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
+#: g10/gpg.c:4006
+#, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n"
+msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n"
 
+#: g10/gpg.c:4008
+#, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n"
+msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n"
 
-msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
+#: g10/gpg.c:4012
+#, fuzzy, c-format
+#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
+#: g10/gpg.c:4016
+#, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
+msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
 
+#: g10/gpg.c:4023
+#, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
+#: g10/gpg.c:4027
+#, c-format
 msgid "invalid personal cipher preferences\n"
-msgstr "vigased isikliku ¨ifri eelistused\n"
+msgstr "vigased isikliku šifri eelistused\n"
 
+#: g10/gpg.c:4031
+#, c-format
 msgid "invalid personal digest preferences\n"
-msgstr "vigased isikliku lühendi eelistused\n"
+msgstr "vigased isikliku lühendi eelistused\n"
 
+#: g10/gpg.c:4035
+#, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#, c-format
-msgid "%s does not yet work with %s\n"
-msgstr "%s ei tööta veel koos %s-ga\n"
-
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
-msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "¨ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
+#| msgid "keysize invalid; using %u bits\n"
+msgid "chunk size invalid - using %d\n"
+msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#, fuzzy, c-format
-msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
+#: g10/gpg.c:4086
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s ei tööta veel koos %s-ga\n"
 
+#: g10/gpg.c:4149
 #, fuzzy, c-format
-msgid "you may not use compression algorithm `%s' while in %s mode\n"
+msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
+#: g10/gpg.c:4325
+#, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
-"HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n"
-
-msgid "--store [filename]"
-msgstr "--store [failinimi]"
-
-msgid "--symmetric [filename]"
-msgstr "--symmetric [failinimi]"
+"HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n"
 
+#: g10/gpg.c:4399
 #, fuzzy, c-format
-msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
-
-msgid "--encrypt [filename]"
-msgstr "--encrypt [failinimi]"
-
-#, fuzzy
-msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [failinimi]"
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
+#: g10/gpg.c:4428
+#, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
+#: g10/gpg.c:4431
 #, fuzzy, c-format
-msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-msgid "--sign [filename]"
-msgstr "--sign [failinimi]"
-
-msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [failinimi]"
-
-#, fuzzy
-msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [failinimi]"
-
+#: g10/gpg.c:4489
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
+#: g10/gpg.c:4492
 #, fuzzy, c-format
-msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [failinimi]"
-
-msgid "--clearsign [filename]"
-msgstr "--clearsign [failinimi]"
-
-msgid "--decrypt [filename]"
-msgstr "--decrypt [failinimi]"
-
-msgid "--sign-key user-id"
-msgstr "--sign-key kasutaja-id"
-
-msgid "--lsign-key user-id"
-msgstr "--lsign-key kasutaja-id"
-
-msgid "--edit-key user-id [commands]"
-msgstr "--edit-key kasutaja-id [käsud]"
-
-#, fuzzy
-msgid "--passwd <user-id>"
-msgstr "--sign-key kasutaja-id"
-
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
+msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
+msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "võtme eksport ebaõnnestus: %s\n"
+msgstr "võtme eksport ebaõnnestus: %s\n"
+
+#: g10/gpg.c:4935 g10/gpg.c:4946
+#, fuzzy, c-format
+#| msgid "key export failed: %s\n"
+msgid "export as ssh key failed: %s\n"
+msgstr "võtme eksport ebaõnnestus: %s\n"
 
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
+msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
+msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "lahtipakendamine ebaõnnestus: %s\n"
+msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: g10/gpg.c:5175
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "invalid hash algorithm '%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: g10/gpg.c:5327 g10/tofu.c:2160
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
+#: g10/gpg.c:5338
 #, c-format
-msgid "invalid hash algorithm `%s'\n"
-msgstr "vigane räsialgoritm `%s'\n"
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
 
-msgid "[filename]"
-msgstr "[failinimi]"
+#: g10/gpg.c:5394
+#, c-format
+msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+msgstr ""
 
+#: g10/gpg.c:5405
+#, c-format
 msgid "Go ahead and type your message ...\n"
-msgstr "Kirjutage nüüd oma teade ...\n"
+msgstr "Kirjutage nüüd oma teade ...\n"
 
+#: g10/gpg.c:5760
+#, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
+#: g10/gpg.c:5762
+#, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#, fuzzy
+#: g10/gpg.c:5795
+#, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
+#: g10/gpgv.c:81
 #, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
-msgstr "võta võtmed sellest võtmehoidlast"
+msgstr "võta võtmed sellest võtmehoidlast"
 
+#: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
+#: g10/gpgv.c:91
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
+#: g10/gpgv.c:152
 msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "Kasuta: gpgv [võtmed] [failid] (-h näitab abiinfot)"
+msgstr "Kasuta: gpgv [võtmed] [failid] (-h näitab abiinfot)"
 
+#: g10/gpgv.c:154
 #, fuzzy
 msgid ""
 "Syntax: gpgv [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
-"Süntaks: gpg [võtmed] [failid]\n"
-"kontrolli allkirju tuntud usaldusväärsete võtmetega\n"
+"Süntaks: gpg [võtmed] [failid]\n"
+"kontrolli allkirju tuntud usaldusväärsete võtmetega\n"
 
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#, c-format
-msgid "No help available for `%s'"
+#: g10/helptext.c:82
+#, fuzzy, c-format
+#| msgid "No help available for `%s'"
+msgid "No help available for '%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "uuenda usalduse andmebaasi"
 
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uuenda usalduse andmebaasi"
 
+#: g10/import.c:182
 #, fuzzy
-msgid "create a public key when importing a secret key"
-msgstr "avalik võti ei sobi salajase võtmega!\n"
+#| msgid "not supported"
+msgid "enable bulk import mode"
+msgstr "ei ole toetatud"
+
+#: g10/import.c:185
+#, fuzzy
+msgid "show key during import"
+msgstr "näita sõrmejälge"
 
+#: g10/import.c:188
+#, fuzzy
+msgid "show key but do not actually import"
+msgstr "näita sõrmejälge"
+
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
-msgstr "mittekasutatav salajane võti"
+msgstr "mittekasutatav salajane võti"
 
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
+#: g10/import.c:200
+msgid "ignore key-signatures which are not self-signatures"
+msgstr ""
+
+#: g10/import.c:203
+msgid "run import filters and export key immediately"
+msgstr ""
+
+#: g10/import.c:206
+msgid "assume the GnuPG key backup format"
+msgstr ""
+
+#: g10/import.c:210
+#, fuzzy
+msgid "repair keys on import"
+msgstr "näita sõrmejälge"
+
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "jätan bloki tüübiga %d vahele\n"
+msgstr "jätan bloki tüübiga %d vahele\n"
 
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
-msgstr "%lu võtit on seni töödeldud\n"
+msgstr "%lu võtit on seni töödeldud\n"
 
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "Töödeldud kokku: %lu\n"
+msgstr "Töödeldud kokku: %lu\n"
+
+#: g10/import.c:843
+#, fuzzy, c-format
+#| msgid "      skipped new keys: %lu\n"
+msgid "    skipped PGP-2 keys: %lu\n"
+msgstr " vahele jäetud uusi võtmeid: %lu\n"
 
+#: g10/import.c:845
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr " vahele jäetud uusi võtmeid: %lu\n"
+msgstr " vahele jäetud uusi võtmeid: %lu\n"
 
+#: g10/import.c:848
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
+#: g10/import.c:857
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
+#: g10/import.c:859
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "      uusi alamvõtmeid: %lu\n"
+msgstr "      uusi alamvõtmeid: %lu\n"
 
+#: g10/import.c:861
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
+#: g10/import.c:863
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "      uusi tühistamisi: %lu\n"
+msgstr "      uusi tühistamisi: %lu\n"
 
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr " loetud salajasi võtmeid: %lu\n"
+msgstr " loetud salajasi võtmeid: %lu\n"
 
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr " salajasi võtmeid imporditud: %lu\n"
+msgstr " salajasi võtmeid imporditud: %lu\n"
 
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr " muutmata salajasi võtmeid: %lu\n"
+msgstr " muutmata salajasi võtmeid: %lu\n"
 
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
-msgstr " loetud salajasi võtmeid: %lu\n"
+msgstr " loetud salajasi võtmeid: %lu\n"
 
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
+#: g10/import.c:1342
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
+#: g10/import.c:1360
+#, fuzzy, c-format
+msgid "         \"%s\": preference for AEAD algorithm %s\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
+#: g10/import.c:1387
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
+#: g10/import.c:1400
+#, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
+#: g10/import.c:1402
+#, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
-msgstr "võti %08lX: kasutaja ID puudub\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
 
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
-msgstr "`%s' jätsin vahele: %s\n"
+msgstr "`%s' jätsin vahele: %s\n"
 
-msgid "rejected by import filter"
+#: g10/import.c:2019 g10/import.c:3144
+msgid "rejected by import screener"
 msgstr ""
 
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
+msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
 
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
-"võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
+"võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
+msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
 
+#: g10/import.c:2102
+#, c-format
 msgid "this may be caused by a missing self-signature\n"
-msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
+msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
 
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
+msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
 
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "võti %08lX: uus võti - jätsin vahele\n"
+msgstr "võti %08lX: uus võti - jätsin vahele\n"
 
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
-
-#, c-format
-msgid "writing to `%s'\n"
-msgstr "kirjutan faili `%s'\n"
+msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
 
-#, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
+#, fuzzy, c-format
+#| msgid "error writing keyring `%s': %s\n"
+msgid "error writing keyring '%s': %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
+msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
 
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "võti %08lX: ei sobi meie koopiaga\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
+msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
+msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
+msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
+msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
 
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
+msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
+msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
 
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
+msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
 
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
+msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
+msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
+msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
+msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "võti %08lX: \"%s\" ei muudetud\n"
+msgstr "võti %08lX: \"%s\" ei muudetud\n"
 
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
-msgid "secret key %s: %s\n"
-msgstr "salajast võtit `%s' ei leitud: %s\n"
+msgid "key %s: secret key imported\n"
+msgstr "võti %08lX: salajane võti on imporditud\n"
 
-#, fuzzy
-msgid "importing secret keys not allowed\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#: g10/import.c:2809
+#, fuzzy, c-format
+#| msgid "skipped: secret key already present\n"
+msgid "key %s: secret key already exists\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
+#: g10/import.c:2817
 #, fuzzy, c-format
-msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "võti %08lX: salajane võti vigase ¨ifriga %d - jätsin vahele\n"
+msgid "key %s: error sending to agent: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
 
+#. 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
+#. * three private key data.  Importing private key stub is always
+#. * skipped in 2.1, and it returns GPG_ERR_NOT_PROCESSED.
+#. * Instead, user should be suggested to run 'gpg --card-status',
+#. * then, references to a card will be automatically created
+#. * again.
+#: g10/import.c:2996
 #, c-format
-msgid "no default secret keyring: %s\n"
-msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
 
+#: g10/import.c:3143
 #, fuzzy, c-format
-msgid "key %s: secret key imported\n"
-msgstr "võti %08lX: salajane võti on imporditud\n"
+msgid "secret key %s: %s\n"
+msgstr "salajast võtit `%s' ei leitud: %s\n"
 
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
-msgid "key %s: already in secret keyring\n"
-msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n"
+msgid "importing secret keys not allowed\n"
+msgstr "kirjutan salajase võtme faili `%s'\n"
 
+#: g10/import.c:3191
 #, fuzzy, c-format
-msgid "key %s: secret key not found: %s\n"
-msgstr "võti %08lX: salajast võtit ei leitud: %s\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "võti %08lX: salajane võti vigase šifriga %d - jätsin vahele\n"
+
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
+msgid "No reason specified"
+msgstr "Põhjus puudub"
+
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
+msgid "Key is superseded"
+msgstr "Võti on asendatud"
+
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
+msgid "Key has been compromised"
+msgstr "Võti on kompromiteeritud"
+
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
+msgid "Key is no longer used"
+msgstr "Võti ei ole enam kasutusel"
+
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
+msgid "User ID is no longer valid"
+msgstr "Kasutaja ID ei ole enam kehtiv"
+
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
+#, c-format
+msgid "reason for revocation: "
+msgstr "tühistamise põhjus: "
+
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
+#, c-format
+msgid "revocation comment: "
+msgstr "tühistamise kommentaar: "
 
+#: g10/import.c:3552
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
+"võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
 
+#: g10/import.c:3581
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
+
+#: g10/import.c:3588
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
+
+#: g10/import.c:3608
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
+msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
 
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
+msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
 
+#: g10/import.c:3729
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
+msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
 
+#: g10/import.c:3746
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
+msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
 
+#: g10/import.c:3748
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
+msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
+msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
-msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
+msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
+#: g10/import.c:3780
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
+msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
 
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "võti %08lX: vigane alamvõtme seos\n"
+msgstr "võti %08lX: vigane alamvõtme seos\n"
 
+#: g10/import.c:3814
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
+msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
 
+#: g10/import.c:3838
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
+msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
 
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
+msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
 
+#: g10/import.c:3866
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
+msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
 
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "võti %08lX: jätsin vahele kasutaja ID '"
+msgstr "võti %08lX: jätsin vahele kasutaja ID '"
 
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "võti %08lX: jätsin alamvõtme vahele\n"
+msgstr "võti %08lX: jätsin alamvõtme vahele\n"
 
+#: g10/import.c:3972
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
+msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
 
+#: g10/import.c:3983
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
+msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
 
+#: g10/import.c:4011
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
+msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
 
+#: g10/import.c:4035
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
+msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
 
+#: g10/import.c:4043
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
+msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
 
+#: g10/import.c:4216
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
+msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
+
+#: g10/import.c:4323
+#, fuzzy, c-format
+msgid "key %s: duplicated subkeys detected - merged\n"
+msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
+#: g10/import.c:4388
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
+"HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
 
+#: g10/import.c:4404
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
+"HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
 
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
+msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
+msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#, fuzzy
-msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "avalik võti ei sobi salajase võtmega!\n"
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
+#, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#, fuzzy
-msgid "NOTE: primary key is online and stored on card\n"
-msgstr "jätsin vahele: avalik võti on juba olemas\n"
+#: g10/key-check.c:397
+#, fuzzy, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
+#: g10/key-check.c:406
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
+#: g10/key-check.c:572
 #, fuzzy
-msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "jätsin vahele: avalik võti on juba olemas\n"
+msgid " (reordered signatures follow)"
+msgstr "Korrektne allkiri kasutajalt \""
 
-#, c-format
-msgid "error creating keyring `%s': %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+#: g10/key-check.c:709
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "`%s' jätsin vahele: %s\n"
 
-#, c-format
-msgid "keyring `%s' created\n"
-msgstr "võtmehoidla `%s' on loodud\n"
+#: g10/key-check.c:717
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
+msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
 
+#: g10/key-check.c:726 g10/keylist.c:725
 #, fuzzy, c-format
-msgid "keyblock resource `%s': %s\n"
-msgstr "viga `%s' loomisel: %s\n"
+#| msgid "1 signature not checked due to a missing key\n"
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
+msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
 
-#, c-format
-msgid "failed to rebuild keyring cache: %s\n"
-msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
+#: g10/key-check.c:734 g10/keylist.c:721
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d halba allkirja\n"
+msgstr[1] "%d halba allkirja\n"
 
-msgid "[revocation]"
-msgstr "[tühistamine]"
+#: g10/key-check.c:743
+#, fuzzy, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Korrektne allkiri kasutajalt \""
+msgstr[1] "Korrektne allkiri kasutajalt \""
 
-msgid "[self-signature]"
-msgstr "[iseenda allkiri]"
+#: g10/key-check.c:753
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
-msgid "1 bad signature\n"
-msgstr "1 halb allkiri\n"
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
+#, fuzzy, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#, c-format
-msgid "%d bad signatures\n"
-msgstr "%d halba allkirja\n"
+#: g10/keydb.c:369 g10/keydb.c:396
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error creating keyring '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-msgid "1 signature not checked due to a missing key\n"
-msgstr "1 allkiri jäi testimata, kuna võti puudub\n"
+#: g10/keydb.c:405 sm/keydb.c:324
+#, fuzzy, c-format
+msgid "keybox '%s' created\n"
+msgstr "võtmehoidla `%s' on loodud\n"
 
-#, c-format
-msgid "%d signatures not checked due to missing keys\n"
-msgstr "%d allkirja jäi testimata, kuna võtmed puuduvad\n"
+#: g10/keydb.c:407
+#, fuzzy, c-format
+#| msgid "keyring `%s' created\n"
+msgid "keyring '%s' created\n"
+msgstr "võtmehoidla `%s' on loodud\n"
 
-msgid "1 signature not checked due to an error\n"
-msgstr "1 allkiri jäi vea tõttu kontrollimata\n"
+#: g10/keydb.c:797
+#, fuzzy, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
 
+#: g10/keydb.c:1673
 #, c-format
-msgid "%d signatures not checked due to errors\n"
-msgstr "%d allkirja jäi vigade tõttu kontrollimata\n"
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-msgid "1 user ID without valid self-signature detected\n"
-msgstr "tuvastasin ühe kehtiva iseenda allkirjata kasutaja ID\n"
+#: g10/keyedit.c:264
+msgid "[revocation]"
+msgstr "[tühistamine]"
 
-#, c-format
-msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+#: g10/keyedit.c:264 g10/keylist.c:1325
+msgid "[self-signature]"
+msgstr "[iseenda allkiri]"
 
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2693,54 +4240,73 @@ msgid ""
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 msgstr ""
-"Palun otsustage, kuivõrd te usaldate seda kasutajat\n"
-"teiste kasutajate võtmete kontrollimisel (kontrollige\n"
-"passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
+"Palun otsustage, kuivõrd te usaldate seda kasutajat\n"
+"teiste kasutajate võtmete kontrollimisel (kontrollige\n"
+"passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
 "\n"
 
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = Usaldan vähesel määral\n"
+msgstr " %d = Usaldan vähesel määral\n"
 
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = Usaldan täiesti\n"
+msgstr " %d = Usaldan täiesti\n"
 
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#: g10/keyedit.c:555
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Kasutaja ID \"%s\" on tühistatud."
+msgstr "Kasutaja ID \"%s\" on tühistatud."
 
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
-msgstr "Allkirjastan tõesti? "
+msgstr "Allkirjastan tõesti? "
 
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2749,9 +4315,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2760,9 +4328,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2771,916 +4341,1298 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
-"Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
+"Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
 
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
+msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
 
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
+msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
 
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Võtmega %08lX pole midagi allkirjastada\n"
+msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
+#: g10/keyedit.c:806
 msgid "This key has expired!"
-msgstr "See võti on aegunud!"
+msgstr "See võti on aegunud!"
 
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "See võti aegub %s.\n"
+msgstr "See võti aegub %s.\n"
 
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\n"
-msgstr "--pgp2 moodis ei saa PGP 2.x võtmele OpenPGP allkirja anda.\n"
-
-msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "See muudab võtme PGP 2.x programmidega mitte-kasutatavaks.\n"
-
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"Kui hoolikalt te olete kontrollinud et võti, mida te asute allkirjastama,\n"
-"kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
+"Kui hoolikalt te olete kontrollinud et võti, mida te asute allkirjastama,\n"
+"kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr "   (1) Ma ei ole üldse kontrollinud.%s\n"
+msgstr "   (1) Ma ei ole üldse kontrollinud.%s\n"
 
+#: g10/keyedit.c:880
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
+#: g10/keyedit.c:883
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) Ma olen kontrollinud väga hoolikalt.%s\n"
+msgstr "   (3) Ma olen kontrollinud väga hoolikalt.%s\n"
 
+#: g10/keyedit.c:890
 #, fuzzy
-msgid "Your selection? (enter `?' for more information): "
+msgid "Your selection? (enter '?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"Olete tõesti kindel, et soovite seda võtit oma\n"
-"võtmega allkirjastada: \""
+"Olete tõesti kindel, et soovite seda võtit oma\n"
+"võtmega allkirjastada: \""
 
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n"
+"HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n"
 
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n"
+"HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n"
 
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"Allkiri märgitakse mitte-eksporditavaks.\n"
+"Allkiri märgitakse mitte-eksporditavaks.\n"
 
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
+"Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
 
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
-"Ma ei ole seda võtit üldse kontrollinud.\n"
+"Ma ei ole seda võtit üldse kontrollinud.\n"
 
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
-"Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
+"Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
 
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
-"Ma olen kontrollinud seda võtit väga hoolikalt.\n"
+"Ma olen kontrollinud seda võtit väga hoolikalt.\n"
 
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "Allkirjastan tõesti? "
+msgstr "Allkirjastan tõesti? "
 
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "allkirjastamine ebaõnnestus: %s\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
 
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-msgid "This key is not protected.\n"
-msgstr "See võti ei ole kaitstud.\n"
-
-msgid "Secret parts of primary key are not available.\n"
-msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
-
-#, fuzzy
-msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
-
-msgid "Key is protected.\n"
-msgstr "Võti on kaitstud.\n"
-
-#, c-format
-msgid "Can't edit this key: %s\n"
-msgstr "Seda võtit ei õnnestu toimetada: %s\n"
-
-msgid ""
-"Enter the new passphrase for this secret key.\n"
-"\n"
-msgstr ""
-"Sisestage sellele salajasele võtmele uus parool.\n"
-"\n"
-
-msgid "passphrase not correctly repeated; try again"
-msgstr "parooli ei korratud õieti; proovige uuesti"
-
-msgid ""
-"You don't want a passphrase - this is probably a *bad* idea!\n"
-"\n"
-msgstr ""
-"Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
-"\n"
-
-#, fuzzy
-msgid "Do you really want to do this? (y/N) "
-msgstr "Kas te tõesti soovite seda teha? "
-
-msgid "moving a key signature to the correct place\n"
-msgstr "tõstan võtme allkirja õigesse kohta\n"
+#: g10/keyedit.c:1154
+#, fuzzy, c-format
+#| msgid "error creating passphrase: %s\n"
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
+#: g10/keyedit.c:1268
 msgid "save and quit"
-msgstr "salvesta ja välju"
+msgstr "salvesta ja välju"
 
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
-msgstr "näita sõrmejälge"
+msgstr "näita sõrmejälge"
+
+#: g10/keyedit.c:1272
+#, fuzzy
+msgid "show the keygrip"
+msgstr "Allkirja noteerimine: "
 
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
-msgstr "näita võtit ja kasutaja IDd"
+msgstr "näita võtit ja kasutaja IDd"
 
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
-msgstr "tühista allkirjad"
+msgstr "tühista allkirjad"
 
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
-msgstr "allkirjasta võti lokaalselt"
+msgstr "allkirjasta võti lokaalselt"
 
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
+#: g10/keyedit.c:1306
+msgid "convert a key to TPM form using the local TPM"
+msgstr ""
+
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
-msgstr "kustuta sekundaarne võti"
+msgstr "kustuta sekundaarne võti"
 
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
-msgstr "lisa tühistamise võti"
+msgstr "lisa tühistamise võti"
+
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
 
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
-msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
+msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "v3 võtme aegumise aega ei saa muuta.\n"
+msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
-msgstr "märgi kasutaja ID primaarseks"
-
-#, fuzzy
-msgid "toggle between the secret and public key listings"
-msgstr "lülita salajaste või avalike võtmete loendi vahel"
+msgstr "märgi kasutaja ID primaarseks"
 
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
-msgstr "näita eelistusi (ekspert)"
+msgstr "näita eelistusi (ekspert)"
 
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
-msgstr "näita eelistusi (detailsena)"
+msgstr "näita eelistusi (detailsena)"
 
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
-msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
+msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "ei saa parsida võtmeserveri URI\n"
+msgstr "ei saa parsida võtmeserveri URI\n"
 
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
-msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
+msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
-msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
+msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
 
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
-msgstr "tühista kasutaja ID"
+msgstr "tühista kasutaja ID"
 
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
-msgstr "tühista sekundaarne võti"
+msgstr "tühista sekundaarne võti"
 
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
-msgstr "luba võti"
+msgstr "luba võti"
 
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
-msgstr "blokeeri võti"
+msgstr "blokeeri võti"
 
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
-msgstr "näita foto ID"
+msgstr "näita foto ID"
 
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
-
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
-msgstr "Salajane võti on kasutatav.\n"
+msgstr "Salajane võti on kasutatav.\n"
 
-msgid "Need the secret key to do this.\n"
-msgstr "Selle tegamiseks on vaja salajast võtit.\n"
+#: g10/keyedit.c:1478
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Salajane võti on kasutatav.\n"
+
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
 
-msgid "Please use the command \"toggle\" first.\n"
-msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
+#: g10/keyedit.c:1589
+msgid "Need the secret key to do this.\n"
+msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
+#: g10/keyedit.c:1612
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures "
+"* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
-"  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+"  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
-msgstr "Võti on tühistatud."
+msgstr "Võti on tühistatud."
+
+#: g10/keyedit.c:1693
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
+msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
-msgid "Unknown signature type `%s'\n"
+msgid "Unknown signature type '%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#, c-format
-msgid "This command is not allowed while in %s mode.\n"
-msgstr "See käsklus ei ole %s moodis lubatud.\n"
-
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
-msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
+msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
 
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr ""
+
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
+msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
 
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "Kas eemaldan tõesti selle kasutaja ID? "
+msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "Kas eemaldan tõesti selle kasutaja ID? "
+msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
-msgstr "Te peata valima vähemalt ühe võtme.\n"
+msgstr "Te peata valima vähemalt ühe võtme.\n"
 
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
-msgid "Can't open `%s': %s\n"
-msgstr "`%s' ei õnnestu avada: %s\n"
+msgid "Can't open '%s': %s\n"
+msgstr "`%s' ei õnnestu avada: %s\n"
 
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
-msgid "Error reading backup key from `%s': %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
-msgstr "Te peata valima vähemalt ühe võtme.\n"
+msgstr "Te peata valima vähemalt ühe võtme.\n"
 
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
+msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Kas te tõesti soovite seda võtit kustutada? "
+msgstr "Kas te tõesti soovite seda võtit kustutada? "
 
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
+msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
 
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "Kas tühistan tõesti selle kasutaja ID? "
+msgstr "Kas tühistan tõesti selle kasutaja ID? "
 
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "Kas te tõesti soovite seda võtit tühistada? "
+msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
+msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
 
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "Kas te tõesti soovite seda võtit tühistada? "
+msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
+msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "Kas tõesti uuendan seaded? "
+msgstr "Kas tõesti uuendan seaded? "
 
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "Väljun salvestamata? "
+msgstr "Väljun salvestamata? "
 
-#, c-format
-msgid "update failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
-msgid "update secret failed: %s\n"
-msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
-
 msgid "Key not changed so no update needed.\n"
-msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
+msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-msgid "Digest: "
-msgstr "Teatelühend: "
+#: g10/keyedit.c:2606
+#, fuzzy, c-format
+#| msgid "You can't delete the last user ID!\n"
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-msgid "Features: "
-msgstr "Omadused: "
+#: g10/keyedit.c:2632
+#, fuzzy, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-msgid "Keyserver no-modify"
-msgstr ""
+#: g10/keyedit.c:2695
+#, fuzzy, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
+#, fuzzy, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: g10/keyedit.c:2785
+#, fuzzy, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "vigane väärtus\n"
+
+#: g10/keyedit.c:2928
+#, fuzzy
+#| msgid "No such user ID.\n"
+msgid "No matching user IDs."
+msgstr "Tundmatu kasutaja ID.\n"
+
+#: g10/keyedit.c:2928
+#, fuzzy
+msgid "Nothing to sign.\n"
+msgstr "Võtmega %08lX pole midagi allkirjastada\n"
+
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
+#, fuzzy, c-format
+msgid "Not signed by you.\n"
+msgstr "   allkirjastanud %08lX %s%s\n"
+
+#: g10/keyedit.c:3181
+#, fuzzy, c-format
+#| msgid "checking created signature failed: %s\n"
+msgid "revoking the key signature failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: g10/keyedit.c:3365
+#, fuzzy, c-format
+msgid "'%s' is not a valid expiration time\n"
+msgstr "%s ei ole lubatud kooditabel\n"
+
+#: g10/keyedit.c:3407
+#, fuzzy, c-format
+msgid "\"%s\" is not a proper fingerprint\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: g10/keyedit.c:3431
+#, fuzzy, c-format
+msgid "subkey \"%s\" not found\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
+#: g10/keyedit.c:3849
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
-msgstr "Selle võtme võib olla tühistanud %s võti "
+msgstr "Selle võtme võib olla tühistanud %s võti "
 
+#: g10/keyedit.c:3873
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "Selle võtme võib olla tühistanud %s võti "
+msgstr "Selle võtme võib olla tühistanud %s võti "
 
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
-msgstr "%s ei õnnestu luua: %s\n"
+msgstr "%s ei õnnestu luua: %s\n"
 
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
-msgstr "[tühistatud] "
+msgstr "[tühistatud] "
 
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
+msgid "card-no: "
+msgstr ""
+
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
-msgstr "See võti on blokeeritud"
-
-msgid "card-no: "
-msgstr ""
+msgstr "See võti on blokeeritud"
 
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
-"Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n"
-"näidatud võtme kehtivus olla tingimata korrektne.\n"
+"Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n"
+"näidatud võtme kehtivus olla tingimata korrektne.\n"
 
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
-msgstr "[tühistatud] "
+msgstr "[tühistatud] "
 
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
+#: g10/keyedit.c:4207
+#, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
-"HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks.  See käsklus võib\n"
-"              põhjustada muu kasutaja ID primaarseks määramist.\n"
+"HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks.  See käsklus võib\n"
+"              põhjustada muu kasutaja ID primaarseks määramist.\n"
 
+#: g10/keyedit.c:4259
+#, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#, fuzzy
+#: g10/keyedit.c:4260
+#, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
-msgstr "v3 võtme aegumise aega ei saa muuta.\n"
+msgstr "v3 võtme aegumise aega ei saa muuta.\n"
+
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
 
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n"
-"         PGP versioone seda võtit tagasi lükkama.\n"
+"HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n"
+"         PGP versioone seda võtit tagasi lükkama.\n"
 
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
+msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
+
+#: g10/keyedit.c:4379
+msgid "Such a user ID already exists on this key!"
+msgstr ""
 
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
+msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#, c-format
+#: g10/keyedit.c:4518
+#, fuzzy, c-format
+#| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
-msgstr "Kustutatud %d allkiri.\n"
-
-#, c-format
-msgid "Deleted %d signatures.\n"
-msgstr "Kustutatud %d allkirja.\n"
+msgid_plural "Deleted %d signatures.\n"
+msgstr[0] "Kustutatud %d allkiri.\n"
+msgstr[1] "Kustutatud %d allkiri.\n"
 
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
-msgstr "Kasutaja ID \"%s\" on tühistatud."
+msgstr "Kasutaja ID \"%s\" on tühistatud."
 
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
-msgstr "Kasutaja ID \"%s\" on tühistatud."
-
-#, fuzzy, c-format
-msgid "User ID \"%s\": %d signatures removed\n"
-msgstr "Kasutaja ID \"%s\" on tühistatud."
+msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
+msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
 
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
-msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
-msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n"
-"         põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n"
+"HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n"
+"         põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n"
 
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
+msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
 
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Sisestage määratud tühistaja kasutaja ID: "
+msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
+#: g10/keyedit.c:4697 g10/keygen.c:3999
+#, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
+msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
 
+#: g10/keyedit.c:4713
+#, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
+msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
 
-#, fuzzy
+#: g10/keyedit.c:4735
+#, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
-msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
+msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
 
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
+msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
 
+#: g10/keyedit.c:4759
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
-"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
+"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
+
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
 
-msgid "Please remove selections from the secret keys.\n"
-msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
+#: g10/keyedit.c:5007
 #, fuzzy
-msgid "Please select at most one subkey.\n"
-msgstr "palun valige ülimalt üks sekundaarne võti.\n"
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
-msgstr "Muudan sekundaarse võtme aegumise aega.\n"
+msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
-msgstr "Muudan primaarse võtme aegumise aega.\n"
+msgstr "Muudan primaarse võtme aegumise aega.\n"
 
+#: g10/keyedit.c:5071
+#, c-format
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr "v3 võtme aegumise aega ei saa muuta.\n"
+msgstr "v3 võtme aegumise aega ei saa muuta.\n"
+
+#: g10/keyedit.c:5131
+#, fuzzy
+msgid "Changing usage of a subkey.\n"
+msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-msgid "No corresponding signature in secret ring\n"
-msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+#: g10/keyedit.c:5134
+#, fuzzy
+#| msgid "Changing expiration time for the primary key.\n"
+msgid "Changing usage of the primary key.\n"
+msgstr "Muudan primaarse võtme aegumise aega.\n"
 
+#: g10/keyedit.c:5252
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
-msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
+msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
 
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
-msgstr "Palun valige täpselt üks kasutaja ID.\n"
+msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
+msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
-msgstr "Kirjutan üle (j/E)? "
+msgstr "Kirjutan üle (j/E)? "
 
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
+#: g10/keyedit.c:6117
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
+
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
+msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
 
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
-
-#, fuzzy
-msgid "Not signed by you.\n"
-msgstr "   allkirjastanud %08lX %s%s\n"
+msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
+#: g10/keyedit.c:6359
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
+msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
 
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   tühistanud %08lX %s\n"
+msgstr "   tühistanud %08lX %s\n"
 
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
-msgstr "Te asute tühistama järgmisi allkirju:\n"
+msgstr "Te asute tühistama järgmisi allkirju:\n"
 
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
+msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
+#: g10/keyedit.c:6476
+#, c-format
 msgid "no secret key\n"
-msgstr "salajast võtit pole\n"
+msgstr "salajast võtit pole\n"
+
+#: g10/keyedit.c:6524
+#, c-format
+msgid "tried to revoke a non-user ID: %s\n"
+msgstr ""
 
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
+#: g10/keyedit.c:6647
+#, fuzzy, c-format
+#| msgid "You can't delete the last user ID!\n"
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Viimast kasutaja ID ei saa kustutada!\n"
+
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
+#: g10/keyedit.c:6844
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
+msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
+
+#: g10/keygen.c:179
+#, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "vigased impordi võtmed\n"
 
+#: g10/keygen.c:336
 #, fuzzy, c-format
-msgid "preference `%s' duplicated\n"
+msgid "preference '%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#, fuzzy
+#: g10/keygen.c:343
+#, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#, fuzzy
+#: g10/keygen.c:345
+#, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#, fuzzy
+#: g10/keygen.c:347
+#, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
+#: g10/keygen.c:349
+#, fuzzy, c-format
+msgid "too many AEAD preferences\n"
+msgstr "liiga palju `%c' eelistusi\n"
+
+#: g10/keygen.c:529
 #, fuzzy, c-format
-msgid "invalid item `%s' in preference string\n"
-msgstr "lubamatu sümbol eelistuste sõnes\n"
+msgid "invalid item '%s' in preference string\n"
+msgstr "lubamatu sümbol eelistuste sõnes\n"
 
+#: g10/keygen.c:1115
+#, c-format
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
+#: g10/keygen.c:1161
+#, c-format
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
+#: g10/keygen.c:1217
+#, c-format
 msgid "writing key binding signature\n"
-msgstr "kirjutan võtit siduva allkirja\n"
+msgstr "kirjutan võtit siduva allkirja\n"
 
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "vigane võtme suurus; kasutan %u bitti\n"
+msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "võtme suurus ümardatud üles %u bitini\n"
+msgstr "võtme suurus ümardatud üles %u bitini\n"
 
+#: g10/keygen.c:1683
+#, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
-msgstr "krüpteeri andmed"
+msgstr "krüpteeri andmed"
 
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
 #. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation.  If this is not possible use single digits.  The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation.  If this is not possible use single digits.  The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. *   s = Toggle signing capability
+#. *   e = Toggle encryption capability
+#. *   a = Toggle authentication capability
+#. *   q = Finish
 #.
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
+#: g10/keygen.c:1949
 #, c-format
-msgid "Possible actions for a %s key: "
+msgid "Possible actions for this %s key: "
 msgstr ""
 
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
+#: g10/keygen.c:1961
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
+msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
+#: g10/keygen.c:1967
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
+#: g10/keygen.c:1970
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-msgid "Please select what kind of key you want:\n"
-msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
-
+#: g10/keygen.c:2099
 #, fuzzy, c-format
-msgid "   (%d) RSA and RSA (default)\n"
+msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
+#: g10/keygen.c:2103
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal\n"
+msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#, c-format
-msgid "   (%d) DSA (sign only)\n"
+#: g10/keygen.c:2106
+#, fuzzy, c-format
+#| msgid "   (%d) DSA (sign only)\n"
+msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#, c-format
-msgid "   (%d) RSA (sign only)\n"
+#: g10/keygen.c:2108
+#, fuzzy, c-format
+#| msgid "   (%d) RSA (sign only)\n"
+msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
+#: g10/keygen.c:2114
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)%s\n"
+msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
+
+#: g10/keygen.c:2116
+#, fuzzy, c-format
+#| msgid "   (%d) RSA (encrypt only)\n"
+msgid "   (%d) RSA (encrypt only)%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2122
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2124
+#, fuzzy, c-format
+msgid "   (%d) RSA (set your own capabilities)%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2130
+#, fuzzy, c-format
+msgid "   (%d) ECC (sign and encrypt)%s\n"
+msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
+
+#: g10/keygen.c:2130 g10/keygen.c:2661
+#, fuzzy
+#| msgid " (default)"
+msgid " *default*"
+msgstr " (vaikimisi)"
+
+#: g10/keygen.c:2131
+#, fuzzy, c-format
+#| msgid "   (%d) DSA (sign only)\n"
+msgid "  (%d) ECC (sign only)\n"
+msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+
+#: g10/keygen.c:2133
 #, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
+msgid "  (%d) ECC (set your own capabilities)%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2135
+#, fuzzy, c-format
+#| msgid "   (%d) RSA (encrypt only)\n"
+msgid "  (%d) ECC (encrypt only)%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2139
+#, fuzzy, c-format
+msgid "  (%d) Existing key%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2141
+#, fuzzy, c-format
+msgid "  (%d) Existing key from card%s\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
+#, fuzzy
+msgid "Enter the keygrip: "
+msgstr "Allkirja noteerimine: "
 
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
-msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+msgid "Not a valid keygrip (expecting 40 hex digits)\n"
+msgstr ""
+
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
+#, fuzzy
+msgid "No key with this keygrip\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
 
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
+#: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+msgid "error reading the card: %s\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "blokeeri võti"
 
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, fuzzy, c-format
-msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "ümardatud üles %u bitini\n"
 
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
-msgstr "Millist võtmepikkust te soovite? (1024) "
-
-#, fuzzy, c-format
-msgid "What keysize do you want? (%u) "
-msgstr "Millist võtmepikkust te soovite? (1024) "
+msgstr "Millist võtmepikkust te soovite? (1024) "
 
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "Soovitud võtmepikkus on %u bitti\n"
+msgstr "Soovitud võtmepikkus on %u bitti\n"
 
+#: g10/keygen.c:2613
+#, fuzzy
+#| msgid "Please select what kind of key you want:\n"
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
+
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3689,13 +5641,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"Palun määrake, kui kaua on võti kehtiv.\n"
-"         0 = võti ei aegu\n"
-"      <n>  = võti aegub n päevaga\n"
-"      <n>w = võti aegub n nädalaga\n"
-"      <n>m = võti aegub n kuuga\n"
-"      <n>y = võti aegub n aastaga\n"
+"Palun määrake, kui kaua on võti kehtiv.\n"
+"         0 = võti ei aegu\n"
+"      <n>  = võti aegub n päevaga\n"
+"      <n>w = võti aegub n nädalaga\n"
+"      <n>m = võti aegub n kuuga\n"
+"      <n>y = võti aegub n aastaga\n"
 
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3704,50 +5657,60 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Palun määrake, kui kaua allkiri kehtib.\n"
+"Palun määrake, kui kaua allkiri kehtib.\n"
 "         0 = allkiri ei aegu\n"
-"      <n>  = allkiri aegub n päevaga\n"
-"      <n>w = allkiri aegub n nädalaga\n"
+"      <n>  = allkiri aegub n päevaga\n"
+"      <n>w = allkiri aegub n nädalaga\n"
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
-msgstr "Võti on kehtiv kuni? (0) "
+msgstr "Võti on kehtiv kuni? (0) "
 
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
-msgstr "vigane väärtus\n"
+msgstr "vigane väärtus\n"
 
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
-"Siiski käsitletakse neid korrektselt aastani 2106.\n"
+"Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
+"Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
-msgstr "On see õige (j/e)? "
+msgstr "On see õige (j/e)? "
 
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -3758,6 +5721,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:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -3768,39 +5732,47 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Võtme identifitseerimiseks on vaja määrata kasutaja; tarkvara konstrueerib\n"
-"kasutaja id kasutades pärisnime, kommentaari ja e-posti aadressi kujul:\n"
+"Võtme identifitseerimiseks on vaja määrata kasutaja; tarkvara konstrueerib\n"
+"kasutaja id kasutades pärisnime, kommentaari ja e-posti aadressi kujul:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
+#: g10/keygen.c:2990
 msgid "Real name: "
-msgstr "Pärisnimi: "
+msgstr "Pärisnimi: "
 
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
-msgstr "Lubamatu sümbol nimes\n"
+msgstr "Lubamatu sümbol nimes\n"
 
-msgid "Name may not start with a digit\n"
-msgstr "Nimi ei või alata numbriga\n"
-
-msgid "Name must be at least 5 characters long\n"
-msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
+#: g10/keygen.c:3000
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
 
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Kommentaar: "
 
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
-msgstr "Lubamatu sümbol kommentaaris\n"
+msgstr "Lubamatu sümbol kommentaaris\n"
 
-#, c-format
-msgid "You are using the `%s' character set.\n"
+#: g10/keygen.c:3067
+#, fuzzy, c-format
+#| msgid "You are using the `%s' character set.\n"
+msgid "You are using the '%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3811,9 +5783,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
+#: g10/keygen.c:3078
 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"
+msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -3828,46 +5802,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
+#: g10/keygen.c:3114
 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? "
-
-msgid "Please correct the error first\n"
-msgstr "Palun parandage kõigepealt viga\n"
-
-msgid ""
-"You need a Passphrase to protect your secret key.\n"
-"\n"
-msgstr ""
-"Te vajate oma salajase võtme kaitsmiseks parooli.\n"
-"\n"
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
+#: g10/keygen.c:3119
 #, fuzzy
-msgid ""
-"Please enter a passphrase to protect the off-card backup of the new "
-"encryption key."
-msgstr "Palun sisestage parool; see on salajane tekst \n"
+#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
-#, c-format
-msgid "%s.\n"
-msgstr "%s.\n"
+#: g10/keygen.c:3120
+#, fuzzy
+#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
-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"
-"using this program with the option \"--edit-key\".\n"
-"\n"
-msgstr ""
-"Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
-"Ma siiski täidan teie soovi. Te saate oma parooli alati muuta,\n"
-"kasutades seda programmi võtmega \"--edit-key\".\n"
-"\n"
+#: g10/keygen.c:3139
+msgid "Please correct the error first\n"
+msgstr "Palun parandage kõigepealt viga\n"
 
+#: g10/keygen.c:3185
 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"
@@ -3876,662 +5839,882 @@ msgid ""
 msgstr ""
 "Me peame genereerima palju juhuslikke baite. Praegu oleks hea teostada\n"
 "arvutil mingeid teisi tegevusi (kirjutada klaviatuuril, liigutada hiirt,\n"
-"kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
+"kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-msgid "Key generation canceled.\n"
-msgstr "Võtme genereerimine katkestati.\n"
-
+#: g10/keygen.c:3567
 #, c-format
-msgid "writing public key to `%s'\n"
-msgstr "kirjutan avaliku võtme faili `%s'\n"
-
-#, fuzzy, c-format
-msgid "writing secret key stub to `%s'\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+msgid "WARNING: v4 is specified, but overridden by v5.\n"
+msgstr ""
 
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
-msgid "writing secret key to `%s'\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+msgid "Key generation failed: %s\n"
+msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
+#: g10/keygen.c:4673
 #, c-format
-msgid "no writable public keyring found: %s\n"
-msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
+msgid ""
+"About to create a key for:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:4675
+msgid "Continue? (Y/n) "
+msgstr ""
 
+#: g10/keygen.c:4696
+#, fuzzy, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "`%s' on juba pakitud\n"
+
+#: g10/keygen.c:4701
+#, fuzzy
+msgid "Create anyway? (y/N) "
+msgstr "Kasutan seda võtit ikka? "
+
+#: g10/keygen.c:4707
+#, fuzzy, c-format
+msgid "creating anyway\n"
+msgstr "genereeri uus võtmepaar"
+
+#: g10/keygen.c:5166
 #, c-format
-msgid "no writable secret keyring found: %s\n"
-msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
+msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
+msgstr ""
 
+#: g10/keygen.c:5215
 #, c-format
-msgid "error writing public keyring `%s': %s\n"
-msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "Key generation canceled.\n"
+msgstr "Võtme genereerimine katkestati.\n"
+
+#: g10/keygen.c:5275
+#, fuzzy, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
+
+#: g10/keygen.c:5295
+#, fuzzy, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
+
+#: g10/keygen.c:5470 g10/keygen.c:5675
+#, fuzzy, c-format
+#| msgid "writing public key to `%s'\n"
+msgid "writing public key to '%s'\n"
+msgstr "kirjutan avaliku võtme faili `%s'\n"
 
+#: g10/keygen.c:5669
 #, c-format
-msgid "error writing secret keyring `%s': %s\n"
-msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "no writable public keyring found: %s\n"
+msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
+#: g10/keygen.c:5683
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error writing public keyring '%s': %s\n"
+msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
-msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
+msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
+#: g10/keygen.c:5730
 #, fuzzy
 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"
 msgstr ""
-"Pidage silmas, et seda võtit ei saa kasutada krüptimiseks. \n"
-"Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
-"kasutades võtit \"--edit-key\".\n"
-
-#, c-format
-msgid "Key generation failed: %s\n"
-msgstr "Võtme genereerimine ebaõnnestus: %s\n"
+"Pidage silmas, et seda võtit ei saa kasutada krüptimiseks. \n"
+"Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
+"kasutades võtit \"--edit-key\".\n"
 
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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"
+msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, 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"
-
-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"
-
-#, fuzzy
-msgid "Really create? (y/N) "
-msgstr "Loon tõesti? "
+msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
 
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, fuzzy, c-format
-msgid "storing key onto card failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+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"
 
-#, fuzzy, c-format
-msgid "can't create backup file `%s': %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#: g10/keygen.c:5937 g10/keygen.c:5939
+#, c-format
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, fuzzy, c-format
-msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
+
+#: g10/keygen.c:5973 g10/keygen.c:6147
+#, fuzzy
+msgid "Really create? (y/N) "
+msgstr "Loon tõesti? "
 
+#: g10/keyid.c:753 g10/keyid.c:768 g10/keyid.c:783
 msgid "never     "
 msgstr "mitte kunagi"
 
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Teatelühend: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Omadused: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
+#: g10/keylist.c:717
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d halba allkirja\n"
+msgstr[1] "%d halba allkirja\n"
+
+#: g10/keylist.c:730
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 allkiri jäi vea tõttu kontrollimata\n"
+msgstr[1] "1 allkiri jäi vea tõttu kontrollimata\n"
+
+#: g10/keylist.c:816
+#, 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] ""
+msgstr[1] ""
+
+#: g10/keylist.c:839
 msgid "Keyring"
-msgstr "Võtmehoidla"
+msgstr "Võtmehoidla"
 
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
-msgstr "Primaarse võtme sõrmejälg:"
+msgstr "Primaarse võtme sõrmejälg:"
 
+#: g10/keylist.c:2378
 msgid "     Subkey fingerprint:"
-msgstr "    Alamvõtme sõrmejälg:"
+msgstr "    Alamvõtme sõrmejälg:"
 
-#. TRANSLATORS: this should fit into 24 bytes to that the
+#. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
-msgstr " Primaarse võtme sõrmejälg:"
+msgstr " Primaarse võtme sõrmejälg:"
 
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid "      Subkey fingerprint:"
-msgstr "     Alamvõtme sõrmejälg:"
+msgstr "     Alamvõtme sõrmejälg:"
 
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid "      Key fingerprint ="
-msgstr "     Võtme sõrmejälg ="
-
-#, fuzzy, c-format
-msgid "WARNING: a PGP-2 fingerprint is not safe\n"
-msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+msgstr "     Võtme sõrmejälg ="
 
+#: g10/keylist.c:2460
 msgid "      Card serial no. ="
 msgstr ""
 
+#: g10/keyring.c:1477
 #, fuzzy, c-format
-msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
-
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
-
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s ei ole muudetud\n"
-
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s on uus\n"
-
-msgid "Please fix this possible security flaw\n"
-msgstr "Palun parandage see võimalik turvaprobleem\n"
+msgid "caching keyring '%s'\n"
+msgstr "kontrollin võtmehoidlat `%s'\n"
 
+#: g10/keyring.c:1551
 #, fuzzy, c-format
-msgid "caching keyring `%s'\n"
-msgstr "kontrollin võtmehoidlat `%s'\n"
+msgid "%lu keys cached so far (%lu signature)\n"
+msgid_plural "%lu keys cached so far (%lu signatures)\n"
+msgstr[0] "kontrollitud %lu võtit (%lu allkirja)\n"
+msgstr[1] "kontrollitud %lu võtit (%lu allkirja)\n"
 
-#, fuzzy, c-format
-msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "kontrollitud %lu võtit (%lu allkirja)\n"
+#: g10/keyring.c:1567
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] ""
+msgstr[1] ""
 
+#: g10/keyring.c:1569
 #, fuzzy, c-format
-msgid "%lu keys cached (%lu signatures)\n"
-msgstr "kontrollitud %lu võtit (%lu allkirja)\n"
+#| msgid "1 bad signature\n"
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] "1 halb allkiri\n"
+msgstr[1] "1 halb allkiri\n"
 
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: võtmehoidla on loodud\n"
+msgstr "%s: võtmehoidla on loodud\n"
 
-msgid "include revoked keys in search results"
+#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
 msgstr ""
 
-msgid "include subkeys when searching by key ID"
+#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
 msgstr ""
 
-msgid "use temporary files to pass data to keyserver helpers"
+#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
 msgstr ""
 
-msgid "do not delete temporary files after using them"
+#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
 msgstr ""
 
+#: g10/keyserver.c:99
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:101
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-msgid "honor the PKA record set on a key when retrieving keys"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
-
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "vigased ekspordi võtmed\n"
-
-#, fuzzy, c-format
-msgid "key \"%s\" not found on keyserver\n"
-msgstr "võtit '%s' ei leitud: %s\n"
+msgstr "vigased ekspordi võtmed\n"
 
-#, fuzzy
-msgid "key not found on keyserver\n"
-msgstr "võtit '%s' ei leitud: %s\n"
+#: g10/keyserver.c:809 g10/keyserver.c:919
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr ""
 
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "küsin võtit %08lX võtmeserverist %s\n"
+msgid "refreshing %d key from %s\n"
+msgid_plural "refreshing %d keys from %s\n"
+msgstr[0] "küsin võtit %08lX võtmeserverist %s\n"
+msgstr[1] "küsin võtit %08lX võtmeserverist %s\n"
 
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
-msgid "requesting key %s from %s\n"
-msgstr "küsin võtit %08lX võtmeserverist %s\n"
+msgid "WARNING: unable to refresh key %s via %s: %s\n"
+msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
-msgid "searching for names from %s server %s\n"
-msgstr "otsin \"%s\" HKP serverist %s\n"
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
-msgid "searching for names from %s\n"
-msgstr "otsin \"%s\" HKP serverist %s\n"
+msgid "key not found on keyserver\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
-msgid "sending key %s to %s server %s\n"
-msgstr "otsin \"%s\" HKP serverist %s\n"
+msgid "requesting key %s from %s\n"
+msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
-msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"allkirjastatud teie võtmega %08lX %s\n"
+msgid "no keyserver known\n"
+msgstr "vigased ekspordi võtmed\n"
 
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
-msgid "searching for \"%s\" from %s server %s\n"
-msgstr "otsin \"%s\" HKP serverist %s\n"
+msgid "skipped \"%s\": %s\n"
+msgstr "`%s' jätsin vahele: %s\n"
 
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
-msgid "searching for \"%s\" from %s\n"
-msgstr "otsin \"%s\" HKP serverist %s\n"
-
-#, fuzzy
-msgid "no keyserver action!\n"
-msgstr "vigased ekspordi võtmed\n"
-
-#, c-format
-msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
-
-msgid "keyserver did not send VERSION\n"
+msgid "sending key %s to %s\n"
 msgstr ""
+"\"\n"
+"allkirjastatud teie võtmega %08lX %s\n"
 
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
-
-msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
-
-msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
-
-#, c-format
-msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
-
-#, c-format
-msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
-
-#, c-format
-msgid "%s does not support handler version %d\n"
-msgstr ""
-
-#, fuzzy
-msgid "keyserver timed out\n"
-msgstr "võtmeserveri viga"
-
-#, fuzzy
-msgid "keyserver internal error\n"
-msgstr "võtmeserveri viga"
-
-#, c-format
-msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgid "requesting key from '%s'\n"
+msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
-msgid "WARNING: unable to refresh key %s via %s: %s\n"
+msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "refreshing 1 key from %s\n"
-msgstr "küsin võtit %08lX võtmeserverist %s\n"
+#: g10/mainproc.c:295
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "veider suurus krüptitud sessiooni võtme jaoks (%d)\n"
 
+#: g10/mainproc.c:398
 #, fuzzy, c-format
-msgid "refreshing %d keys from %s\n"
-msgstr "küsin võtit %08lX võtmeserverist %s\n"
+#| msgid "%s encrypted session key\n"
+msgid "%s.%s encrypted session key\n"
+msgstr "%s krüpteeritud sessiooni võti\n"
 
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
-msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
+#| msgid "%s encrypted data\n"
+msgid "%s.%s encrypted data\n"
+msgstr "%s krüpteeritud andmed\n"
 
+#: g10/mainproc.c:405
 #, fuzzy, c-format
-msgid "WARNING: unable to parse URI %s\n"
-msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
-
-#, c-format
-msgid "weird size for an encrypted session key (%d)\n"
-msgstr "veider suurus krüptitud sessiooni võtme jaoks (%d)\n"
-
-#, c-format
-msgid "%s encrypted session key\n"
-msgstr "%s krüpteeritud sessiooni võti\n"
+#| msgid "encrypted with unknown algorithm %d\n"
+msgid "encrypted with unknown algorithm %d.%s\n"
+msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "krüpteeritud tundmatu algoritmiga %d\n"
+msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
-msgstr "avalik võti on %08lX\n"
-
-msgid "public key encrypted data: good DEK\n"
-msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
+msgstr "avalik võti on %08lX\n"
 
+#: g10/mainproc.c:564
 #, fuzzy, c-format
-msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
+msgid "encrypted with %s key, ID %s, created %s\n"
+msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
 
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "krüpteeritud %s võtmega, ID %08lX\n"
+msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
-msgid "public key decryption failed: %s\n"
-msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr ""
 
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "krüpteeritud kasutades %lu parooli\n"
+msgstr "krüpteeritud kasutades %lu parooli\n"
 
+#: g10/mainproc.c:605
+#, c-format
 msgid "encrypted with 1 passphrase\n"
-msgstr "krüpteeritud ühe parooliga\n"
+msgstr "krüpteeritud ühe parooliga\n"
+
+#: g10/mainproc.c:620 g10/mainproc.c:645
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
+#: g10/mainproc.c:656
+#, c-format
+msgid "public key encrypted data: good DEK\n"
+msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
+
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "eeldan %s krüpteeritud andmeid\n"
+msgstr "eeldan %s krüpteeritud andmeid\n"
 
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA ¨iffer pole saadaval, loodan kasutada selle asemel %s\n"
-
-msgid "decryption okay\n"
-msgstr "lahtikrüpteerimine õnnestus\n"
+msgstr "IDEA šiffer pole saadaval, loodan kasutada selle asemel %s\n"
 
+#: g10/mainproc.c:799 g10/mainproc.c:843
+#, c-format
 msgid "WARNING: message was not integrity protected\n"
-msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
+msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
 
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
+#: g10/mainproc.c:810
+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"
+"then integrity protection was not widely used.\n"
+msgstr ""
 
+#: g10/mainproc.c:813
 #, c-format
-msgid "cleared passphrase cached with ID: %s\n"
+msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
+#: g10/mainproc.c:818
+#, fuzzy, c-format
+#| msgid "decryption failed: %s\n"
+msgid "decryption forced to fail!\n"
+msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
+
+#: g10/mainproc.c:830
+#, c-format
+msgid "decryption okay\n"
+msgstr "lahtikrüpteerimine õnnestus\n"
+
+#: g10/mainproc.c:849
+#, c-format
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
+
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
+msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
+
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
 
-msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
+#: g10/mainproc.c:944
+#, fuzzy, c-format
+#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
 
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-msgid "WARNING: multiple plaintexts seen\n"
-msgstr ""
-
+#: g10/mainproc.c:1228
+#, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
+msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#, fuzzy
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
+#, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
+#: g10/mainproc.c:1856
+#, fuzzy, c-format
+msgid "BAD signature from \"%s\""
+msgstr "HALB allkiri kasutajalt \""
+
+#: g10/mainproc.c:1858
+#, fuzzy, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Aegunud allkiri kasutajalt \""
+
+#: g10/mainproc.c:1860
+#, fuzzy, c-format
+msgid "Good signature from \"%s\""
+msgstr "Korrektne allkiri kasutajalt \""
+
+#: g10/mainproc.c:1882
+#, c-format
 msgid "signature verification suppressed\n"
-msgstr "allkirja kontroll jäeti ära\n"
+msgstr "allkirja kontroll jäeti ära\n"
 
-#, fuzzy
+#: g10/mainproc.c:1996
+#, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
-msgstr "neid allkirju ei õnnestu töödelda\n"
+msgstr "neid allkirju ei õnnestu töödelda\n"
 
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
+#: g10/mainproc.c:2024
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
-
-msgid "Key available at: "
-msgstr "Võtme leiate: "
+msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
 
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
-msgid "BAD signature from \"%s\""
-msgstr "HALB allkiri kasutajalt \""
+msgid "               issuer \"%s\"\n"
+msgstr "                 ka \""
 
-#, fuzzy, c-format
-msgid "Expired signature from \"%s\""
-msgstr "Aegunud allkiri kasutajalt \""
+#: g10/mainproc.c:2085
+#, c-format
+msgid "Key available at: "
+msgstr "Võtme leiate: "
 
-#, fuzzy, c-format
-msgid "Good signature from \"%s\""
-msgstr "Korrektne allkiri kasutajalt \""
+#: g10/mainproc.c:2127
+#, c-format
+msgid "Note: Use '%s' to make use of this info\n"
+msgstr ""
 
+#: g10/mainproc.c:2327
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
+#: g10/mainproc.c:2442 sm/verify.c:532
+#, fuzzy, c-format
+#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgid "WARNING: This key is not suitable for signing in %s mode\n"
+msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
+
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#, c-format
-msgid "%s signature, digest algorithm %s\n"
-msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+#: g10/mainproc.c:2474
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binaarne"
 
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "tekstimood"
 
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tundmatu"
 
+#: g10/mainproc.c:2478
+#, fuzzy
+#| msgid "unknown pubkey algorithm"
+msgid ", key algorithm "
+msgstr "tundmatu avaliku võtme algoritm"
+
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
+#, c-format
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
+#: g10/mainproc.c:2711
+#, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
+#: g10/mainproc.c:2805
+#, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-msgid "invalid root packet detected in proc_tree()\n"
-msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
-
+#: g10/misc.c:107 g10/misc.c:137 g10/misc.c:213
 #, fuzzy, c-format
-msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "faili ei õnnestu avada: %s\n"
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "faili ei õnnestu avada: %s\n"
 
+#: g10/misc.c:176
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
+msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
+#: g10/misc.c:304
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
+msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
-#, fuzzy
+#: g10/misc.c:311
+#, fuzzy, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 msgstr ""
-"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
+#: g10/misc.c:325
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "realiseerimata ¨ifri algoritm"
+msgstr "realiseerimata šifri algoritm"
 
+#: g10/misc.c:343
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
+#: g10/misc.c:380
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
+#: g10/misc.c:396
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA ¨ifri lisandprogrammi pole\n"
+#: g10/misc.c:421
+#, fuzzy, c-format
+msgid "(reported error: %s)\n"
+msgstr "viga lugemisel: %s\n"
 
+#: g10/misc.c:424
 #, fuzzy, c-format
-msgid "please see %s for more information\n"
-msgstr " i = esita palun täiendavat infot\n"
+msgid "(reported error: %s <%s>)\n"
+msgstr "viga lugemisel: %s\n"
 
+#: g10/misc.c:443 sm/misc.c:51
 #, c-format
-msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
+msgid "(further info: "
+msgstr ""
 
+#: g10/misc.c:1184
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
 
+#: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
+#: g10/misc.c:1197
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
-
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
+#: g10/misc.c:1207
 #, fuzzy, c-format
-msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
+#: g10/misc.c:1211
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
+#: g10/misc.c:1308
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1333
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
+#: g10/misc.c:1619
 #, fuzzy, c-format
-msgid "ambiguous option `%s'\n"
-msgstr "loen võtmeid failist `%s'\n"
+msgid "ambiguous option '%s'\n"
+msgstr "loen võtmeid failist `%s'\n"
 
+#: g10/misc.c:1644
 #, fuzzy, c-format
-msgid "unknown option `%s'\n"
+msgid "unknown option '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
+#: g10/misc.c:1882
 #, c-format
-msgid "File `%s' exists. "
+msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+msgstr ""
+
+#: g10/misc.c:1904
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "tundmatu allkirja klass"
+
+#: g10/openfile.c:78
+#, fuzzy, c-format
+#| msgid "File `%s' exists. "
+msgid "File '%s' exists. "
 msgstr "Fail `%s' on olemas. "
 
+#: g10/openfile.c:82
 #, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "Kirjutan üle (j/E)? "
+msgstr "Kirjutan üle (j/E)? "
 
+#: g10/openfile.c:117
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tundmatu suffiks\n"
 
+#: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
+#: g10/openfile.c:214
+#, c-format
 msgid "writing to stdout\n"
-msgstr "kirjutan standardväljundisse\n"
+msgstr "kirjutan standardväljundisse\n"
 
+#: g10/openfile.c:362
 #, fuzzy, c-format
 #| msgid "assuming signed data in `%s'\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#, c-format
-msgid "new configuration file `%s' created\n"
-msgstr "uus omaduste fail `%s' on loodud\n"
-
-#, c-format
-msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
-
+#: g10/parse-packet.c:357
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
+msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
+#: g10/parse-packet.c:1299
+#, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
-"HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni "
-"võti\n"
+"HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni "
+"võti\n"
 
+#: g10/parse-packet.c:1818
+#, fuzzy, c-format
+#| msgid "Critical signature notation: "
+msgid "Unknown critical signature notation: "
+msgstr "Kriitiline allkirja noteerimine: "
+
+#: g10/parse-packet.c:1946
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
+msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
 
-#, fuzzy, c-format
-msgid "problem with the agent: %s\n"
-msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-
-#, fuzzy, c-format
-msgid " (main key ID %s)"
-msgstr " (peamise võtme ID %08lX)"
-
-#, fuzzy, c-format
-msgid ""
-"Please enter the passphrase to unlock the secret key for the OpenPGP "
-"certificate:\n"
-"\"%.*s\"\n"
-"%u-bit %s key, ID %s,\n"
-"created %s%s.\n"
-msgstr ""
-"Te vajate kasutaja salajase võtme lahtilukustamiseks parooli:\n"
-"\"%.*s\"\n"
-"%u-bitti %s võti, ID %08lX, loodud %s%s\n"
+#: g10/passphrase.c:201 sm/decrypt.c:661
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "muuda parooli"
 
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
+#: g10/passphrase.c:227
+#, c-format
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
+#: g10/passphrase.c:483
 #, fuzzy, c-format
-msgid ""
-"You need a passphrase to unlock the secret key for\n"
-"user: \"%s\"\n"
-msgstr ""
-"\n"
-"Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
-"parooli: \""
+msgid " (main key ID %s)"
+msgstr " (peamise võtme ID %08lX)"
 
-#, fuzzy, c-format
-msgid "%u-bit %s key, ID %s, created %s"
-msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
+#: g10/passphrase.c:490
+#, fuzzy
+msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#, c-format
-msgid "         (subkey on main key ID %s)"
-msgstr ""
+#: g10/passphrase.c:494
+#, fuzzy
+msgid "Please enter the passphrase to import the OpenPGP secret key:"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: g10/passphrase.c:499
+#, fuzzy
+msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: g10/passphrase.c:502
+#, fuzzy
+msgid "Please enter the passphrase to export the OpenPGP secret key:"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: g10/passphrase.c:507
+#, fuzzy
+msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
+msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
+
+#: g10/passphrase.c:510
+#, fuzzy
+msgid "Do you really want to permanently delete the OpenPGP secret key:"
+msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
+
+#: g10/passphrase.c:515
+#, fuzzy
+msgid "Please enter the passphrase to export the secret key with keygrip:"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: g10/passphrase.c:529
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+"%s"
+msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
 
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4541,55 +6724,89 @@ msgid ""
 msgstr ""
 "\n"
 "Valige foto ID'na kasutatav pilt. Pilt peab olema JPEG fail.\n"
-"Pidage meeles, et pilt salvestatakse teie avalikus võtmes. Kui kasutate\n"
-"väga suurt pilti, on ka kõti väha suur!\n"
-"Mõistlik pildi suurus võiks olla umbes 240x288.\n"
+"Pidage meeles, et pilt salvestatakse teie avalikus võtmes. Kui kasutate\n"
+"väga suurt pilti, on ka kõti väha suur!\n"
+"Mõistlik pildi suurus võiks olla umbes 240x288.\n"
 
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
+#: g10/photoid.c:227
 #, fuzzy, c-format
-msgid "unable to open JPEG file `%s': %s\n"
-msgstr "faili ei õnnestu avada: %s\n"
+msgid "unable to open JPEG file '%s': %s\n"
+msgstr "faili ei õnnestu avada: %s\n"
 
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
+#: g10/photoid.c:263
 #, fuzzy, c-format
-msgid "`%s' is not a JPEG file\n"
+msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
-msgstr "On see foto õige (j/E/v)? "
+msgstr "On see foto õige (j/E/v)? "
 
-msgid "unable to display photo ID!\n"
-msgstr "foto ID ei saa näidata!\n"
+#: g10/photoid.c:427
+#, c-format
+msgid "no remote program execution supported\n"
+msgstr "mittelokaalse programmi käivitamist ei toetata\n"
 
-msgid "No reason specified"
-msgstr "Põhjus puudub"
+#: g10/photoid.c:599
+#, fuzzy, c-format
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"see platvorm nõuab väliste programmide käivitamiseks ajutiste failide "
+"kasutamist\n"
 
-msgid "Key is superseded"
-msgstr "Võti on asendatud"
+#: g10/photoid.c:619
+#, fuzzy, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
 
-msgid "Key has been compromised"
-msgstr "Võti on kompromiteeritud"
+#: g10/photoid.c:630 g10/photoid.c:707
+#, c-format
+msgid "unnatural exit of external program\n"
+msgstr "väline programm lõpetas erandlikult\n"
 
-msgid "Key is no longer used"
-msgstr "Võti ei ole enam kasutusel"
+#: g10/photoid.c:695
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "süsteemi viga välise programmi kasutamisel: %s\n"
 
-msgid "User ID is no longer valid"
-msgstr "Kasutaja ID ei ole enam kehtiv"
+#: g10/photoid.c:713
+#, fuzzy, c-format
+#| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-msgid "reason for revocation: "
-msgstr "tühistamise põhjus: "
+#: g10/photoid.c:717
+#, fuzzy, c-format
+#| msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "HOIATUS: ei õnnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-msgid "revocation comment: "
-msgstr "tühistamise kommentaar: "
+#: g10/photoid.c:748
+#, c-format
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"väliste programmide käivitamine on blokeeritud, kuna seadete failil on\n"
+"ebaturvalised õigused\n"
+
+#: g10/photoid.c:828
+#, c-format
+msgid "unable to display photo ID!\n"
+msgstr "foto ID ei saa näidata!\n"
 
 #. TRANSLATORS: These are the allowed answers in lower and
 #. uppercase.  Below you will find the matching strings which
@@ -4601,310 +6818,517 @@ msgstr "t
 #. s = skip this key
 #. q = quit
 #.
+#: g10/pkclist.c:219
 msgid "iImMqQsS"
 msgstr "iItTvVjJ"
 
+#: g10/pkclist.c:227
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
-"Usalduse väärtus puudub:\n"
+"Usalduse väärtus puudub:\n"
 "%4u%c/%08lX %s \""
 
+#: g10/pkclist.c:260
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                 ka \""
 
+#: g10/pkclist.c:270
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "See võti kuulub tõenäoliselt omanikule\n"
+msgstr "See võti kuulub tõenäoliselt omanikule\n"
 
+#: g10/pkclist.c:285
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ei tea\n"
 
+#: g10/pkclist.c:287
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EI usalda\n"
 
+#: g10/pkclist.c:293
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
+#: g10/pkclist.c:299
 #, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " t = tagasi põhimenüüsse\n"
+msgstr " t = tagasi põhimenüüsse\n"
 
+#: g10/pkclist.c:302
 #, fuzzy
 msgid "  s = skip this key\n"
-msgstr " j = jäta see võti vahele\n"
+msgstr " j = jäta see võti vahele\n"
 
+#: g10/pkclist.c:303
 #, fuzzy
 msgid "  q = quit\n"
-msgstr " v = välju\n"
+msgstr " v = välju\n"
 
+#: g10/pkclist.c:307
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
+#: g10/pkclist.c:334
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Kas te tõesti soovite seda võtit absoluutselt usaldada? "
+msgstr "Kas te tõesti soovite seda võtit absoluutselt usaldada? "
 
+#: g10/pkclist.c:348
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Sertifikaadid täiesti usaldatava võtmeni:\n"
+msgstr "Sertifikaadid täiesti usaldatava võtmeni:\n"
 
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
-msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
+msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
 
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
-msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
+msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
 
-#, fuzzy
+#: g10/pkclist.c:452
+#, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
-msgstr "See võti kuulub tõenäoliselt omanikule\n"
+msgstr "See võti kuulub tõenäoliselt omanikule\n"
 
+#: g10/pkclist.c:457
+#, c-format
 msgid "This key belongs to us\n"
-msgstr "See võti kuulub meile\n"
+msgstr "See võti kuulub meile\n"
 
+#: g10/pkclist.c:463
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#: g10/pkclist.c:491
+#, fuzzy
+msgid ""
+"This key is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"EI ole kindel, et see võti kuulub isikule, keda mainitakse\n"
+"kasutaja ID väljal. Kui te *tõesti* teate, mida te teete,\n"
+"võite järgnevale küsimusele vastata jaatavalt\n"
+"\n"
+
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
-"EI ole kindel, et see võti kuulub isikule, keda mainitakse\n"
-"kasutaja ID väljal. Kui te *tõesti* teate, mida te teete,\n"
-"võite järgnevale küsimusele vastata jaatavalt\n"
+"EI ole kindel, et see võti kuulub isikule, keda mainitakse\n"
+"kasutaja ID väljal. Kui te *tõesti* teate, mida te teete,\n"
+"võite järgnevale küsimusele vastata jaatavalt\n"
 "\n"
 
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "Kasutan seda võtit ikka? "
+msgstr "Kasutan seda võtit ikka? "
 
+#: g10/pkclist.c:593
+#, c-format
 msgid "WARNING: Using untrusted key!\n"
-msgstr "HOIATUS: Kasutan mitteusaldatavat võtit!\n"
+msgstr "HOIATUS: Kasutan mitteusaldatavat võtit!\n"
 
+#: g10/pkclist.c:604
+#, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "HOIATUS: see võti võib olla tühistatud (tühistamise võtit pole)\n"
+msgstr "HOIATUS: see võti võib olla tühistatud (tühistamise võtit pole)\n"
+
+#: g10/pkclist.c:673
+#, fuzzy, c-format
+msgid "checking User ID \"%s\"\n"
+msgstr "kasutaja ID: \""
+
+#: g10/pkclist.c:685
+#, fuzzy, c-format
+msgid "option %s given but issuer \"%s\" does not match\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: g10/pkclist.c:688
+#, fuzzy, c-format
+msgid "issuer \"%s\" does not match any User ID\n"
+msgstr "võti %08lX: ei sobi meie koopiaga\n"
+
+#: g10/pkclist.c:691
+#, fuzzy, c-format
+msgid "option %s given but no matching User ID found\n"
+msgstr "vigane räsialgoritm `%s'\n"
 
+#: g10/pkclist.c:700
+#, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
+msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
 
+#: g10/pkclist.c:703
+#, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n"
+msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n"
 
-#, fuzzy
+#: g10/pkclist.c:704
+#, fuzzy, c-format
 msgid "         This could mean that the signature is forged.\n"
-msgstr "         See võib tähendada, et allkiri on võltsing.\n"
+msgstr "         See võib tähendada, et allkiri on võltsing.\n"
 
+#: g10/pkclist.c:710
+#, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "HOIATUS: See alamvõti on omaniku poolt tühistatud!\n"
-
-msgid "Note: This key has been disabled.\n"
-msgstr "Märkus: See võti on blokeeritud.\n"
+msgstr "HOIATUS: See alamvõti on omaniku poolt tühistatud!\n"
 
+#: g10/pkclist.c:715
 #, c-format
-msgid "Note: Verified signer's address is `%s'\n"
-msgstr ""
+msgid "Note: This key has been disabled.\n"
+msgstr "Märkus: See võti on blokeeritud.\n"
 
+#: g10/pkclist.c:721
 #, c-format
-msgid "Note: Signer's address `%s' does not match DNS entry\n"
-msgstr ""
-
-msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-msgstr ""
-
-msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-msgstr ""
-
 msgid "Note: This key has expired!\n"
-msgstr "Märkus: See võti on aegunud!\n"
+msgstr "Märkus: See võti on aegunud!\n"
+
+#: g10/pkclist.c:733
+#, fuzzy, c-format
+#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
+msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
+#: g10/pkclist.c:736
+#, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
+msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
+#: g10/pkclist.c:738
+#, c-format
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Ei ole midagi, mis näitaks, et allkiri kuulub omanikule.\n"
+msgstr "         Ei ole midagi, mis näitaks, et allkiri kuulub omanikule.\n"
 
+#: g10/pkclist.c:747
+#, c-format
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "HOIATUS: Me EI usalda seda võtit!\n"
+msgstr "HOIATUS: Me EI usalda seda võtit!\n"
 
+#: g10/pkclist.c:748
+#, c-format
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "         Allkiri on tõenäoliselt VÕLTSING.\n"
+msgstr "         Allkiri on tõenäoliselt VÕLTSING.\n"
 
+#: g10/pkclist.c:757
+#, fuzzy, c-format
+#| msgid ""
+#| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: The key's User ID is not certified with sufficiently trusted "
+"signatures!\n"
+msgstr ""
+"HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava "
+"allkirjaga!\n"
+
+#: g10/pkclist.c:760
+#, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava "
+"HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
+#: g10/pkclist.c:762
+#, c-format
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
-msgstr "%s: jätsin vahele: %s\n"
+msgstr "%s: jätsin vahele: %s\n"
 
+#: g10/pkclist.c:908
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
+
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
+msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
+
+#: g10/pkclist.c:1030
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't encrypt to '%s'\n"
+msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
+
+#: g10/pkclist.c:1045
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: g10/pkclist.c:1052
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "vigane räsialgoritm `%s'\n"
 
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n"
+msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n"
 
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"Sisestage kasutaja ID.  Lõpetage tühja reaga: "
+"Sisestage kasutaja ID.  Lõpetage tühja reaga: "
 
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
+#, c-format
 msgid "skipped: public key already set as default recipient\n"
-msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
+msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
 
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
-msgstr "Avalik võti on blokeeritud.\n"
+msgstr "Avalik võti on blokeeritud.\n"
 
+#: g10/pkclist.c:1273
+#, c-format
 msgid "skipped: public key already set\n"
-msgstr "jätsin vahele: avalik võti on juba olemas\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
+#: g10/pkclist.c:1358
 #, c-format
-msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
-
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
-msgstr "võti %08lX: kasutaja ID puudub\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
 
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
-msgstr "võti %08lX: kasutaja ID puudub\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
 
+#: g10/plaintext.c:85
+#, c-format
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "andmeid ei salvestatud; salvestamiseks kasutage võtit \"--output\"\n"
+msgstr "andmeid ei salvestatud; salvestamiseks kasutage võtit \"--output\"\n"
 
+#: g10/plaintext.c:606
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
+#: g10/plaintext.c:614
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
+#: g10/plaintext.c:651
+#, c-format
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
+#: g10/plaintext.c:696
+#, c-format
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#, c-format
-msgid "can't open signed data `%s'\n"
-msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
+#: g10/plaintext.c:714
+#, fuzzy, c-format
+#| msgid "can't open signed data `%s'\n"
+msgid "can't open signed data '%s'\n"
+msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
 
+#: g10/plaintext.c:749
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
-msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
+msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
+
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
+#, fuzzy, c-format
+msgid "key %s is not suitable for decryption in %s mode\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
 
+#: g10/pubkey-enc.c:139
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
+msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
 
+#: g10/pubkey-enc.c:146 g10/pubkey-enc.c:159
+#, fuzzy, c-format
+msgid "used key is not marked for encryption use.\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
+
+#: g10/pubkey-enc.c:157
+#, c-format
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "ok, me oleme anonüümne teate saaja.\n"
+msgstr "ok, me oleme anonüümne teate saaja.\n"
 
+#: g10/pubkey-enc.c:327
+#, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
+#: g10/pubkey-enc.c:355
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "¨ifri algoritm %d%s on tundmatu või blokeeritud\n"
+msgstr "šifri algoritm %d%s on tundmatu või blokeeritud\n"
 
+#: g10/pubkey-enc.c:399
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "MÄRKUS: ¨ifri algoritm %d puudub eelistustes\n"
+msgstr "MÄRKUS: šifri algoritm %d puudub eelistustes\n"
 
+#: g10/pubkey-enc.c:432
 #, fuzzy, c-format
-msgid "NOTE: secret key %s expired at %s\n"
-msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
+msgid "Note: secret key %s expired at %s\n"
+msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
-msgid "NOTE: key has been revoked"
-msgstr "MÄRKUS: võti on tühistatud"
+#: g10/pubkey-enc.c:439
+#, fuzzy, c-format
+#| msgid "NOTE: key has been revoked"
+msgid "Note: key has been revoked"
+msgstr "MÄRKUS: võti on tühistatud"
 
+#: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
-msgstr "build_packet ebaõnnestus: %s\n"
+msgstr "build_packet ebaõnnestus: %s\n"
 
+#: g10/revoke.c:143
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
-msgstr "võti %08lX: kasutaja ID puudub\n"
+msgstr "võti %08lX: kasutaja ID puudub\n"
 
+#: g10/revoke.c:311
 msgid "To be revoked by:\n"
-msgstr "Tühistaja:\n"
+msgstr "Tühistaja:\n"
 
+#: g10/revoke.c:315
 msgid "(This is a sensitive revocation key)\n"
-msgstr "(See on tundlik tühistamise võti)\n"
+msgstr "(See on tundlik tühistamise võti)\n"
+
+#: g10/revoke.c:320
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Salajane võti on kasutatav.\n"
 
+#: g10/revoke.c:325
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
+msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
-msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n"
+msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n"
 
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet ebaõnnestus: %s\n"
+msgstr "make_keysig_packet ebaõnnestus: %s\n"
 
+#: g10/revoke.c:416
 msgid "Revocation certificate created.\n"
-msgstr "Tühistamise sertifikaat on loodud.\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
+#: g10/revoke.c:422
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
-"`%s' jaoks pole tühistamise võtmeid\n"
+"`%s' jaoks pole tühistamise võtmeid\n"
 "\n"
 
+#: g10/revoke.c:568
+#, fuzzy
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
+
+#: g10/revoke.c:584
+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"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+
+#: g10/revoke.c:587
+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"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation.  For details see the description of\n"
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
+msgstr ""
+
+#: g10/revoke.c:593
+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"
+"before importing and publishing this revocation certificate."
+msgstr ""
+
+#: g10/revoke.c:612
 #, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "salajast võtit `%s' ei leitud: %s\n"
+#| msgid "Revocation certificate created.\n"
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: g10/revoke.c:656
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "salajast võtit `%s' ei leitud: %s\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:681
 #, c-format
-msgid "no corresponding public key: %s\n"
-msgstr "vastavat avalikku võtit pole: %s\n"
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
 
-msgid "public key does not match secret key!\n"
-msgstr "avalik võti ei sobi salajase võtmega!\n"
+#: g10/revoke.c:706
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
-
-msgid "unknown protection algorithm\n"
-msgstr "tundmatu kaitsealgoritm\n"
-
-msgid "NOTE: This key is not protected!\n"
-msgstr "MÄRKUS: See võti ei ole kaitstud!\n"
+msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4914,2069 +7338,5201 @@ msgid ""
 "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"
 msgstr ""
-"Tühistamise sertifikaat on loodud.\n"
+"Tühistamise sertifikaat on loodud.\n"
 "\n"
-"Palun salvestage see andmekandjale, mida saate kindlasse kohta ära panna.\n"
-"Kui mallory saab sellele sertifikaadile juurdepääsu, võib ta seda kasutades\n"
-"muuta kõik teie võtmed kasutamiskõlbmatuks.\n"
-"Samuti on mõistlik trükkida see sertifikaat paberile ja panna hoiule "
+"Palun salvestage see andmekandjale, mida saate kindlasse kohta ära panna.\n"
+"Kui mallory saab sellele sertifikaadile juurdepääsu, võib ta seda kasutades\n"
+"muuta kõik teie võtmed kasutamiskõlbmatuks.\n"
+"Samuti on mõistlik trükkida see sertifikaat paberile ja panna hoiule "
 "juhuks,\n"
 "kui meedia muutub loetamatuks. Aga olge ettevaatlik: teie arvuti "
-"trükisüsteem\n"
-"võib salvestada need andmed ja teha teistele kättesaadavaks! \n"
+"trükisüsteem\n"
+"võib salvestada need andmed ja teha teistele kättesaadavaks! \n"
 
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
-msgstr "Palun valige tühistamise põhjus:\n"
+msgstr "Palun valige tühistamise põhjus:\n"
 
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Katkesta"
 
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "(Tõenäoliselt soovite siin valida %d)\n"
+msgstr "(Tõenäoliselt soovite siin valida %d)\n"
 
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
+msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
 
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "Tühistamise põhjus: %s\n"
+msgstr "Tühistamise põhjus: %s\n"
 
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "On see hästi? "
-
-msgid "secret key parts are not available\n"
-msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
-
-#, c-format
-msgid "protection algorithm %d%s is not supported\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
-
-#, fuzzy, c-format
-msgid "protection digest %d is not supported\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
-
-msgid "Invalid passphrase; please try again"
-msgstr "Vigane parool; palun proovige uuesti"
+msgstr "On see hästi? "
 
+#: g10/seskey.c:62 sm/encrypt.c:126
 #, c-format
-msgid "%s ...\n"
-msgstr "%s ...\n"
-
-msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "HOIATUS: Tuvastasin nõrga võtme - palun muutke uuesti parooli.\n"
-
-msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr ""
-"loon salajase võtme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
-
 msgid "weak key created - retrying\n"
-msgstr "loodi nõrk võti - proovin uuesti\n"
+msgstr "loodi nõrk võti - proovin uuesti\n"
 
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"sümmeetrilises ¨ifris ei õnnestu vältida nõrga võtme kasutamist; proovisin "
+"sümmeetrilises šifris ei õnnestu vältida nõrga võtme kasutamist; proovisin "
 "%d korda!\n"
 
-msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr ""
-
+#: g10/seskey.c:299
 #, c-format
-msgid "DSA key %s uses an unsafe (%u bit) hash\n"
+msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 msgstr ""
 
+#: g10/seskey.c:317
 #, c-format
-msgid "DSA key %s requires a %u bit or larger hash\n"
+msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
+#, fuzzy, c-format
+#| msgid "you may not use %s while in %s mode\n"
+msgid "key %s may not be used for signing in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/sig-check.c:192
+#, c-format
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
+msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
 
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
+msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
+
+#: g10/sig-check.c:224
+#, fuzzy, c-format
+msgid "please see %s for more information\n"
+msgstr " i = esita palun täiendavat infot\n"
 
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n"
+msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n"
 
+#: g10/sig-check.c:373
 #, 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"
+msgid_plural "public key %s is %lu seconds newer than the signature\n"
+msgstr[0] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
+msgstr[1] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 
+#: g10/sig-check.c:381
 #, 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"
+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] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
+msgstr[1] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 
+#: g10/sig-check.c:395 g10/sign.c:420
 #, 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"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+msgstr[1] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
+#: g10/sig-check.c:404
 #, 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"
+msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+msgstr[0] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+msgstr[1] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+
+#: g10/sig-check.c:422
+#, 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:433
+#, fuzzy, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "MÄRKUS: võti on tühistatud"
 
+#: g10/sig-check.c:525
 #, fuzzy, c-format
-msgid "NOTE: signature key %s expired %s\n"
-msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
+#| msgid "standalone signature of class 0x%02x\n"
+msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
+msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
+#: g10/sig-check.c:537
 #, fuzzy, c-format
-msgid "NOTE: signature key %s has been revoked\n"
-msgstr "MÄRKUS: võti on tühistatud"
+#| msgid "standalone signature of class 0x%02x\n"
+msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
+msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
+#: g10/sig-check.c:640
 #, 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"
+msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n"
 
+#: g10/sig-check.c:1235
 #, 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"
+msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n"
 
+#: g10/sig-check.c:1238
 #, 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"
+msgstr "võti %08lX: alamvõtme allkirjaga sidumiseks puudub alamvõti\n"
 
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
-"HOIATUS: noteerimise %%-asendus ebaõnnestus (liiga suur). Kasutan "
+"HOIATUS: noteerimise %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
+"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
+"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#, c-format
-msgid "checking created signature failed: %s\n"
-msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
-
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr ""
-"PGP 2.x stiilis võtmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
-
+#: g10/sign.c:1161
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
+#: g10/sign.c:1318
+#, c-format
 msgid "signing:"
 msgstr "allkirjastan:"
 
-msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr ""
-"PGP 2.x stiilis võtmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
+#: g10/sign.c:1645
+#, fuzzy, c-format
+#| msgid "%s encryption will be used\n"
+msgid "%s.%s encryption will be used\n"
+msgstr "kasutatakse %s krüpteerimist\n"
 
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
-msgid "%s encryption will be used\n"
-msgstr "kasutatakse %s krüpteerimist\n"
-
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
-"võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
+"võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
 
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "`%s' jätsin vahele: duplikaat\n"
-
-#, fuzzy, c-format
-msgid "skipped \"%s\": %s\n"
-msgstr "`%s' jätsin vahele: %s\n"
+msgstr "`%s' jätsin vahele: duplikaat\n"
 
+#: g10/skclist.c:224
+#, c-format
 msgid "skipped: secret key already present\n"
-msgstr "jätsin vahele: avalik võti on juba olemas\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"jätsin `%s' vahele: see on PGP genereeritud ElGamal võti,\n"
+"jätsin `%s' vahele: see on PGP genereeritud ElGamal võti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
+#: g10/tdbdump.c:57 g10/trustdb.c:494
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
+msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
 
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# Omistatud usalduse väärtuste loend, loodud: %s\n"
+"# Omistatud usalduse väärtuste loend, loodud: %s\n"
 "# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
 
+#: g10/tdbdump.c:164 g10/tdbdump.c:172 g10/tdbdump.c:177 g10/tdbdump.c:182
 #, fuzzy, c-format
-msgid "error in `%s': %s\n"
+msgid "error in '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
+#: g10/tdbdump.c:164
 #, fuzzy
 msgid "line too long"
 msgstr "rida on liiga pikk\n"
 
+#: g10/tdbdump.c:172
 msgid "colon missing"
 msgstr ""
 
+#: g10/tdbdump.c:178
 #, fuzzy
 msgid "invalid fingerprint"
-msgstr "viga: vigane sõrmejälg\n"
+msgstr "viga: vigane sõrmejälg\n"
 
+#: g10/tdbdump.c:183
 #, fuzzy
 msgid "ownertrust value missing"
-msgstr "impordi usalduse väärtused"
+msgstr "impordi usalduse väärtused"
 
+#: g10/tdbdump.c:226
 #, fuzzy, c-format
-msgid "error finding trust record in `%s': %s\n"
+msgid "error finding trust record in '%s': %s\n"
 msgstr "viga usalduse kirje otsimisel: %s\n"
 
+#: g10/tdbdump.c:230
 #, fuzzy, c-format
-msgid "read error in `%s': %s\n"
+msgid "read error in '%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
+#: g10/tdbdump.c:239 g10/trustdb.c:509
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "trustdb: sync ebaõnnestus: %s\n"
+msgstr "trustdb: sync ebaõnnestus: %s\n"
 
+#: g10/tdbio.c:137
 #, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+msgid "can't create lock for '%s'\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
 
+#: g10/tdbio.c:142
 #, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "`%s' ei õnnestu avada\n"
+msgid "can't lock '%s'\n"
+msgstr "`%s' ei õnnestu avada\n"
 
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
+msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
 
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
+#: g10/tdbio.c:365
+#, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
-msgid "can't access `%s': %s\n"
-msgstr "`%s' ei õnnestu sulgeda: %s\n"
+msgid "can't access '%s': %s\n"
+msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: versioonikirje loomine ei õnnestu: %s"
+msgstr "%s: versioonikirje loomine ei õnnestu: %s"
 
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-msgid "NOTE: trustdb not writable\n"
-msgstr "MÄRKUS: trustdb pole kirjutatav\n"
+#: g10/tdbio.c:796
+#, fuzzy, c-format
+#| msgid "NOTE: trustdb not writable\n"
+msgid "Note: trustdb not writable\n"
+msgstr "MÄRKUS: trustdb pole kirjutatav\n"
 
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
+msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "trustdb: lseek ebaõnnestus: %s\n"
+msgstr "trustdb: lseek ebaõnnestus: %s\n"
 
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
+msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
+msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
 
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
+msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
 
-#, fuzzy
+#: g10/tdbio.c:1900
+#, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb on loodud\n"
 
+#: g10/textfilter.c:146
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "ei suuda käsitleda tekstiridu mis on pikemad, kui %d sümbolit\n"
+msgstr "ei suuda käsitleda tekstiridu mis on pikemad, kui %d sümbolit\n"
 
+#: g10/textfilter.c:241
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "sisendrida on pikem, kui %d sümbolit\n"
+msgstr "sisendrida on pikem, kui %d sümbolit\n"
 
+#: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
+#, fuzzy, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr ""
+
+#: g10/tofu.c:354 g10/tofu.c:887
 #, c-format
-msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' ei ole kehtiv pikk võtmeID\n"
+msgid "error rolling back transaction on TOFU database: %s\n"
+msgstr ""
 
+#: g10/tofu.c:504
 #, fuzzy, c-format
-msgid "key %s: accepted as trusted key\n"
-msgstr "võti %08lX: aktsepteerin usaldusväärse võtmena\n"
+msgid "unsupported TOFU database version: %s\n"
+msgstr ""
+"\n"
+"Toetatud algoritmid:\n"
+
+#: g10/tofu.c:586 g10/tofu.c:607 g10/tofu.c:619 g10/tofu.c:631 g10/tofu.c:647
+#, c-format
+msgid "TOFU DB error"
+msgstr ""
 
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
-msgid "key %s occurs more than once in the trustdb\n"
-msgstr "võti %08lX esineb trustdb failis enam kui korra\n"
+msgid "error reading TOFU database: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#: g10/tofu.c:715 g10/tofu.c:723
 #, fuzzy, c-format
-msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "võti %08lX: usaldataval võtmel pole avalikku võtit - jätsin vahele\n"
+#| msgid "error writing secret keyring `%s': %s\n"
+msgid "error determining TOFU database's version: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
+#: g10/tofu.c:736 g10/tofu.c:749 g10/tofu.c:795 g10/tofu.c:823
 #, fuzzy, c-format
-msgid "key %s marked as ultimately trusted\n"
-msgstr "võti on märgitud abslouutselt usaldatuks.\n"
+#| msgid "%s: error writing dir record: %s\n"
+msgid "error initializing TOFU database: %s\n"
+msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
+
+#: g10/tofu.c:955
+#, fuzzy, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
+#, fuzzy, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#: g10/tofu.c:1327
 #, c-format
-msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "usalduse kirje %lu, päringu tüüp %d: lugemine ebaõnnestus: %s\n"
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
+msgstr ""
 
+#: g10/tofu.c:1336
 #, c-format
-msgid "trust record %lu is not of requested type %d\n"
-msgstr "usalduse kirje %lu ei oma soovitud tüüpi %d\n"
+msgid "The email address \"%s\" is associated with %d key!"
+msgid_plural "The email address \"%s\" is associated with %d keys!"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "You may try to re-create the trustdb using the commands:\n"
+#: g10/tofu.c:1342
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
+#: g10/tofu.c:1348
+#, c-format
+msgid ""
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
+msgstr ""
+
+#: g10/tofu.c:1608
+#, fuzzy, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/tofu.c:1618
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "näita võtit ja kasutaja IDd"
+
+#: g10/tofu.c:1634 g10/tofu.c:1801
+#, fuzzy, c-format
+#| msgid "Policy: "
+msgid "policy: %s"
+msgstr "Poliis: "
+
+#: g10/tofu.c:1727
+#, fuzzy, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/tofu.c:1731
+#, c-format
+msgid "The email address \"%s\" is associated with %d key:\n"
+msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1749
+#, c-format
+msgid "Statistics for keys with the email address \"%s\":\n"
+msgstr ""
+
+#: g10/tofu.c:1799
+#, fuzzy
+#| msgid "list keys"
+msgid "this key"
+msgstr "näita võtmeid"
+
+#: g10/tofu.c:1825
+#, fuzzy, c-format
+msgid "Verified %d message."
+msgid_plural "Verified %d messages."
+msgstr[0] "|algo [failid]|trüki teatelühendid"
+msgstr[1] "|algo [failid]|trüki teatelühendid"
+
+#: g10/tofu.c:1829
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid "Encrypted %d message."
+msgid_plural "Encrypted %d messages."
+msgstr[0] "krüpteeritud kasutades %lu parooli\n"
+msgstr[1] "krüpteeritud kasutades %lu parooli\n"
+
+#: g10/tofu.c:1836
+#, fuzzy, c-format
+msgid "Verified %d message in the future."
+msgid_plural "Verified %d messages in the future."
+msgstr[0] "|algo [failid]|trüki teatelühendid"
+msgstr[1] "|algo [failid]|trüki teatelühendid"
+
+#: g10/tofu.c:1840
+#, fuzzy, c-format
+msgid "Encrypted %d message in the future."
+msgid_plural "Encrypted %d messages in the future."
+msgstr[0] "|algo [failid]|trüki teatelühendid"
+msgstr[1] "|algo [failid]|trüki teatelühendid"
+
+#: g10/tofu.c:1854
+#, c-format
+msgid "Messages verified over the past %d day: %d."
+msgid_plural "Messages verified over the past %d days: %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1860
+#, c-format
+msgid "Messages encrypted over the past %d day: %d."
+msgid_plural "Messages encrypted over the past %d days: %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1870
+#, c-format
+msgid "Messages verified over the past %d month: %d."
+msgid_plural "Messages verified over the past %d months: %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1876
+#, c-format
+msgid "Messages encrypted over the past %d month: %d."
+msgid_plural "Messages encrypted over the past %d months: %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1886
+#, c-format
+msgid "Messages verified over the past %d year: %d."
+msgid_plural "Messages verified over the past %d years: %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1892
+#, c-format
+msgid "Messages encrypted over the past %d year: %d."
+msgid_plural "Messages encrypted over the past %d years: %d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:1900
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr ""
+
+#: g10/tofu.c:1904
+#, fuzzy, c-format
+msgid "Messages encrypted in the past: %d."
+msgstr "|algo [failid]|trüki teatelühendid"
+
+#. TRANSLATORS: Please translate the text found in the source
+#. * file below.  We don't directly internationalize that text so
+#. * that we can tweak it without breaking translations.
+#: g10/tofu.c:1921
+msgid "TOFU detected a binding conflict"
+msgstr ""
+
+#. TRANSLATORS: Two letters (normally the lower and upper case
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
+#: g10/tofu.c:1963
+msgid "gGaAuUrRbB"
+msgstr ""
+
+#: g10/tofu.c:1969
+msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+msgstr ""
+
+#: g10/tofu.c:1978
+msgid "Defaulting to unknown.\n"
+msgstr ""
+
+#: g10/tofu.c:2097 g10/tofu.c:2232
+#, c-format
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#: g10/tofu.c:2833
+#, fuzzy, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/tofu.c:2884
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:2889
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:2894
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:2899
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:2904
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:2909
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:2911
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:3149
+#, c-format
+msgid "%s: Verified 0~signatures and encrypted 0~messages."
+msgstr ""
+
+#: g10/tofu.c:3155
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "%s: Verified 0 signatures."
+msgstr "Kustutatud %d allkirja.\n"
+
+#: g10/tofu.c:3169
+#, fuzzy
+#| msgid "encrypted with %lu passphrases\n"
+msgid "Encrypted 0 messages."
+msgstr "krüpteeritud kasutades %lu parooli\n"
+
+#: g10/tofu.c:3185
+#, fuzzy, c-format
+#| msgid "Policy: "
+msgid "(policy: %s)"
+msgstr "Poliis: "
+
+#: g10/tofu.c:3219
+#, c-format
+msgid ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
+
+#: g10/tofu.c:3222
+#, c-format
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
+msgstr ""
+
+#: g10/tofu.c:3226
+#, c-format
+msgid "Warning: you have yet to encrypt a message to this key!\n"
+msgstr ""
+
+#: g10/tofu.c:3229
+#, c-format
+msgid "Warning: you have only encrypted one message to this key!\n"
+msgstr ""
+
+#: g10/tofu.c:3258
+#, c-format
+msgid ""
+"Warning: if you think you've seen more signatures by this key and user id, "
+"then this key might be a forgery!  Carefully examine the email address for "
+"small variations.  If the key is suspect, then use\n"
+"  %s\n"
+"to mark it as being bad.\n"
+msgid_plural ""
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
+"  %s\n"
+"to mark it as being bad.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
+#, fuzzy, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: g10/tofu.c:3539
+#, c-format
+msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
+msgstr ""
+
+#: g10/trustdb.c:283
+#, fuzzy, c-format
+#| msgid "`%s' is not a valid long keyID\n"
+msgid "'%s' is not a valid long keyID\n"
+msgstr "`%s' ei ole kehtiv pikk võtmeID\n"
+
+#: g10/trustdb.c:306 g10/trustdb.c:335
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "võti %08lX: aktsepteerin usaldusväärse võtmena\n"
+
+#: g10/trustdb.c:379
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "võti %08lX esineb trustdb failis enam kui korra\n"
+
+#: g10/trustdb.c:418
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "võti %08lX: usaldataval võtmel pole avalikku võtit - jätsin vahele\n"
+
+#: g10/trustdb.c:429
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "võti on märgitud abslouutselt usaldatuks.\n"
+
+#: g10/trustdb.c:473
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "usalduse kirje %lu, päringu tüüp %d: lugemine ebaõnnestus: %s\n"
+
+#: g10/trustdb.c:479
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "usalduse kirje %lu ei oma soovitud tüüpi %d\n"
+
+#: g10/trustdb.c:554
+#, c-format
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:563
+#, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
+#: g10/trustdb.c:613
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:619
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:668
+#, c-format
+msgid "no need for a trustdb check\n"
+msgstr "trustdb kontrolliks puudub vajadus\n"
+
+#: g10/trustdb.c:674 g10/trustdb.c:2376
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "trustdb järgmine kontroll %s\n"
+
+#: g10/trustdb.c:683
+#, fuzzy, c-format
+msgid "no need for a trustdb check with '%s' trust model\n"
+msgstr "trustdb kontrolliks puudub vajadus\n"
+
+#: g10/trustdb.c:699
+#, fuzzy, c-format
+msgid "no need for a trustdb update with '%s' trust model\n"
+msgstr "trustdb kontrolliks puudub vajadus\n"
+
+#: g10/trustdb.c:939 g10/trustdb.c:1522
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "ei leia avalikku võtit %08lX: %s\n"
+
+#: g10/trustdb.c:1155
+#, c-format
+msgid "please do a --check-trustdb\n"
+msgstr "palun tehke --check-trustdb\n"
+
+#: g10/trustdb.c:1160
+#, c-format
+msgid "checking the trustdb\n"
+msgstr "kontrollin trustdb faili\n"
+
+#: g10/trustdb.c:2097
+#, fuzzy, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%lu võtit on seni töödeldud\n"
+msgstr[1] "%lu võtit on seni töödeldud\n"
+
+#: g10/trustdb.c:2100
+#, fuzzy, c-format
+#| msgid "%d keys processed (%d validity counts cleared)\n"
+msgid " (%d validity count cleared)\n"
+msgid_plural " (%d validity counts cleared)\n"
+msgstr[0] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
+msgstr[1] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
+
+#: g10/trustdb.c:2170
+#, c-format
+msgid "no ultimately trusted keys found\n"
+msgstr "absoluutselt usaldatavaid võtmeid pole\n"
+
+#: g10/trustdb.c:2184
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n"
+
+#: g10/trustdb.c:2302
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2383
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
+
+#: g10/trust.c:114
+msgid "undefined"
+msgstr ""
+
+#: g10/trust.c:115
+#, fuzzy
+msgid "never"
+msgstr "mitte kunagi"
+
+#: g10/trust.c:116
+msgid "marginal"
+msgstr ""
+
+#: g10/trust.c:117
+msgid "full"
+msgstr ""
+
+#: g10/trust.c:118
+msgid "ultimate"
+msgstr ""
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length.  This is needed to
+#. make attractive information listings where columns line up
+#. properly.  The value "10" should be the length of the strings you
+#. choose to translate to.  This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated.  Either key and
+#. uid are both NULL, or neither are NULL.
+#: g10/trust.c:155
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trust.c:158
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[tühistatud] "
+
+#: g10/trust.c:160 g10/trust.c:166
+#, fuzzy
+msgid "[ expired]"
+msgstr "[aegunud] "
+
+#: g10/trust.c:165
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tundmatu"
+
+#: g10/trust.c:167
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trust.c:168
+#, fuzzy
+msgid "[  never ]"
+msgstr "mitte kunagi"
+
+#: g10/trust.c:169
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trust.c:170
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trust.c:171
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/verify.c:119
+#, c-format
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"allkirja ei õnnestu kontrollida.\n"
+"Palun pidage meeles, et allkirja fail (.sig või .asc)\n"
+"peab olema käsureal esimene fail.\n"
+
+#: g10/verify.c:207
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "sisendrida %u on liiga pikk või seavahetus puudub\n"
+
+#: g10/verify.c:263
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "`%s' ei õnnestu avada: %s\n"
+
+#: g10/cipher-cfb.c:70
+#, fuzzy, c-format
+#| msgid "WARNING: message was not integrity protected\n"
+msgid "WARNING: encrypting without integrity protection is dangerous\n"
+msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
+
+#: g10/cipher-cfb.c:72
+#, fuzzy, c-format
+msgid "Hint: Do not use option %s\n"
+msgstr "loen võtmeid failist `%s'\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr ""
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr ""
+
+#: kbx/kbxutil.c:121
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: kbx/kbxutil.c:124
+#, fuzzy
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#. 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-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
+#, c-format
+msgid "%sNumber\1f: %s%%0AHolder\1f: %s%s"
+msgstr ""
+
+#. TRANSLATORS: This is the number of remaining attempts to
+#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr ""
+
+#: scd/app-piv.c:1845
+#, fuzzy
+msgid "|N|Please enter the new Global-PIN"
+msgstr "muuda parooli"
+
+#: scd/app-piv.c:1846
+#, fuzzy
+msgid "||Please enter the Global-PIN of your PIV card"
+msgstr "Palun valige tühistamise põhjus:\n"
+
+#: scd/app-piv.c:1853
+#, fuzzy
+msgid "|N|Please enter the new PIN"
+msgstr "muuda parooli"
+
+#: scd/app-piv.c:1854
+#, fuzzy
+msgid "||Please enter the PIN of your PIV card"
+msgstr "Palun valige tühistamise põhjus:\n"
+
+#: scd/app-piv.c:1861
+#, fuzzy
+msgid "|N|Please enter the new Unblocking Key"
+msgstr "muuda parooli"
+
+#: scd/app-piv.c:1862
+#, fuzzy
+msgid "||Please enter the Unblocking Key of your PIV card"
+msgstr "Palun valige tühistamise põhjus:\n"
+
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: scd/app-piv.c:1895
+#, c-format
+msgid "PIN is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-piv.c:1903
+#, c-format
+msgid "PIN is too long; maximum length is %d\n"
+msgstr ""
+
+#: scd/app-piv.c:1910
+#, c-format
+msgid "PIN has invalid characters; only digits are allowed\n"
+msgstr ""
+
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
+#, fuzzy, c-format
+msgid "key already exists\n"
+msgstr "`%s' on juba pakitud\n"
+
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
+#, c-format
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
+#, fuzzy, c-format
+msgid "generating new key\n"
+msgstr "genereeri uus võtmepaar"
+
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
+#, fuzzy, c-format
+msgid "writing new key\n"
+msgstr "genereeri uus võtmepaar"
+
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
+#, c-format
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
+#, c-format
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
+#, fuzzy, c-format
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "eemalda võtmed avalike võtmete hoidlast"
+
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
+#, c-format
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
+#, fuzzy, c-format
+msgid "generating key failed\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
+#, fuzzy, c-format
+msgid "key generation completed (%d second)\n"
+msgid_plural "key generation completed (%d seconds)\n"
+msgstr[0] "Võtme genereerimine ebaõnnestus: %s\n"
+msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
+
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
+#, c-format
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#. 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:5265 scd/app-openpgp.c:2875
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "muuda parooli"
+
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Palun valige tühistamise põhjus:\n"
+
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muuda parooli"
+
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:1656
+#, fuzzy
+#| msgid "Note: This key has been disabled.\n"
+msgid "Note: PIN has not yet been enabled."
+msgstr "Märkus: See võti on blokeeritud.\n"
+
+#: scd/app-nks.c:1703
+#, c-format
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
+
+#: scd/app-nks.c:2088
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "muuda parooli"
+
+#: scd/app-nks.c:2096
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Palun valige tühistamise põhjus:\n"
+
+#: scd/app-nks.c:2106
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:2116
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:2118
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: scd/app-openpgp.c:952
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: scd/app-openpgp.c:965
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
+
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
+#, c-format
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1972
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %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:2430
+#, c-format
+msgid "%sNumber\1f: %s%%0AHolder\1f: %s%%0ACounter\1f: %lu%s"
+msgstr ""
+
+#: scd/app-openpgp.c:2678
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2685
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2698
+#, fuzzy
+msgid "||Please unlock the card"
+msgstr "muuda parooli"
+
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
+
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
+#, c-format
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2865
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: scd/app-openpgp.c:2898
+#, c-format
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:3412
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "muuda parooli"
+
+#: scd/app-openpgp.c:3461
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "Palun valige tühistamise põhjus:\n"
+
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr ""
+
+#. 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:3494
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:3495
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:3495
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:3599
+#, fuzzy
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "muuda parooli"
+
+#: scd/app-openpgp.c:3600
+#, fuzzy
+msgid "||Please enter the PIN and New PIN"
+msgstr "muuda parooli"
+
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
+#, fuzzy, c-format
+msgid "error reading application data\n"
+msgstr "viga võtmebloki lugemisel: %s\n"
+
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
+#, fuzzy, c-format
+msgid "error reading fingerprint DO\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
+#, c-format
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:4717
+#, fuzzy, c-format
+#| msgid "unsupported URI"
+msgid "unsupported curve\n"
+msgstr "mittetoetatud URI"
+
+#: scd/app-openpgp.c:5087
+#, c-format
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: scd/app-openpgp.c:5137
+#, c-format
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:5337
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
+#: scd/app-openpgp.c:5395
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: scd/app-openpgp.c:6005
+#, c-format
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "ei leia OpenPGP andmeid.\n"
+
+#: scd/app-dinsig.c:298
+#, fuzzy
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "muuda parooli"
+
+#. 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:531
+msgid "|N|Initial New PIN"
+msgstr ""
+
+#: scd/scdaemon.c:119
+msgid "run in multi server mode (foreground)"
+msgstr ""
+
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:142
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: scd/scdaemon.c:149
+msgid "|N|connect to reader at port N"
+msgstr ""
+
+#: scd/scdaemon.c:151
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#: scd/scdaemon.c:153
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#: scd/scdaemon.c:157
+#, fuzzy
+msgid "do not use the internal CCID driver"
+msgstr "ära kasuta terminali"
+
+#: scd/scdaemon.c:163
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:166
+msgid "do not use a reader's pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:169
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:172
+msgid "|LIST|change the application priority to LIST"
+msgstr ""
+
+#: scd/scdaemon.c:180
+#, fuzzy
+msgid "deny the use of admin card commands"
+msgstr "vastuolulised käsud\n"
+
+#: scd/scdaemon.c:326
+#, fuzzy
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: scd/scdaemon.c:328
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+msgstr ""
+
+#: scd/scdaemon.c:820
+#, c-format
+msgid "please use the option '--daemon' to run the program in the background\n"
+msgstr ""
+
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
+
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: sm/call-dirmngr.c:450
+msgid "Tor might be in use - network access is limited"
+msgstr ""
+
+#: sm/certchain.c:199
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr ""
+
+#: sm/certchain.c:200 sm/certchain.c:2229
+msgid "chain"
+msgstr ""
+
+#: sm/certchain.c:201 sm/certchain.c:2229
+#, fuzzy
+msgid "shell"
+msgstr "help"
+
+#: sm/certchain.c:261 dirmngr/validate.c:144
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+
+#: sm/certchain.c:300 dirmngr/validate.c:243
+#, c-format
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:339
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:357
+#, fuzzy, c-format
+msgid "failed to open '%s': %s\n"
+msgstr "`%s' ei õnnestu avada: %s\n"
+
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
+#, fuzzy, c-format
+msgid "Note: non-critical certificate policy not allowed"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
+#, fuzzy, c-format
+msgid "certificate policy not allowed"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
+#, fuzzy, c-format
+msgid "failed to get the fingerprint\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: sm/certchain.c:642
+#, c-format
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:662
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
+#, fuzzy, c-format
+#| msgid "%s: can't access: %s\n"
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "%s: ei õnnestu kasutada: %s\n"
+
+#: sm/certchain.c:809
+#, c-format
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr ""
+
+#: sm/certchain.c:834
+#, fuzzy, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/certchain.c:837
+#, fuzzy, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
+#, fuzzy, c-format
+msgid "failed to allocate keyDB handle\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+
+#: sm/certchain.c:1276 sm/certchain.c:1280
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "MÄRKUS: võti on tühistatud"
+
+#: sm/certchain.c:1295
+msgid "the status of the certificate is unknown"
+msgstr ""
+
+#: sm/certchain.c:1302
+#, c-format
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:1308
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
+#, c-format
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:1353 sm/certchain.c:1438
+#, fuzzy
+msgid "root certificate not yet valid"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: sm/certchain.c:1354 sm/certchain.c:1439
+msgid "intermediate certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:1367 dirmngr/validate.c:537
+#, fuzzy, c-format
+msgid "certificate has expired"
+msgstr "See võti on aegunud!"
+
+#: sm/certchain.c:1368
+#, fuzzy
+msgid "root certificate has expired"
+msgstr "See võti on aegunud!"
+
+#: sm/certchain.c:1369
+#, fuzzy
+msgid "intermediate certificate has expired"
+msgstr "See võti on aegunud!"
+
+#: sm/certchain.c:1411
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr ""
+
+#: sm/certchain.c:1420
+#, fuzzy
+msgid "certificate with invalid validity"
+msgstr "See võti on aegunud!"
+
+#: sm/certchain.c:1457
+msgid "signature not created during lifetime of certificate"
+msgstr ""
+
+#: sm/certchain.c:1459
+msgid "certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:1460
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr ""
+
+#: sm/certchain.c:1464
+#, fuzzy, c-format
+msgid "  (  signature created at "
+msgstr "         uusi allkirju: %lu\n"
+
+#: sm/certchain.c:1465
+#, fuzzy, c-format
+msgid "  (certificate created at "
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: sm/certchain.c:1468
+#, fuzzy, c-format
+msgid "  (certificate valid from "
+msgstr "halb sertifikaat"
+
+#: sm/certchain.c:1469
+#, c-format
+msgid "  (     issuer valid from "
+msgstr ""
+
+#: sm/certchain.c:1500 dirmngr/validate.c:588
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "näita sõrmejälge"
+
+#: sm/certchain.c:1509
+#, c-format
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:1522
+#, c-format
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:1528
+#, c-format
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:1587
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr ""
+
+#: sm/certchain.c:1651
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: sm/certchain.c:1729
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:1802 dirmngr/validate.c:586
+#, c-format
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:1818
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
+#, c-format
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:1861 dirmngr/validate.c:653
+#, c-format
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:1896 dirmngr/validate.c:679
+#, fuzzy, c-format
+msgid "certificate has a BAD signature"
+msgstr "kontrolli allkirja"
+
+#: sm/certchain.c:1928 dirmngr/validate.c:703
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:1987 dirmngr/validate.c:728
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
+#, fuzzy, c-format
+msgid "certificate is good\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: sm/certchain.c:2030
+#, fuzzy, c-format
+msgid "intermediate certificate is good\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: sm/certchain.c:2031
+#, fuzzy, c-format
+msgid "root certificate is good\n"
+msgstr "halb sertifikaat"
+
+#: sm/certchain.c:2216
+msgid "switching to chain model"
+msgstr ""
+
+#: sm/certchain.c:2225
+#, c-format
+msgid "validation model used: %s"
+msgstr ""
+
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
+
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ei töödeldud"
+
+#: sm/certcheck.c:388 sm/verify.c:222
+#, c-format
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
+#, fuzzy
+msgid "none"
+msgstr "ei"
+
+#: sm/certdump.c:642 sm/certdump.c:707
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: sm/certdump.c:650
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:686
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:713
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: sm/certdump.c:934
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
+"\"%s\"\n"
+"S/N %s, ID 0x%08lX,\n"
+"created %s, expires %s.\n"
+msgstr ""
+"Te vajate kasutaja salajase võtme lahtilukustamiseks parooli:\n"
+"\"%.*s\"\n"
+"%u-bitti %s võti, ID %08lX, loodud %s%s\n"
+
+#: sm/certlist.c:133 dirmngr/validate.c:1263
+#, c-format
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:154 dirmngr/validate.c:1304
+#, c-format
+msgid "certificate should not have been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:167 dirmngr/validate.c:1314
+#, c-format
+msgid "certificate should not have been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:184 dirmngr/validate.c:1297
+#, c-format
+msgid "certificate should not have been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:186 dirmngr/validate.c:1287
+#, c-format
+msgid "certificate should not have been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:188 dirmngr/validate.c:1298
+#, c-format
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:189 dirmngr/validate.c:1288
+#, c-format
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certlist.c:379
+#, fuzzy, c-format
+msgid "looking for another certificate\n"
+msgstr "halb sertifikaat"
+
+#: sm/certreqgen.c:468 sm/certreqgen.c:753
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:484
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:502
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:511
+#, fuzzy, c-format
+msgid "line %d: invalid subject name label '%.*s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:514
+#, fuzzy, c-format
+msgid "line %d: invalid subject name '%s' at pos %d\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:531
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Selline e-posti aadress ei ole lubatud\n"
+
+#: sm/certreqgen.c:550
+#, fuzzy, c-format
+msgid "line %d: invalid serial number\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:566
+#, c-format
+msgid "line %d: invalid issuer name label '%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:569
+#, c-format
+msgid "line %d: invalid issuer name '%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:581 sm/certreqgen.c:592
+#, fuzzy, c-format
+msgid "line %d: invalid date given\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:605
+#, fuzzy, c-format
+msgid "line %d: error getting signing key by keygrip '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: sm/certreqgen.c:624
+#, fuzzy, c-format
+msgid "line %d: invalid hash algorithm given\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:639
+#, fuzzy, c-format
+msgid "line %d: invalid authority-key-id\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:654
+#, fuzzy, c-format
+msgid "line %d: invalid subject-key-id\n"
+msgstr "võti %08lX: vigane alamvõtme seos\n"
+
+#: sm/certreqgen.c:692
+#, fuzzy, c-format
+msgid "line %d: invalid extension syntax\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen.c:705
+#, fuzzy, c-format
+msgid "line %d: error reading key '%s' from card: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: sm/certreqgen.c:718
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: sm/certreqgen.c:762
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s <%s>\n"
+msgstr "Võtme genereerimine ebaõnnestus: %s\n"
+
+#: sm/certreqgen.c:1498
+msgid ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:160
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: sm/certreqgen-ui.c:161
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:319
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:320
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
+
+#: sm/certreqgen-ui.c:321
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+
+#: sm/certreqgen-ui.c:322
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+
+#: sm/certreqgen-ui.c:346
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:350
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Kirjeldust ei antud)\n"
+
+#: sm/certreqgen-ui.c:354
+#, fuzzy, c-format
+msgid "Invalid subject name label '%.*s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. 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:363
+#, fuzzy, c-format
+msgid "Invalid subject name '%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: sm/certreqgen-ui.c:365
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:377
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-posti aadress: "
+
+#: sm/certreqgen-ui.c:378
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Sisestage kasutaja ID.  Lõpetage tühja reaga: "
+
+#: sm/certreqgen-ui.c:382
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Sisestage uus failinimi"
+
+#: sm/certreqgen-ui.c:383 sm/certreqgen-ui.c:388
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
+
+#: sm/certreqgen-ui.c:387
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:394
+#, fuzzy
+msgid "Create self-signed certificate? (y/N) "
+msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
+
+#: sm/certreqgen-ui.c:421
+msgid "These parameters are used:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/certreqgen-ui.c:439
+msgid "Now creating self-signed certificate.  "
+msgstr ""
+
+#: sm/certreqgen-ui.c:441
+#, fuzzy
+#| msgid "Revocation certificate created.\n"
+msgid "Now creating certificate request.  "
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: sm/certreqgen-ui.c:442
+msgid "This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:453
+msgid "Ready.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:456
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:462
+#, c-format
+msgid "resource problem: out of core\n"
+msgstr ""
+
+#: sm/decrypt.c:1155
+#, c-format
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:1157
+#, c-format
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/decrypt.c:1314
+#, fuzzy, c-format
+msgid "encrypted to %s key %s\n"
+msgstr "krüpteeritud %s võtmega, ID %08lX\n"
+
+#: sm/delete.c:50 sm/delete.c:109
+#, fuzzy, c-format
+msgid "certificate '%s' not found: %s\n"
+msgstr "võtit '%s' ei leitud: %s\n"
+
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "viga võtmebloki lugemisel: %s\n"
+
+#: sm/delete.c:141
+#, fuzzy, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: sm/delete.c:143
+#, fuzzy, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: sm/delete.c:173
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: sm/encrypt.c:607
+#, fuzzy, c-format
+msgid "no valid recipients given\n"
+msgstr "(Kirjeldust ei antud)\n"
+
+#: sm/gpgsm.c:235
+#, fuzzy
+msgid "list external keys"
+msgstr "näita salajasi võtmeid"
+
+#: sm/gpgsm.c:237
+#, fuzzy
+msgid "list certificate chain"
+msgstr "halb sertifikaat"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "import certificates"
+msgstr "halb sertifikaat"
+
+#: sm/gpgsm.c:246
+#, fuzzy
+msgid "export certificates"
+msgstr "halb sertifikaat"
+
+#: sm/gpgsm.c:254
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:257
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:259
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:279
+msgid "don't use the terminal at all"
+msgstr "ära kasuta terminali"
+
+#: sm/gpgsm.c:307
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:309
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:325
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:327
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:329
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:339
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "loo ascii pakendis väljund"
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+
+#: sm/gpgsm.c:362
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
+
+#: sm/gpgsm.c:375
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:377
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
+
+#: sm/gpgsm.c:398
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:402
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: sm/gpgsm.c:406
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:408
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:411
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|kasuta šifri algoritmi NIMI"
+
+#: sm/gpgsm.c:413
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
+
+#: sm/gpgsm.c:423
+msgid "batch mode: never ask"
+msgstr "pakettmood: ära küsi kunagi"
+
+#: sm/gpgsm.c:425
+msgid "assume yes on most questions"
+msgstr "eelda enamus küsimustele jah vastust"
+
+#: sm/gpgsm.c:426
+msgid "assume no on most questions"
+msgstr "eelda enamus küsimustele ei vastust"
+
+#: sm/gpgsm.c:443
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: sm/gpgsm.c:640
+#, fuzzy
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: sm/gpgsm.c:643
+#, fuzzy
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Süntaks: gpg [võtmed] [failid]\n"
+"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
+"vaikimisi operatsioon sõltub sisendandmetest\n"
+
+#: sm/gpgsm.c:851
+#, 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:862
+#, fuzzy, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+#: sm/gpgsm.c:1779
+#, fuzzy, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: sm/gpgsm.c:1825
+#, fuzzy, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "`%s' ei õnnestu sulgeda: %s\n"
+
+#: sm/gpgsm.c:2203
+#, c-format
+msgid "invalid command (there is no implicit command)\n"
+msgstr ""
+
+#: sm/import.c:126
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Töödeldud kokku: %lu\n"
+
+#: sm/import.c:246
+#, fuzzy, c-format
+msgid "error storing certificate\n"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: sm/import.c:254
+#, c-format
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/import.c:532 sm/import.c:564
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: sm/keydb.c:528
+#, fuzzy, c-format
+msgid "no keyboxd running in this session\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: sm/keydb.c:620
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: sm/keydb.c:1978
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1990
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/keydb.c:1998
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/keydb.c:2051
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
+
+#: sm/keydb.c:2072 sm/keydb.c:2164
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: sm/keylist.c:775
+msgid "Error - "
+msgstr ""
+
+#: sm/misc.c:79
+#, c-format
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:104
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in '%s', line %d\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: sm/qualified.c:122
+#, fuzzy, c-format
+msgid "invalid country code in '%s', line %d\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: sm/qualified.c:205
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:214 sm/verify.c:716
+#, c-format
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:281
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:821
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: sm/sign.c:860
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:912
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: sm/sign.c:1147
+#, fuzzy, c-format
+msgid "%s/%s signature using %s key %s\n"
+msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
+
+#: sm/verify.c:478
+#, fuzzy, c-format
+msgid "Signature made "
+msgstr "Allkiri aegus %s\n"
+
+#: sm/verify.c:490
+#, c-format
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:494
+#, fuzzy, c-format
+msgid "algorithm:"
+msgstr "pakend: %s\n"
+
+#: sm/verify.c:567
+#, c-format
+msgid ""
+"invalid signature: message digest attribute does not match computed one\n"
+msgstr ""
+
+#: sm/verify.c:693
+#, fuzzy, c-format
+msgid "Good signature from"
+msgstr "Korrektne allkiri kasutajalt \""
+
+#: sm/verify.c:694
+#, fuzzy, c-format
+msgid "                aka"
+msgstr "                 ka \""
+
+#: sm/verify.c:713
+#, fuzzy, c-format
+msgid "This is a qualified signature\n"
+msgstr ""
+"\n"
+"See saab olema iseenda allkiri.\n"
+
+#: dirmngr/certcache.c:124
+#, fuzzy, c-format
+msgid "can't initialize certificate cache lock: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: dirmngr/certcache.c:135
+#, c-format
+msgid "can't acquire read lock on the certificate cache: %s\n"
+msgstr ""
+
+#: dirmngr/certcache.c:146
+#, c-format
+msgid "can't acquire write lock on the certificate cache: %s\n"
+msgstr ""
+
+#: dirmngr/certcache.c:157
+#, c-format
+msgid "can't release lock on the certificate cache: %s\n"
+msgstr ""
+
+#: dirmngr/certcache.c:313
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr ""
+
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
+#, fuzzy, c-format
+#| msgid "can't create `%s': %s\n"
+msgid "can't parse certificate '%s': %s\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
+
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
+#, fuzzy, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
+#, fuzzy, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: dirmngr/certcache.c:456
+#, fuzzy, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
+#, fuzzy, c-format
+msgid "  SHA1 fingerprint = %s\n"
+msgstr "näita sõrmejälge"
+
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
+msgid "   issuer ="
+msgstr ""
+
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
+msgid "  subject ="
+msgstr ""
+
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
+#, fuzzy, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/certcache.c:852
+#, fuzzy, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "halb sertifikaat"
+
+#: dirmngr/certcache.c:855
+#, fuzzy, c-format
+msgid "    runtime cached certificates: %u\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/certcache.c:858
+#, fuzzy, c-format
+msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
+#, fuzzy, c-format
+msgid "certificate already cached\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: dirmngr/certcache.c:888
+#, fuzzy, c-format
+msgid "certificate cached\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
+#, fuzzy, c-format
+msgid "error caching certificate: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/certcache.c:978
+#, fuzzy, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
+#, fuzzy, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
+#, fuzzy, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
+#, fuzzy, c-format
+msgid "no issuer found in certificate\n"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: dirmngr/certcache.c:1767
+#, fuzzy, c-format
+msgid "error getting authorityKeyIdentifier: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:219
+#, fuzzy, c-format
+#| msgid "can't create directory `%s': %s\n"
+msgid "creating directory '%s'\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: dirmngr/crlcache.c:223
+#, fuzzy, c-format
+msgid "error creating directory '%s': %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: dirmngr/crlcache.c:251
+#, fuzzy, c-format
+msgid "ignoring database dir '%s'\n"
+msgstr "viga lõpetaval real\n"
+
+#: dirmngr/crlcache.c:260
+#, fuzzy, c-format
+msgid "error reading directory '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:281
+#, fuzzy, c-format
+msgid "removing cache file '%s'\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:290
+#, fuzzy, c-format
+#| msgid "enarmoring failed: %s\n"
+msgid "not removing file '%s'\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
+#, fuzzy, c-format
+msgid "error closing cache file: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
+#, fuzzy, c-format
+msgid "failed to open cache dir file '%s': %s\n"
+msgstr "`%s' ei õnnestu avada: %s\n"
+
+#: dirmngr/crlcache.c:427
+#, fuzzy, c-format
+msgid "error creating new cache dir file '%s': %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:434
+#, fuzzy, c-format
+#| msgid "error writing secret keyring `%s': %s\n"
+msgid "error writing new cache dir file '%s': %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: dirmngr/crlcache.c:441
+#, fuzzy, c-format
+msgid "error closing new cache dir file '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:446
+#, fuzzy, c-format
+#| msgid "new configuration file `%s' created\n"
+msgid "new cache dir file '%s' created\n"
+msgstr "uus omaduste fail `%s' on loodud\n"
+
+#: dirmngr/crlcache.c:451
+#, fuzzy, c-format
+msgid "failed to re-open cache dir file '%s': %s\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: dirmngr/crlcache.c:479
+#, c-format
+msgid "first record of '%s' is not the version\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:494
+#, c-format
+msgid "old version of cache directory - cleaning up\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:510
+#, c-format
+msgid "old version of cache directory - giving up\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:621
+#, c-format
+msgid "extra field detected in crl record of '%s' line %u\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:629
+#, fuzzy, c-format
+msgid "invalid line detected in '%s' line %u\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: dirmngr/crlcache.c:638
+#, fuzzy, c-format
+msgid "duplicate entry detected in '%s' line %u\n"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: dirmngr/crlcache.c:653
+#, c-format
+msgid "unsupported record type in '%s' line %u skipped\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:679
+#, fuzzy, c-format
+msgid "invalid issuer hash in '%s' line %u\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: dirmngr/crlcache.c:685
+#, fuzzy, c-format
+msgid "no issuer DN in '%s' line %u\n"
+msgstr "viga lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:692
+#, fuzzy, c-format
+msgid "invalid timestamp in '%s' line %u\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: dirmngr/crlcache.c:698
+#, fuzzy, c-format
+#| msgid "WARNING: invalid size of random_seed file - not used\n"
+msgid "WARNING: invalid cache file hash in '%s' line %u\n"
+msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
+
+#: dirmngr/crlcache.c:704
+#, c-format
+msgid "detected errors in cache dir file\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:705
+#, c-format
+msgid "please check the reason and manually delete that file\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
+#, fuzzy, c-format
+msgid "failed to create temporary cache dir file '%s': %s\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: dirmngr/crlcache.c:955
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:1009
+#, fuzzy, c-format
+msgid "can't hash '%s': %s\n"
+msgstr "`%s' ei õnnestu sulgeda: %s\n"
+
+#: dirmngr/crlcache.c:1017
+#, fuzzy, c-format
+msgid "error setting up MD5 hash context: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: dirmngr/crlcache.c:1033
+#, fuzzy, c-format
+msgid "error hashing '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:1061
+#, fuzzy, c-format
+msgid "invalid formatted checksum for '%s'\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: dirmngr/crlcache.c:1114
+#, c-format
+msgid "too many open cache files; can't open anymore\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1132
+#, fuzzy, c-format
+msgid "opening cache file '%s'\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:1151
+#, fuzzy, c-format
+msgid "error opening cache file '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/crlcache.c:1160
+#, c-format
+msgid "error initializing cache file '%s' for reading: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1181
+#, c-format
+msgid "calling unlock_db_file on a closed file\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1183
+#, c-format
+msgid "calling unlock_db_file on an unlocked file\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1237
+#, fuzzy, c-format
+msgid "failed to create a new cache object: %s\n"
+msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:1294
+#, fuzzy, c-format
+#| msgid "No help available for `%s'"
+msgid "no CRL available for issuer id %s\n"
+msgstr "`%s' kohta abiinfo puudub"
+
+#: dirmngr/crlcache.c:1301
+#, c-format
+msgid "cached CRL for issuer id %s too old; update required\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1315
+#, c-format
+msgid ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1323
+#, c-format
+msgid "force-crl-refresh active for issuer id %s; update required\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1332
+#, c-format
+msgid "available CRL for issuer ID %s can't be used\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1343
+#, c-format
+msgid "cached CRL for issuer id %s tampered; we need to update\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1355
+#, c-format
+msgid "WARNING: invalid cache record length for S/N "
+msgstr ""
+
+#: dirmngr/crlcache.c:1365
+#, fuzzy, c-format
+msgid "problem reading cache record for S/N %s: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#: dirmngr/crlcache.c:1368
+#, c-format
+msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1379
+#, c-format
+msgid "S/N %s is valid, it is not listed in the CRL\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1387
+#, fuzzy, c-format
+msgid "error getting data from cache file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
+#, fuzzy, c-format
+#| msgid "invalid response from agent\n"
+msgid "got an invalid S-expression from libksba\n"
+msgstr "vigane vastus agendilt\n"
+
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
+#, fuzzy, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "faili ei õnnestu avada: %s\n"
+
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
+#, fuzzy, c-format
+#| msgid "invalid hash algorithm `%s'\n"
+msgid "unknown hash algorithm '%s'\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#: dirmngr/crlcache.c:1647
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
+#, fuzzy, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:1933
+#, fuzzy, c-format
+#| msgid "build_packet failed: %s\n"
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "build_packet ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:1948
+#, fuzzy, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:1955
+#, c-format
+msgid "update times of this CRL: this=%s next=%s\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1959
+#, c-format
+msgid "nextUpdate not given; assuming a validity period of one day\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:1979
+#, fuzzy, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:1994
+#, fuzzy, c-format
+msgid "error inserting item into temporary cache file: %s\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: dirmngr/crlcache.c:2021
+#, fuzzy, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: dirmngr/crlcache.c:2036
+#, c-format
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr ""
+
+#: dirmngr/crlcache.c:2082
+#, fuzzy, c-format
+#| msgid "signature verification suppressed\n"
+msgid "CRL signature verification failed: %s\n"
+msgstr "allkirja kontroll jäeti ära\n"
+
+#: dirmngr/crlcache.c:2094
+#, fuzzy, c-format
+msgid "error checking validity of CRL issuer certificate: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+
+#: dirmngr/crlcache.c:2236
+#, fuzzy, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:2243
+#, fuzzy, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:2277
+#, fuzzy, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: dirmngr/crlcache.c:2281
+#, fuzzy, c-format
+msgid "problem removing stale temporary cache file '%s': %s\n"
+msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+
+#: dirmngr/crlcache.c:2291
+#, fuzzy, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:2301
+#, fuzzy, c-format
+#| msgid "update secret failed: %s\n"
+msgid "crl_parse_insert failed: %s\n"
+msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
+
+#: dirmngr/crlcache.c:2311
+#, fuzzy, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: dirmngr/crlcache.c:2318
+#, fuzzy, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/crlcache.c:2343
 #, c-format
-msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
+#: dirmngr/crlcache.c:2347
 #, c-format
-msgid "using %s trust model\n"
+msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#. TRANSLATORS: these strings are similar to those in
-#. trust_value_to_string(), but are a fixed length.  This is needed to
-#. make attractive information listings where columns line up
-#. properly.  The value "10" should be the length of the strings you
-#. choose to translate to.  This is the length in printable columns.
-#. It gets passed to atoi() so everything after the number is
-#. essentially a comment and need not be translated.  Either key and
-#. uid are both NULL, or neither are NULL.
-msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+#: dirmngr/crlcache.c:2372
+#, c-format
+msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#, fuzzy
-msgid "[ revoked]"
-msgstr "[tühistatud] "
-
-#, fuzzy
-msgid "[ expired]"
-msgstr "[aegunud] "
-
-#, fuzzy
-msgid "[ unknown]"
-msgstr "tundmatu"
+#: dirmngr/crlcache.c:2383
+#, fuzzy, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-msgid "[  undef ]"
-msgstr ""
+#: dirmngr/crlcache.c:2434
+#, fuzzy, c-format
+msgid "creating cache file '%s'\n"
+msgstr "viga parooli loomisel: %s\n"
 
-msgid "[marginal]"
-msgstr ""
+#: dirmngr/crlcache.c:2466
+#, fuzzy, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
 
-msgid "[  full  ]"
+#: dirmngr/crlcache.c:2480
+#, c-format
+msgid ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
 msgstr ""
 
-msgid "[ultimate]"
+#: dirmngr/crlcache.c:2518
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-msgid "undefined"
+#: dirmngr/crlcache.c:2544
+msgid ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
 msgstr ""
 
-#, fuzzy
-msgid "never"
-msgstr "mitte kunagi"
-
-msgid "marginal"
+#: dirmngr/crlcache.c:2550
+msgid ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-msgid "full"
+#: dirmngr/crlcache.c:2554
+msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-msgid "ultimate"
+#: dirmngr/crlcache.c:2561
+msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-msgid "no need for a trustdb check\n"
-msgstr "trustdb kontrolliks puudub vajadus\n"
-
-#, c-format
-msgid "next trustdb check due at %s\n"
-msgstr "trustdb järgmine kontroll %s\n"
-
+#: dirmngr/crlcache.c:2579
 #, fuzzy, c-format
-msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "trustdb kontrolliks puudub vajadus\n"
+#| msgid "WARNING: invalid size of random_seed file - not used\n"
+msgid " WARNING: invalid cache record length\n"
+msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
-msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "trustdb kontrolliks puudub vajadus\n"
+msgid "problem reading cache record: %s\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "ei leia avalikku võtit %08lX: %s\n"
+msgid "problem reading cache key: %s\n"
+msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-msgid "please do a --check-trustdb\n"
-msgstr "palun tehke --check-trustdb\n"
+#: dirmngr/crlcache.c:2628
+#, fuzzy, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-msgid "checking the trustdb\n"
-msgstr "kontrollin trustdb faili\n"
+#: dirmngr/crlcache.c:2631
+msgid "End CRL dump\n"
+msgstr ""
 
-#, c-format
-msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n"
+#: dirmngr/crlcache.c:2749
+#, fuzzy, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
 
-msgid "no ultimately trusted keys found\n"
-msgstr "absoluutselt usaldatavaid võtmeid pole\n"
+#: dirmngr/crlcache.c:2760
+#, fuzzy, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
-msgid "public key of ultimately trusted key %s not found\n"
-msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n"
+msgid "crl_cache_insert via issuer failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
+#: dirmngr/crlfetch.c:75
 #, c-format
-msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgid "reader to file mapping table full - waiting\n"
 msgstr ""
 
+#: dirmngr/crlfetch.c:155
+#, fuzzy
+msgid "CRL access not possible due to Tor mode"
+msgstr "võtit '%s' ei leitud: %s\n"
+
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
-msgid ""
-"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
-msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
-
-msgid ""
-"the signature could not be verified.\n"
-"Please remember that the signature file (.sig or .asc)\n"
-"should be the first file given on the command line.\n"
-msgstr ""
-"allkirja ei õnnestu kontrollida.\n"
-"Palun pidage meeles, et allkirja fail (.sig või .asc)\n"
-"peab olema käsureal esimene fail.\n"
+msgid "error retrieving '%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
 
-#, c-format
-msgid "input line %u too long or missing LF\n"
-msgstr "sisendrida %u on liiga pikk või seavahetus puudub\n"
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#, fuzzy, c-format
+#| msgid "%s: error writing dir record: %s\n"
+msgid "error initializing reader object: %s\n"
+msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
-msgid "can't open fd %d: %s\n"
-msgstr "`%s' ei õnnestu avada: %s\n"
+msgid "certificate search not possible due to disabled %s\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
-#, fuzzy
-msgid "argument not expected"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr ""
 
-#, fuzzy
-msgid "read error"
-msgstr "viga faili lugemisel"
+#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr ""
 
+#: dirmngr/dirmngr-client.c:73
 #, fuzzy
-msgid "keyword too long"
-msgstr "rida on liiga pikk\n"
+msgid "add a certificate to the cache"
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
+#: dirmngr/dirmngr-client.c:74
 #, fuzzy
-msgid "missing argument"
-msgstr "vigane argument"
+msgid "validate a certificate"
+msgstr "halb sertifikaat"
 
+#: dirmngr/dirmngr-client.c:75
 #, fuzzy
-#| msgid "invalid armor"
-msgid "invalid argument"
-msgstr "vigane pakend"
+msgid "lookup a certificate"
+msgstr "halb sertifikaat"
 
+#: dirmngr/dirmngr-client.c:76
 #, fuzzy
-msgid "invalid command"
-msgstr "vastuolulised käsud\n"
+msgid "lookup only locally stored certificates"
+msgstr "halb sertifikaat"
+
+#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr ""
+
+#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr ""
+
+#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr ""
 
+#: dirmngr/dirmngr-client.c:80
 #, fuzzy
-msgid "invalid alias definition"
-msgstr "vigased impordi võtmed\n"
+msgid "expect certificates in PEM format"
+msgstr "halb sertifikaat"
 
+#: dirmngr/dirmngr-client.c:82
 #, fuzzy
-msgid "out of core"
-msgstr "ei töödeldud"
+#| msgid "Enter the user ID of the designated revoker: "
+msgid "force the use of the default OCSP responder"
+msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
+#: dirmngr/dirmngr-client.c:171
 #, fuzzy
-msgid "invalid option"
-msgstr "vigased impordi võtmed\n"
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#, c-format
-msgid "missing argument for option \"%.50s\"\n"
+#: dirmngr/dirmngr-client.c:175
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
 msgstr ""
 
+#: dirmngr/dirmngr-client.c:281 dirmngr/dirmngr-client.c:915
 #, fuzzy, c-format
-msgid "invalid argument for option \"%.50s\"\n"
-msgstr "vigased impordi võtmed\n"
+msgid "error reading certificate from stdin: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/dirmngr-client.c:288
+#, fuzzy, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
+#: dirmngr/dirmngr-client.c:302
 #, c-format
-msgid "option \"%.50s\" does not expect an argument\n"
+msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#: dirmngr/dirmngr-client.c:317
 #, fuzzy, c-format
-msgid "invalid command \"%.50s\"\n"
-msgstr "Vigane käsklus (proovige \"help\")\n"
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#, c-format
-msgid "option \"%.50s\" is ambiguous\n"
-msgstr ""
+#: dirmngr/dirmngr-client.c:339
+#, fuzzy, c-format
+#| msgid "update failed: %s\n"
+msgid "lookup failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
 
+#: dirmngr/dirmngr-client.c:354
+#, fuzzy, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: dirmngr/dirmngr-client.c:382
 #, c-format
-msgid "command \"%.50s\" is ambiguous\n"
+msgid "a dirmngr daemon is up and running\n"
 msgstr ""
 
-#, fuzzy
-msgid "out of core\n"
-msgstr "ei töödeldud"
-
+#: dirmngr/dirmngr-client.c:404
 #, fuzzy, c-format
-msgid "invalid option \"%.50s\"\n"
-msgstr "vigased impordi võtmed\n"
+msgid "validation of certificate failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "te leidsite vea ... (%s:%d)\n"
+#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:926
+#, fuzzy, c-format
+msgid "certificate is valid\n"
+msgstr "eelistus %c%lu on duplikaat\n"
 
-#, c-format
-msgid "conversion from `%s' to `%s' not available\n"
-msgstr ""
+#: dirmngr/dirmngr-client.c:417 dirmngr/dirmngr-client.c:934
+#, fuzzy, c-format
+msgid "certificate has been revoked\n"
+msgstr "MÄRKUS: võti on tühistatud"
 
+#: dirmngr/dirmngr-client.c:422 dirmngr/dirmngr-client.c:936
 #, fuzzy, c-format
-msgid "iconv_open failed: %s\n"
-msgstr "faili ei õnnestu avada: %s\n"
+msgid "certificate check failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
+#: dirmngr/dirmngr-client.c:435
 #, fuzzy, c-format
-msgid "conversion from `%s' to `%s' failed: %s\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
+#| msgid "can't stat `%s': %s\n"
+msgid "got status: '%s'\n"
+msgstr "ei õnnestu lugeda `%s' atribuute: %s\n"
 
+#: dirmngr/dirmngr-client.c:450
 #, fuzzy, c-format
-msgid "failed to create temporary file `%s': %s\n"
-msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+#| msgid "error writing secret keyring `%s': %s\n"
+msgid "error writing base64 encoding: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
+#: dirmngr/dirmngr-client.c:712
 #, fuzzy, c-format
-msgid "error writing to `%s': %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "unsupported inquiry '%s'\n"
+msgstr ""
+"\n"
+"Toetatud algoritmid:\n"
 
+#: dirmngr/dirmngr-client.c:814
 #, c-format
-msgid "removing stale lockfile (created by %d)\n"
+msgid "absolute file name expected\n"
 msgstr ""
 
-msgid " - probably dead - removing lock"
+#: dirmngr/dirmngr-client.c:859
+#, c-format
+msgid "looking up '%s'\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#: dirmngr/dirmngr.c:182
+msgid "list the contents of the CRL cache"
+msgstr ""
 
-msgid "(deadlock?) "
+#: dirmngr/dirmngr.c:183
+#, fuzzy
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: dirmngr/dirmngr.c:184
+msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "lock `%s' not made: %s\n"
-msgstr "ei leia avalikku võtit %08lX: %s\n"
+#: dirmngr/dirmngr.c:185
+msgid "shutdown the dirmngr"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "waiting for lock %s...\n"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#: dirmngr/dirmngr.c:186
+msgid "flush the cache"
+msgstr ""
 
-msgid "set debugging flags"
+#: dirmngr/dirmngr.c:220
+msgid "allow online software version check"
 msgstr ""
 
-msgid "enable full debugging"
+#: dirmngr/dirmngr.c:223
+msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#, fuzzy
-msgid "Usage: kbxutil [options] [files] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#: dirmngr/dirmngr.c:231
+msgid "Network related options"
+msgstr ""
 
-#, fuzzy
-msgid ""
-"Syntax: kbxutil [options] [files]\n"
-"List, export, import Keybox data\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#: dirmngr/dirmngr.c:233
+msgid "route all network traffic via Tor"
+msgstr ""
 
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+#: dirmngr/dirmngr.c:245
+msgid "Configuration for HTTP servers"
 msgstr ""
 
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+#: dirmngr/dirmngr.c:247
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: dirmngr/dirmngr.c:249
+msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-msgid "the NullPIN has not yet been changed\n"
+#: dirmngr/dirmngr.c:251
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr ""
+
+#: dirmngr/dirmngr.c:253
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: dirmngr/dirmngr.c:256
+msgid "Configuration for OpenPGP servers"
 msgstr ""
 
+#: dirmngr/dirmngr.c:259
 #, fuzzy
-msgid "|N|Please enter a new PIN for the standard keys."
-msgstr "muuda parooli"
+msgid "|URL|use keyserver at URL"
+msgstr "ei saa parsida võtmeserveri URI\n"
+
+#: dirmngr/dirmngr.c:261
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "Configuration for X.509 servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:267
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:269
+msgid "|HOST|use HOST for LDAP queries"
+msgstr ""
+
+#: dirmngr/dirmngr.c:271
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr ""
 
+#: dirmngr/dirmngr.c:273
 #, fuzzy
-msgid "||Please enter the PIN for the standard keys."
-msgstr "muuda parooli"
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|HOST|kasuta seda võtmeserverit"
 
+#: dirmngr/dirmngr.c:275
 #, fuzzy
-msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
-msgstr "Palun valige tühistamise põhjus:\n"
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: dirmngr/dirmngr.c:277
+msgid "add new servers discovered in CRL distribution points to serverlist"
+msgstr ""
+
+#: dirmngr/dirmngr.c:280
+msgid "|N|set LDAP timeout to N seconds"
+msgstr ""
+
+#: dirmngr/dirmngr.c:283
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:285
+msgid "allow sending OCSP requests"
+msgstr ""
+
+#: dirmngr/dirmngr.c:287
+msgid "ignore certificate contained OCSP service URLs"
+msgstr ""
 
+#: dirmngr/dirmngr.c:289
 #, fuzzy
-msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
-msgstr "Palun valige tühistamise põhjus:\n"
+msgid "|URL|use OCSP responder at URL"
+msgstr "ei saa parsida võtmeserveri URI\n"
 
-msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+#: dirmngr/dirmngr.c:291
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-msgid "||Please enter the PIN for the key to create qualified signatures."
+#: dirmngr/dirmngr.c:299
+msgid "force loading of outdated CRLs"
 msgstr ""
 
+#: dirmngr/dirmngr.c:312
+#, fuzzy
+#| msgid ""
+#| "@\n"
+#| "(See the man page for a complete listing of all commands and options)\n"
 msgid ""
-"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
-"qualified signatures."
+"@\n"
+"(See the \"info\" manual for a complete listing of all commands and "
+"options)\n"
 msgstr ""
+"@\n"
+"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
+#: dirmngr/dirmngr.c:474
+#, fuzzy
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: dirmngr/dirmngr.c:476
 msgid ""
-"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
-"qualified signatures."
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
+#: dirmngr/dirmngr.c:556
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: tools/gpgconf.c:859
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+msgid "usage: %s [options] "
+msgstr "kasuta: gpg [võtmed] "
+
+#: dirmngr/dirmngr.c:1397
+#, fuzzy, c-format
+#| msgid "%s not allowed with %s!\n"
+msgid "colons are not allowed in the socket name\n"
+msgstr "%s ja %s ei ole koos lubatud!\n"
+
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
+#, fuzzy, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
+#, fuzzy, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
+#: dirmngr/dirmngr.c:1786
+#, fuzzy, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "rida on liiga pikk\n"
+
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
+#, fuzzy, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "viga: vigane sõrmejälg\n"
+
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
+#, fuzzy, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "viga lugemisel: %s\n"
+
+#: dirmngr/dirmngr.c:1948
+#, c-format
+msgid "%s:%u: garbage at end of line ignored\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:2035
+#, c-format
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:2077
+#, c-format
+msgid "SIGUSR2 received - no action defined\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:2082
+#, c-format
+msgid "SIGTERM received - shutting down ...\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:2084
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:2089
+#, fuzzy, c-format
+msgid "shutdown forced\n"
+msgstr "ei töödeldud"
+
+#: dirmngr/dirmngr.c:2097
+#, c-format
+msgid "SIGINT received - immediate shutdown\n"
+msgstr ""
+
+#: dirmngr/dirmngr.c:2104
+#, c-format
+msgid "signal %d received - no action defined\n"
+msgstr ""
+
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
+#, fuzzy, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
 
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+msgid "too many redirections\n"
+msgstr "liiga palju `%c' eelistusi\n"
 
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "kirjutan faili `%s'\n"
 
+#: dirmngr/ldap-wrapper.c:232
 #, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+msgid "error printing log line: %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-msgid "response does not contain the public key data\n"
-msgstr ""
+#: dirmngr/ldap-wrapper.c:262
+#, fuzzy, c-format
+msgid "error reading log from ldap wrapper %d: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-msgid "response does not contain the RSA modulus\n"
+#: dirmngr/ldap-wrapper.c:450
+#, c-format
+msgid "ldap wrapper %d ready"
 msgstr ""
 
-msgid "response does not contain the RSA public exponent\n"
+#: dirmngr/ldap-wrapper.c:459
+#, c-format
+msgid "ldap wrapper %d ready: timeout\n"
 msgstr ""
 
+#: dirmngr/ldap-wrapper.c:462
 #, c-format
-msgid "using default PIN as %s\n"
+msgid "ldap wrapper %d ready: exitcode=%d\n"
 msgstr ""
 
+#: dirmngr/ldap-wrapper.c:471
+#, fuzzy, c-format
+msgid "waiting for ldap wrapper %d failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#: dirmngr/ldap-wrapper.c:483
 #, c-format
-msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
+#: dirmngr/ldap.c:92
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#, fuzzy
-msgid "||Please enter the PIN"
-msgstr "muuda parooli"
+#: dirmngr/ldap.c:96
+#, fuzzy, c-format
+msgid "adding '%s:%d' to the ldap server list\n"
+msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
+#, fuzzy, c-format
+msgid "malloc failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\": ei ole JPEG fail\n"
 
-msgid "error retrieving CHV status from card\n"
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-msgid "card is permanently locked!\n"
+#: dirmngr/ldap.c:992
+#, c-format
+msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:122
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
-#. the start of the string.  Use %%0A to force a linefeed.
+#: dirmngr/ldapserver.c:188
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
-msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
-msgstr "muuda parooli"
+msgid "%s:%u: skipping this line\n"
+msgstr " j = jäta see võti vahele\n"
 
-#, fuzzy
-msgid "|A|Please enter the Admin PIN"
-msgstr "muuda parooli"
+#: dirmngr/misc.c:172
+#, fuzzy, c-format
+#| msgid "%s: invalid file version %d\n"
+msgid "invalid canonical S-expression found\n"
+msgstr "%s: vigane faili versioon %d\n"
 
-msgid "access to admin commands is not configured\n"
-msgstr ""
+#: dirmngr/misc.c:196 dirmngr/misc.c:230
+#, fuzzy, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "faili ei õnnestu avada: %s\n"
 
-#, fuzzy
-msgid "||Please enter the Reset Code for the card"
-msgstr "Palun valige tühistamise põhjus:\n"
+#: dirmngr/misc.c:201 dirmngr/misc.c:235
+#, fuzzy, c-format
+#| msgid "update secret failed: %s\n"
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
+#: dirmngr/misc.c:528
 #, c-format
-msgid "Reset Code is too short; minimum length is %d\n"
+msgid "bad URL encoding detected\n"
 msgstr ""
 
-#. 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.
-msgid "|RN|New Reset Code"
-msgstr ""
+#: dirmngr/ocsp.c:80
+#, fuzzy, c-format
+msgid "error reading from responder: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-msgid "|AN|New Admin PIN"
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "|N|New PIN"
+#: dirmngr/ocsp.c:148
+#, fuzzy
+msgid "OCSP request not possible due to Tor mode"
+msgstr "võtit '%s' ei leitud: %s\n"
+
+#: dirmngr/ocsp.c:157
+#, c-format
+msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
 
-#, fuzzy
-msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "muuda parooli"
+#: dirmngr/ocsp.c:164
+#, fuzzy, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy
-msgid "||Please enter the PIN and New PIN"
-msgstr "muuda parooli"
+#: dirmngr/ocsp.c:182
+#, fuzzy, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy
-msgid "error reading application data\n"
-msgstr "viga võtmebloki lugemisel: %s\n"
+#: dirmngr/ocsp.c:195
+#, fuzzy, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: viga vaba kirje lugemisel: %s\n"
+#: dirmngr/ocsp.c:221 dirmngr/ocsp.c:273
+#, fuzzy, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' on juba pakitud\n"
+#: dirmngr/ocsp.c:284
+#, fuzzy, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-msgid "existing key will be replaced\n"
+#: dirmngr/ocsp.c:309 dirmngr/ocsp.c:340
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
 msgstr ""
 
-#, fuzzy
-msgid "generating new key\n"
-msgstr "genereeri uus võtmepaar"
+#: dirmngr/ocsp.c:325
+#, c-format
+msgid "failed to establish a hashing context for OCSP: %s\n"
+msgstr ""
 
-#, fuzzy
-msgid "writing new key\n"
-msgstr "genereeri uus võtmepaar"
+#: dirmngr/ocsp.c:335
+#, fuzzy, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-msgid "creation timestamp missing\n"
+#: dirmngr/ocsp.c:379
+#, c-format
+msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
+#: dirmngr/ocsp.c:585
+#, fuzzy, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
+#, fuzzy, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: dirmngr/ocsp.c:645
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+msgid "issuer certificate not found: %s\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
-msgid "please wait while key is being generated ...\n"
+#: dirmngr/ocsp.c:703
+#, c-format
+msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#: dirmngr/ocsp.c:710
+#, fuzzy, c-format
+msgid "caller did not return the issuing certificate\n"
+msgstr "genereeri tühistamise sertifikaat"
 
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Võtme genereerimine ebaõnnestus: %s\n"
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: dirmngr/ocsp.c:759
+#, c-format
+msgid "no default OCSP responder defined\n"
 msgstr ""
 
-msgid "fingerprint on card does not match requested one\n"
+#: dirmngr/ocsp.c:765
+#, fuzzy, c-format
+#| msgid "no default secret keyring: %s\n"
+msgid "no default OCSP signer defined\n"
+msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
+
+#: dirmngr/ocsp.c:772
+#, c-format
+msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+#| msgid "using cipher %s\n"
+msgid "using OCSP responder '%s'\n"
+msgstr "kasutan šiffrit %s\n"
+
+#: dirmngr/ocsp.c:834
+#, fuzzy, c-format
+msgid "error getting OCSP status for target certificate: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
+#: dirmngr/ocsp.c:887
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: dirmngr/ocsp.c:888
+msgid "good"
 msgstr ""
 
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "ei leia OpenPGP andmeid.\n"
-
-#, fuzzy
-msgid "||Please enter your PIN at the reader's pinpad"
-msgstr "muuda parooli"
+msgid "certificate has been revoked at: %s due to: %s\n"
+msgstr "MÄRKUS: võti on tühistatud"
 
-#. 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.
-msgid "|N|Initial New PIN"
+#: dirmngr/ocsp.c:919
+#, c-format
+msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-msgid "run in multi server mode (foreground)"
+#: dirmngr/ocsp.c:931
+#, c-format
+msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-msgid "|LEVEL|set the debugging level to LEVEL"
+#: dirmngr/ocsp.c:946
+#, c-format
+msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#, fuzzy
-msgid "|FILE|write a log to FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
+#, fuzzy, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-msgid "|N|connect to reader at port N"
+#: dirmngr/server.c:1291
+msgid "serialno missing in cert ID"
 msgstr ""
 
-#, fuzzy
-msgid "|NAME|use NAME as ct-API driver"
-msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-
-#, fuzzy
-msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
+#, fuzzy, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#, fuzzy
-msgid "do not use the internal CCID driver"
-msgstr "ära kasuta terminali"
+#: dirmngr/server.c:1606
+#, fuzzy, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr ""
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
+#, fuzzy, c-format
+msgid "error sending data: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-msgid "do not use a reader's pinpad"
-msgstr ""
+#: dirmngr/server.c:1757
+#, fuzzy, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#, fuzzy
-msgid "deny the use of admin card commands"
-msgstr "vastuolulised käsud\n"
+#: dirmngr/server.c:1790
+#, fuzzy, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-msgid "use variable length input for pinpad"
+#: dirmngr/server.c:1817
+#, c-format
+msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#, fuzzy
-msgid "Usage: scdaemon [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#: dirmngr/server.c:3124
+#, fuzzy, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
 
-msgid ""
-"Syntax: scdaemon [options] [command [args]]\n"
-"Smartcard daemon for GnuPG\n"
-msgstr ""
+#: dirmngr/server.c:3135
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-msgid "please use the option `--daemon' to run the program in the background\n"
-msgstr ""
+#: dirmngr/server.c:3156
+#, fuzzy, c-format
+#| msgid "failed to initialize the TrustDB: %s\n"
+msgid "failed to initialize the server: %s\n"
+msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "handler for fd %d started\n"
-msgstr ""
+#: dirmngr/server.c:3164
+#, fuzzy, c-format
+msgid "failed to the register commands with Assuan: %s\n"
+msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
+#: dirmngr/server.c:3197
 #, c-format
-msgid "handler for fd %d terminated\n"
+msgid "Assuan accept problem: %s\n"
 msgstr ""
 
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
-msgid "invalid radix64 character %02x skipped\n"
-msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
+#| msgid "signing failed: %s\n"
+msgid "Assuan processing failed: %s\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
 
+#: dirmngr/validate.c:239
 #, c-format
-msgid "failed to proxy %s inquiry to client\n"
+msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#, c-format
-msgid "no running dirmngr - starting `%s'\n"
+#: dirmngr/validate.c:266
+#, fuzzy, c-format
+#| msgid "checking the trustdb\n"
+msgid "CRL checking too deeply nested\n"
+msgstr "kontrollin trustdb faili\n"
+
+#: dirmngr/validate.c:285
+msgid "not checking CRL for"
 msgstr ""
 
+#: dirmngr/validate.c:290
 #, fuzzy
-msgid "malformed DIRMNGR_INFO environment variable\n"
-msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
+msgid "checking CRL for"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+msgid "checking trustworthiness of root certificate failed: %s\n"
+msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
+#: dirmngr/validate.c:780
+#, fuzzy, c-format
+msgid "certificate chain is good\n"
+msgstr "eelistus %c%lu on duplikaat\n"
 
+#: dirmngr/validate.c:1321
 #, c-format
-msgid "validation model requested by certificate: %s"
-msgstr ""
-
-msgid "chain"
+msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
-msgid "shell"
-msgstr "help"
-
-#, fuzzy, c-format
-msgid "critical certificate extension %s is not supported"
-msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+msgid "quiet"
+msgstr "välju"
 
-msgid "issuer certificate is not marked as a CA"
+#: tools/gpg-connect-agent.c:90
+msgid "print data out hex encoded"
 msgstr ""
 
-msgid "critical marked policy without configured policies"
+#: tools/gpg-connect-agent.c:91
+msgid "decode received data lines"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "failed to open `%s': %s\n"
-msgstr "`%s' ei õnnestu avada: %s\n"
+#: tools/gpg-connect-agent.c:92
+msgid "connect to the dirmngr"
+msgstr ""
 
-msgid "note: non-critical certificate policy not allowed"
+#: tools/gpg-connect-agent.c:93
+msgid "connect to the keyboxd"
 msgstr ""
 
-#, fuzzy
-msgid "certificate policy not allowed"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#: tools/gpg-connect-agent.c:96
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-msgid "looking up issuer at external location\n"
+#: tools/gpg-connect-agent.c:98
+msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#, c-format
-msgid "number of issuers matching: %d\n"
+#: tools/gpg-connect-agent.c:100
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-msgid "looking up issuer from the Dirmngr cache\n"
+#: tools/gpg-connect-agent.c:102
+msgid "do not use extended connect mode"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "number of matching certificates: %d\n"
-msgstr "viga parooli loomisel: %s\n"
+#: tools/gpg-connect-agent.c:104
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#, fuzzy, c-format
-msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#: tools/gpg-connect-agent.c:105
+msgid "run /subst on startup"
+msgstr ""
 
+#: tools/gpg-connect-agent.c:228
 #, fuzzy
-msgid "failed to allocate keyDB handle\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#, fuzzy
-msgid "certificate has been revoked"
-msgstr "MÄRKUS: võti on tühistatud"
+#: tools/gpg-connect-agent.c:231
+msgid ""
+"Syntax: @GPG@-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-msgid "the status of the certificate is unknown"
+#: tools/gpg-connect-agent.c:1294
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-msgid "please make sure that the \"dirmngr\" is properly installed\n"
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
-msgid "checking the CRL failed: %s"
-msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+msgid "receiving line failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "certificate with invalid validity: %s"
-msgstr ""
+#: tools/gpg-connect-agent.c:1518
+#, fuzzy, c-format
+msgid "line too long - skipped\n"
+msgstr "rida on liiga pikk\n"
 
-msgid "certificate not yet valid"
+#: tools/gpg-connect-agent.c:1522
+#, c-format
+msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#, fuzzy
-msgid "root certificate not yet valid"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#: tools/gpg-connect-agent.c:1907
+#, fuzzy, c-format
+msgid "unknown command '%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-msgid "intermediate certificate not yet valid"
-msgstr ""
+#: tools/gpg-connect-agent.c:1925
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#, fuzzy
-msgid "certificate has expired"
-msgstr "See võti on aegunud!"
+#: tools/gpg-connect-agent.c:2332
+#, fuzzy, c-format
+msgid "no keybox daemon running in this session\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#, fuzzy
-msgid "root certificate has expired"
-msgstr "See võti on aegunud!"
+#: tools/gpg-connect-agent.c:2338
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#, fuzzy
-msgid "intermediate certificate has expired"
-msgstr "See võti on aegunud!"
+#: tools/gpgconf-comp.c:658
+msgid "OpenPGP"
+msgstr ""
 
-#, c-format
-msgid "required certificate attributes missing: %s%s%s"
+#: tools/gpgconf-comp.c:662
+msgid "S/MIME"
 msgstr ""
 
+#: tools/gpgconf-comp.c:666
 #, fuzzy
-msgid "certificate with invalid validity"
-msgstr "See võti on aegunud!"
+msgid "Public Keys"
+msgstr "avalik võti on %08lX\n"
 
-msgid "signature not created during lifetime of certificate"
+#: tools/gpgconf-comp.c:670
+msgid "Private Keys"
 msgstr ""
 
-msgid "certificate not created during lifetime of issuer"
+#: tools/gpgconf-comp.c:674
+msgid "Smartcards"
 msgstr ""
 
-msgid "intermediate certificate not created during lifetime of issuer"
+#: tools/gpgconf-comp.c:679
+msgid "TPM"
 msgstr ""
 
+#: tools/gpgconf-comp.c:686
 #, fuzzy
-msgid "  (  signature created at "
-msgstr "         uusi allkirju: %lu\n"
+#| msgid "network error"
+msgid "Network"
+msgstr "võrgu viga"
 
+#: tools/gpgconf-comp.c:690
 #, fuzzy
-msgid "  (certificate created at "
-msgstr "Tühistamise sertifikaat on loodud.\n"
+msgid "Passphrase Entry"
+msgstr "halb parool"
 
+#: tools/gpgconf-comp.c:956
 #, fuzzy
-msgid "  (certificate valid from "
-msgstr "halb sertifikaat"
+msgid "Component not suitable for launching"
+msgstr "ei leia avalikku võtit"
 
-msgid "  (     issuer valid from "
+#: tools/gpgconf-comp.c:962
+#, c-format
+msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
+#: tools/gpgconf-comp.c:965
 #, fuzzy, c-format
-msgid "fingerprint=%s\n"
-msgstr "näita sõrmejälge"
-
-msgid "root certificate has now been marked as trusted\n"
-msgstr ""
+#| msgid "Please use the command \"toggle\" first.\n"
+msgid "Note: Use the command \"%s%s\" to get details.\n"
+msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-msgid "interactive marking as trusted not enabled in gpg-agent\n"
+#: tools/gpgconf-comp.c:2846
+#, c-format
+msgid "External verification of component %s failed"
 msgstr ""
 
-msgid "interactive marking as trusted disabled for this session\n"
+#: tools/gpgconf-comp.c:2976
+msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-msgid "WARNING: creation time of signature not known - assuming current time"
-msgstr ""
+#: tools/gpgconf-comp.c:3576
+#, fuzzy, c-format
+msgid "error closing '%s'\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy
-msgid "no issuer found in certificate"
-msgstr "genereeri tühistamise sertifikaat"
+#: tools/gpgconf-comp.c:3578
+#, fuzzy, c-format
+msgid "error parsing '%s'\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-msgid "self-signed certificate has a BAD signature"
+#: tools/gpgconf.c:88
+msgid "list all components"
 msgstr ""
 
-msgid "root certificate is not marked trusted"
+#: tools/gpgconf.c:89
+msgid "check all programs"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "checking the trust list failed: %s\n"
-msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+#: tools/gpgconf.c:90
+msgid "|COMPONENT|list options"
+msgstr ""
 
-msgid "certificate chain too long\n"
+#: tools/gpgconf.c:91
+msgid "|COMPONENT|change options"
 msgstr ""
 
-msgid "issuer certificate not found"
+#: tools/gpgconf.c:92
+msgid "|COMPONENT|check options"
 msgstr ""
 
-#, fuzzy
-msgid "certificate has a BAD signature"
-msgstr "kontrolli allkirja"
+#: tools/gpgconf.c:94
+msgid "apply global default values"
+msgstr ""
 
-msgid "found another possible matching CA certificate - trying again"
+#: tools/gpgconf.c:96
+msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#, c-format
-msgid "certificate chain longer than allowed by CA (%d)"
+#: tools/gpgconf.c:98
+msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
+#: tools/gpgconf.c:100
 #, fuzzy
-msgid "certificate is good\n"
-msgstr "eelistus %c%lu on duplikaat\n"
+msgid "list global configuration file"
+msgstr "tundmatu seade \"%s\"\n"
 
+#: tools/gpgconf.c:102
 #, fuzzy
-msgid "intermediate certificate is good\n"
-msgstr "Tühistamise sertifikaat on loodud.\n"
+msgid "check global configuration file"
+msgstr "tundmatu seade \"%s\"\n"
 
+#: tools/gpgconf.c:104
 #, fuzzy
-msgid "root certificate is good\n"
-msgstr "halb sertifikaat"
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "uuenda usalduse andmebaasi"
 
-msgid "switching to chain model"
+#: tools/gpgconf.c:105
+msgid "reload all or a given component"
 msgstr ""
 
-#, c-format
-msgid "validation model used: %s"
+#: tools/gpgconf.c:106
+msgid "launch a given component"
 msgstr ""
 
-#, c-format
-msgid "%s key uses an unsafe (%u bit) hash\n"
+#: tools/gpgconf.c:107
+msgid "kill a given component"
 msgstr ""
 
-#, c-format
-msgid "a %u bit hash is not valid for a %u bit %s key\n"
-msgstr ""
+#: tools/gpgconf.c:116
+msgid "use as output file"
+msgstr "kasuta väljundfailina"
 
-msgid "(this is the MD2 algorithm)\n"
+#: tools/gpgconf.c:120
+msgid "activate changes at runtime, if possible"
 msgstr ""
 
+#: tools/gpgconf.c:166
 #, fuzzy
-msgid "none"
-msgstr "ei"
-
-#, fuzzy
-msgid "[Error - invalid encoding]"
-msgstr "viga: vigane sõrmejälg\n"
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-msgid "[Error - out of core]"
+#: tools/gpgconf.c:169
+msgid ""
+"Syntax: @GPGCONF@ [options]\n"
+"Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-msgid "[Error - No name]"
+#: tools/gpgconf.c:726 tools/gpgconf.c:761
+msgid "Need one component argument"
 msgstr ""
 
+#: tools/gpgconf.c:735 tools/gpgconf.c:785 tools/gpgconf.c:835
 #, fuzzy
-msgid "[Error - invalid DN]"
-msgstr "viga: vigane sõrmejälg\n"
+msgid "Component not found"
+msgstr "ei leia avalikku võtit"
 
-#, fuzzy, c-format
+#: tools/gpgconf.c:861
+#, fuzzy
+msgid "No argument allowed"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: tools/gpg-check-pattern.c:147
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#: tools/gpg-check-pattern.c:150
 msgid ""
-"Please enter the passphrase to unlock the secret key for the X.509 "
-"certificate:\n"
-"\"%s\"\n"
-"S/N %s, ID 0x%08lX,\n"
-"created %s, expires %s.\n"
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"Te vajate kasutaja salajase võtme lahtilukustamiseks parooli:\n"
-"\"%.*s\"\n"
-"%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-msgid "no key usage specified - assuming all usages\n"
-msgstr ""
+#: tools/gpg-card.c:2425
+#, fuzzy, c-format
+msgid "Note: key %s is already stored on the card!\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+msgid "Note: Keys are already stored on the card!\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-msgid "certificate should not have been used for certification\n"
+#: tools/gpg-card.c:2431
+#, c-format
+msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-msgid "certificate should not have been used for OCSP response signing\n"
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
+#, c-format
+msgid "%s card no. %s detected\n"
 msgstr ""
 
-msgid "certificate should not have been used for encryption\n"
+#: tools/gpg-card.c:3431
+#, c-format
+msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-msgid "certificate should not have been used for signing\n"
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
+#, c-format
+msgid ""
+"Warning: Setting the User Interaction Flag to \"%s\"\n"
+"         can only be reverted using a factory reset!\n"
 msgstr ""
 
-msgid "certificate is not usable for encryption\n"
+#: tools/gpg-card.c:3458
+#, c-format
+msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-msgid "certificate is not usable for signing\n"
+#: tools/gpg-card.c:3758
+#, fuzzy
+msgid "authenticate to the card"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: tools/gpg-card.c:3760
+msgid "send a reset to the card daemon"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "line %d: invalid algorithm\n"
-msgstr "vigane räsialgoritm `%s'\n"
+#: tools/gpg-card.c:3762
+#, fuzzy
+#| msgid "|NAME|use NAME as default recipient"
+msgid "setup KDF for PIN authentication"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#, c-format
-msgid "line %d: invalid key length %u (valid are %d to %d)\n"
-msgstr ""
+#: tools/gpg-card.c:3764
+#, fuzzy
+#| msgid "change the expire date"
+msgid "change a private data object"
+msgstr "muuda aegumise kuupäeva"
 
-#, c-format
-msgid "line %d: no subject name given\n"
+#: tools/gpg-card.c:3765
+#, fuzzy
+msgid "read a certificate from a data object"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: tools/gpg-card.c:3766
+#, fuzzy
+msgid "store a certificate to a data object"
+msgstr "Tühistamise sertifikaat on loodud.\n"
+
+#: tools/gpg-card.c:3767
+msgid "store a private key to a data object"
 msgstr ""
 
-#, c-format
-msgid "line %d: invalid subject name label `%.*s'\n"
+#: tools/gpg-card.c:3768
+msgid "Yubikey management commands"
 msgstr ""
 
-#, c-format
-msgid "line %d: invalid subject name `%s' at pos %d\n"
+#: tools/gpg-card.c:3772
+msgid "manage the command history"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "line %d: not a valid email address\n"
-msgstr "Selline e-posti aadress ei ole lubatud\n"
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#, fuzzy, c-format
-msgid "line %d: error reading key `%s' from card: %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "vigased isikliku šifri eelistused\n"
 
-#, fuzzy, c-format
-msgid "line %d: error getting key by keygrip `%s': %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#, fuzzy, c-format
-msgid "line %d: key generation failed: %s <%s>\n"
-msgstr "Võtme genereerimine ebaõnnestus: %s\n"
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-msgid ""
-"To complete this certificate request please enter the passphrase for the key "
-"you just created once more.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjutan faili `%s'\n"
 
-#, fuzzy, c-format
-msgid "   (%d) RSA\n"
-msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Võti on asendatud"
 
-#, fuzzy, c-format
-msgid "   (%d) Existing key\n"
-msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+#~ msgid "Name may not start with a digit\n"
+#~ msgstr "Nimi ei või alata numbriga\n"
 
-#, c-format
-msgid "   (%d) Existing key from card\n"
-msgstr ""
+#~ msgid "Name must be at least 5 characters long\n"
+#~ msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
 
 #, fuzzy
-msgid "Enter the keygrip: "
-msgstr "Allkirja noteerimine: "
+#~ msgid "selfsigned certificate has a BAD signature"
+#~ msgstr "kontrolli allkirja"
 
-msgid "Not a valid keygrip (expecting 40 hex digits)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
 #, fuzzy
-msgid "No key with this keygrip\n"
-msgstr "Kasutaja ID numbriga %d puudub\n"
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Kirjeldust ei antud)\n"
 
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: viga vaba kirje lugemisel: %s\n"
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "ei saa parsida võtmeserveri URI\n"
 
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NIMI|terminali kooditabel on NIMI"
 
 #, fuzzy
-msgid "Available keys:\n"
-msgstr "blokeeri võti"
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#, c-format
-msgid "Possible actions for a %s key:\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#, fuzzy, c-format
-msgid "   (%d) sign, encrypt\n"
-msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "vigased impordi võtmed\n"
 
-#, fuzzy, c-format
-msgid "   (%d) sign\n"
-msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, fuzzy, c-format
-msgid "   (%d) encrypt\n"
-msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "võtit '%s' ei leitud: %s\n"
 
-msgid "Enter the X.509 subject name: "
-msgstr ""
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "loen failist `%s'\n"
 
 #, fuzzy
-msgid "No subject name given\n"
-msgstr "(Kirjeldust ei antud)\n"
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "    puudub kasutaja ID: %lu\n"
 
-#, c-format
-msgid "Invalid subject name label `%.*s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                 ka \""
 
-#. TRANSLATORS: The 22 in the second string is the
-#. length of the first string up to the "%s".  Please
-#. adjust it do the length of your translation.  The
-#. second string is merely passed to atoi so you can
-#. drop everything after the number.
-#, fuzzy, c-format
-msgid "Invalid subject name `%s'\n"
-msgstr "vigane räsialgoritm `%s'\n"
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "                 ka \""
 
-msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
-msgstr ""
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "       pole imporditud: %lu\n"
 
 #, fuzzy
-msgid "Enter email addresses"
-msgstr "E-posti aadress: "
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                 ka \""
 
 #, fuzzy
-msgid " (end with an empty line):\n"
-msgstr ""
-"\n"
-"Sisestage kasutaja ID.  Lõpetage tühja reaga: "
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                 ka \""
 
 #, fuzzy
-msgid "Enter DNS names"
-msgstr "Sisestage uus failinimi"
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Kirjeldust ei antud)\n"
 
 #, fuzzy
-msgid " (optional; end with an empty line):\n"
-msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "HOIATUS: kasutan ebaturvalist mälu!\n"
 
-msgid "Enter URIs"
-msgstr ""
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
 
-msgid "Parameters to be used for the certificate request:\n"
-msgstr ""
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
 
-msgid "Now creating certificate request.  This may take a while ...\n"
-msgstr ""
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
 
-msgid "Ready.  You should now send this request to your CA.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
 
-msgid "resource problem: out of core\n"
-msgstr ""
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-msgid "(this is the RC2 algorithm)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Suggest a random passphrase."
+#~ msgstr "muuda parooli"
+
+#, fuzzy
+#~ msgid "no authentication key for ssh on card: %s\n"
+#~ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "otsi võtmeid võtmeserverist"
+
+#, fuzzy
+#~ msgid "argument not expected"
+#~ msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#, fuzzy
+#~ msgid "read error"
+#~ msgstr "viga faili lugemisel"
 
-msgid "(this does not seem to be an encrypted message)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "keyword too long"
+#~ msgstr "rida on liiga pikk\n"
 
-#, fuzzy, c-format
-msgid "certificate `%s' not found: %s\n"
-msgstr "võtit '%s' ei leitud: %s\n"
+#, fuzzy
+#~ msgid "missing argument"
+#~ msgstr "vigane argument"
 
-#, fuzzy, c-format
-msgid "error locking keybox: %s\n"
-msgstr "viga võtmebloki lugemisel: %s\n"
+#, fuzzy
+#~| msgid "invalid armor"
+#~ msgid "invalid argument"
+#~ msgstr "vigane pakend"
 
-#, fuzzy, c-format
-msgid "duplicated certificate `%s' deleted\n"
-msgstr "Tühistamise sertifikaat on loodud.\n"
+#, fuzzy
+#~ msgid "invalid command"
+#~ msgstr "vastuolulised käsud\n"
 
-#, fuzzy, c-format
-msgid "certificate `%s' deleted\n"
-msgstr "eelistus %c%lu on duplikaat\n"
+#, fuzzy
+#~ msgid "invalid alias definition"
+#~ msgstr "vigased impordi võtmed\n"
 
-#, fuzzy, c-format
-msgid "deleting certificate \"%s\" failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "out of core"
+#~ msgstr "ei töödeldud"
 
 #, fuzzy
-msgid "no valid recipients given\n"
-msgstr "(Kirjeldust ei antud)\n"
+#~ msgid "invalid meta command"
+#~ msgstr "vastuolulised käsud\n"
 
 #, fuzzy
-msgid "list external keys"
-msgstr "näita salajasi võtmeid"
+#~ msgid "unknown meta command"
+#~ msgstr "tundmatu vaikimisi saaja `%s'\n"
 
 #, fuzzy
-msgid "list certificate chain"
-msgstr "halb sertifikaat"
+#~| msgid "unexpected data"
+#~ msgid "unexpected meta command"
+#~ msgstr "ootamatud andmed"
 
 #, fuzzy
-msgid "import certificates"
-msgstr "halb sertifikaat"
+#~ msgid "invalid option"
+#~ msgstr "vigased impordi võtmed\n"
 
 #, fuzzy
-msgid "export certificates"
-msgstr "halb sertifikaat"
+#~ msgid "invalid command \"%.50s\"\n"
+#~ msgstr "Vigane käsklus (proovige \"help\")\n"
 
-msgid "register a smartcard"
-msgstr ""
+#, fuzzy
+#~ msgid "invalid option \"%.50s\"\n"
+#~ msgstr "vigased impordi võtmed\n"
 
-msgid "pass a command to the dirmngr"
-msgstr ""
+#, fuzzy
+#~| msgid "NOTE: no default option file `%s'\n"
+#~ msgid "Note: no default option file '%s'\n"
+#~ msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
 
-msgid "invoke gpg-protect-tool"
-msgstr ""
+#, fuzzy
+#~| msgid "option file `%s': %s\n"
+#~ msgid "option file '%s': %s\n"
+#~ msgstr "võtmete fail `%s': %s\n"
 
 #, fuzzy
-msgid "create base-64 encoded output"
-msgstr "loo ascii pakendis väljund"
+#~| msgid "you may not use %s while in %s mode\n"
+#~ msgid "keyserver option \"%s\" may not be used in %s mode\n"
+#~ msgstr "%s ei ole moodis %s lubatud.\n"
 
-msgid "assume input is in PEM format"
-msgstr ""
+#, fuzzy
+#~ msgid "unable to execute program '%s': %s\n"
+#~ msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
 
-msgid "assume input is in base-64 format"
-msgstr ""
+#~ msgid "unable to execute external program\n"
+#~ msgstr "välist programmi ei õnnestu käivitada\n"
 
-msgid "assume input is in binary format"
-msgstr ""
+#~ msgid "unable to read external program response: %s\n"
+#~ msgstr "ei õnnestu lugeda välise programmi vastust: %s\n"
 
-msgid "use system's dirmngr if available"
-msgstr ""
+#, fuzzy
+#~ msgid "   (%d) ECC and ECC\n"
+#~ msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-msgid "never consult a CRL"
-msgstr ""
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Väljun salvestamata? "
 
-msgid "check validity using OCSP"
-msgstr ""
+#, fuzzy
+#~| msgid "NOTE: old default options file `%s' ignored\n"
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
 
-msgid "|N|number of certificates to include"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Käsud:\n"
+#~ " "
 
-msgid "|FILE|take policy information from FILE"
-msgstr ""
+#, fuzzy
+#~ msgid "decryption modus"
+#~ msgstr "lahtikrüpteerimine õnnestus\n"
 
-msgid "do not check certificate policies"
-msgstr ""
+#, fuzzy
+#~ msgid "encryption modus"
+#~ msgstr "lahtikrüpteerimine õnnestus\n"
 
-msgid "fetch missing issuer certificates"
-msgstr ""
+#, fuzzy
+#~ msgid "program filename"
+#~ msgstr "--store [failinimi]"
 
-msgid "don't use the terminal at all"
-msgstr "ära kasuta terminali"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-msgid "|FILE|write a server mode log to FILE"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ja %s ei ole koos lubatud!\n"
 
 #, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "faili ei õnnestu avada: %s\n"
 
-msgid "batch mode: never ask"
-msgstr "pakettmood: ära küsi kunagi"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-msgid "assume yes on most questions"
-msgstr "eelda enamus küsimustele jah vastust"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s ei õnnestu avada: %s\n"
 
-msgid "assume no on most questions"
-msgstr "eelda enamus küsimustele ei vastust"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
+#~ msgid "no --program option provided\n"
+#~ msgstr "mittelokaalse programmi käivitamist ei toetata\n"
 
 #, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s ei õnnestu luua: %s\n"
 
 #, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|HOST|kasuta seda võtmeserverit"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s ei õnnestu luua: %s\n"
 
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NIMI|kasuta ¨ifri algoritmi NIMI"
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
 #, fuzzy
-msgid "Usage: gpgsm [options] [files] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "read failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
 #, fuzzy
-msgid ""
-"Syntax: gpgsm [options] [files]\n"
-"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
-"Default operation depends on the input data\n"
-msgstr ""
-"Süntaks: gpg [võtmed] [failid]\n"
-"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
-"vaikimisi operatsioon sõltub sisendandmetest\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
 #, fuzzy
-msgid "usage: gpgsm [options] "
-msgstr "kasuta: gpg [võtmed] "
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "NOTE: won't be able to encrypt to `%s': %s\n"
-msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "`%s' ei õnnestu luua: %s\n"
 
-#, fuzzy, c-format
-msgid "unknown validation model `%s'\n"
-msgstr "tundmatu vaikimisi saaja `%s'\n"
+#, fuzzy
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "`%s' ei õnnestu luua: %s\n"
 
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Kirjeldust ei antud)\n"
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
+#, fuzzy
+#~ msgid " using certificate ID 0x%08lX\n"
+#~ msgstr "viga parooli loomisel: %s\n"
 
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " j = jäta see võti vahele\n"
+#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
 
 #, fuzzy
-msgid "could not parse keyserver\n"
-msgstr "ei saa parsida võtmeserveri URI\n"
+#~ msgid "female"
+#~ msgstr "enable"
 
-msgid "WARNING: running with faked system time: "
-msgstr ""
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Põhjus puudub"
 
-#, fuzzy, c-format
-msgid "importing common certificates `%s'\n"
-msgstr "kirjutan faili `%s'\n"
+#, fuzzy
+#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
+#~ msgstr "viga parooli loomisel: %s\n"
 
-#, fuzzy, c-format
-msgid "can't sign using `%s': %s\n"
-msgstr "`%s' ei õnnestu sulgeda: %s\n"
+#, fuzzy
+#~ msgid "error creating 'encryptions' TOFU table: %s\n"
+#~ msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-msgid "invalid command (there is no implicit command)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "resetting keydb: %s\n"
+#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, fuzzy, c-format
-msgid "total number processed: %lu\n"
-msgstr "Töödeldud kokku: %lu\n"
+#, fuzzy
+#~ msgid "error setting TOFU binding's policy to %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
 #, fuzzy
-msgid "error storing certificate\n"
-msgstr "genereeri tühistamise sertifikaat"
+#~ msgid "%s: Verified %ld~signature in the past %s."
+#~ msgid_plural "%s: Verified %ld~signatures in the past %s."
+#~ msgstr[0] "|algo [failid]|trüki teatelühendid"
+#~ msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-msgid "basic certificate checks failed - not imported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Encrypted %ld~message in the past %s."
+#~ msgid_plural "Encrypted %ld~messages in the past %s."
+#~ msgstr[0] "|algo [failid]|trüki teatelühendid"
+#~ msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-#, fuzzy, c-format
-msgid "error getting stored flags: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+#, fuzzy
+#~| msgid "error writing public keyring `%s': %s\n"
+#~ msgid "error setting policy for key %s, user id \"%s\": %s"
+#~ msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, fuzzy, c-format
-msgid "error importing certificate: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+#, fuzzy
+#~ msgid "error looking up: %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy, c-format
-msgid "error reading input: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+#, fuzzy
+#~| msgid "error creating keyring `%s': %s\n"
+#~ msgid "Warning: %s appears in the keyring %d times\n"
+#~ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#, fuzzy, c-format
-msgid "error creating keybox `%s': %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+#, fuzzy
+#~ msgid "error retrieving '%s': http status %u\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy, c-format
-msgid "keybox `%s' created\n"
-msgstr "võtmehoidla `%s' on loodud\n"
+#, fuzzy
+#~ msgid "npth_select failed: %s - waiting 1s\n"
+#~ msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
 #, fuzzy
-msgid "failed to get the fingerprint\n"
-msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+#~ msgid "reading from ldap wrapper %d failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "problem looking for existing certificate: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "What keysize do you want for the Signature key? (%u) "
+#~ msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#, fuzzy, c-format
-msgid "error finding writable keyDB: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+#, fuzzy
+#~ msgid "What keysize do you want for the Encryption key? (%u) "
+#~ msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#, fuzzy, c-format
-msgid "error storing certificate: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+#, fuzzy
+#~ msgid "What keysize do you want for the Authentication key? (%u) "
+#~ msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#, fuzzy, c-format
-msgid "problem re-searching certificate: %s\n"
-msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
+#, fuzzy
+#~ msgid "listen() failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "error storing flags: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "uus omaduste fail `%s' on loodud\n"
 
-msgid "Error - "
-msgstr ""
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Key generation failed: %s\n"
+#~ msgid "User ID revocation failed: %s\n"
+#~ msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "invalid formatted fingerprint in `%s', line %d\n"
-msgstr "viga: vigane sõrmejälg\n"
+#, fuzzy
+#~ msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+#~ msgstr "muuda parooli"
 
-#, c-format
-msgid "invalid country code in `%s', line %d\n"
-msgstr ""
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
 
-#, c-format
-msgid ""
-"You are about to create a signature using your certificate:\n"
-"\"%s\"\n"
-"This will create a qualified signature by law equated to a handwritten "
-"signature.\n"
-"\n"
-"%s%sAre you really sure that you want to do this?"
-msgstr ""
+#~ msgid "--store [filename]"
+#~ msgstr "--store [failinimi]"
 
-msgid ""
-"Note, that this software is not officially approved to create or verify such "
-"signatures.\n"
-msgstr ""
+#~ msgid "--symmetric [filename]"
+#~ msgstr "--symmetric [failinimi]"
 
-#, c-format
-msgid ""
-"You are about to create a signature using your certificate:\n"
-"\"%s\"\n"
-"Note, that this certificate will NOT create a qualified signature!"
-msgstr ""
+#~ msgid "--encrypt [filename]"
+#~ msgstr "--encrypt [failinimi]"
 
-#, fuzzy, c-format
-msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#, fuzzy
+#~ msgid "--symmetric --encrypt [filename]"
+#~ msgstr "--sign --encrypt [failinimi]"
 
-#, c-format
-msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr ""
+#~ msgid "--sign [filename]"
+#~ msgstr "--sign [failinimi]"
 
-#, fuzzy, c-format
-msgid "checking for qualified certificate failed: %s\n"
-msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
+#~ msgid "--sign --encrypt [filename]"
+#~ msgstr "--sign --encrypt [failinimi]"
 
 #, fuzzy
-msgid "Signature made "
-msgstr "Allkiri aegus %s\n"
+#~ msgid "--symmetric --sign --encrypt [filename]"
+#~ msgstr "--sign --encrypt [failinimi]"
 
-msgid "[date not given]"
-msgstr ""
+#~ msgid "--sign --symmetric [filename]"
+#~ msgstr "--sign --symmetric [failinimi]"
 
-#, fuzzy, c-format
-msgid " using certificate ID 0x%08lX\n"
-msgstr "viga parooli loomisel: %s\n"
+#~ msgid "--clear-sign [filename]"
+#~ msgstr "--clear-sign [failinimi]"
 
-msgid ""
-"invalid signature: message digest attribute does not match computed one\n"
-msgstr ""
+#~ msgid "--decrypt [filename]"
+#~ msgstr "--decrypt [failinimi]"
 
-#, fuzzy
-msgid "Good signature from"
-msgstr "Korrektne allkiri kasutajalt \""
+#~ msgid "--sign-key user-id"
+#~ msgstr "--sign-key kasutaja-id"
 
-#, fuzzy
-msgid "                aka"
-msgstr "                 ka \""
+#~ msgid "--lsign-key user-id"
+#~ msgstr "--lsign-key kasutaja-id"
 
-#, fuzzy
-msgid "This is a qualified signature\n"
-msgstr ""
-"\n"
-"See saab olema iseenda allkiri.\n"
+#~ msgid "--edit-key user-id [commands]"
+#~ msgstr "--edit-key kasutaja-id [käsud]"
 
 #, fuzzy
-msgid "quiet"
-msgstr "välju"
+#~ msgid "--passwd <user-id>"
+#~ msgstr "--sign-key kasutaja-id"
 
-msgid "print data out hex encoded"
-msgstr ""
+#~ msgid "[filename]"
+#~ msgstr "[failinimi]"
 
-msgid "decode received data lines"
-msgstr ""
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-msgid "|NAME|connect to Assuan socket NAME"
-msgstr ""
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "blokeeri võti"
 
-msgid "run the Assuan server given on the command line"
-msgstr ""
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [failid]|trüki teatelühendid"
+#~ msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-msgid "do not use extended connect mode"
-msgstr ""
+#~ msgid "communication problem with gpg-agent\n"
+#~ msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
 #, fuzzy
-msgid "|FILE|run commands from FILE on startup"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
+#~ msgid "canceled by user\n"
+#~ msgstr "katkestatud kasutaja poolt\n"
 
-msgid "run /subst on startup"
-msgstr ""
+#, fuzzy
+#~ msgid "problem with the agent\n"
+#~ msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
 #, fuzzy
-msgid "Usage: gpg-connect-agent [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "problem with the agent (unexpected response \"%s\")\n"
+#~ msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-msgid ""
-"Syntax: gpg-connect-agent [options]\n"
-"Connect to a running agent and send commands\n"
-msgstr ""
+#, fuzzy
+#~ msgid "unknown TOFU DB format '%s'\n"
+#~ msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#, c-format
-msgid "option \"%s\" requires a program and optional arguments\n"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the passphrase to unlock the secret key for the OpenPGP "
+#~ "certificate:\n"
+#~ "\"%.*s\"\n"
+#~ "%u-bit %s key, ID %s,\n"
+#~ "created %s%s.\n"
+#~ msgstr ""
+#~ "Te vajate kasutaja salajase võtme lahtilukustamiseks parooli:\n"
+#~ "\"%.*s\"\n"
+#~ "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#, c-format
-msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "You need a passphrase to unlock the secret key for\n"
+#~ "user: \"%s\"\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
+#~ "parooli: \""
 
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "%u-bit %s key, ID %s, created %s"
+#~ msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
 
 #, fuzzy
-msgid "line too long - skipped\n"
-msgstr "rida on liiga pikk\n"
+#~| msgid "can't create directory `%s': %s\n"
+#~ msgid "can't access directory '%s': %s\n"
+#~ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-msgid "line shortened due to embedded Nul character\n"
-msgstr ""
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "te leidsite vea ... (%s:%d)\n"
 
-#, fuzzy, c-format
-msgid "unknown command `%s'\n"
-msgstr "tundmatu vaikimisi saaja `%s'\n"
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+#~ msgstr[1] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#, fuzzy, c-format
-msgid "sending line failed: %s\n"
-msgstr "allkirjastamine ebaõnnestus: %s\n"
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "tõstan võtme allkirja õigesse kohta\n"
 
-#, fuzzy, c-format
-msgid "error sending %s command: %s\n"
-msgstr "viga teate saatmisel serverile `%s': %s\n"
+#~ msgid "%d signatures not checked due to missing keys\n"
+#~ msgstr "%d allkirja jäi testimata, kuna võtmed puuduvad\n"
 
-#, fuzzy, c-format
-msgid "error sending standard options: %s\n"
-msgstr "viga teate saatmisel serverile `%s': %s\n"
+#~ msgid "%d signatures not checked due to errors\n"
+#~ msgstr "%d allkirja jäi vigade tõttu kontrollimata\n"
 
-msgid "Options controlling the diagnostic output"
-msgstr ""
+#~ msgid "1 user ID without valid self-signature detected\n"
+#~ msgstr "tuvastasin ühe kehtiva iseenda allkirjata kasutaja ID\n"
 
-msgid "Options controlling the configuration"
-msgstr ""
+#, fuzzy
+#~ msgid "User ID \"%s\": %d signatures removed\n"
+#~ msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-msgid "Options useful for debugging"
-msgstr ""
+#~ msgid ""
+#~ "You need a Passphrase to protect your secret key.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
+#~ "\n"
 
-msgid "|FILE|write server mode logs to FILE"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Please enter a passphrase to protect the off-card backup of the new "
+#~ "encryption key."
+#~ msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-msgid "Options controlling the security"
-msgstr ""
+#~ msgid "passphrase not correctly repeated; try again"
+#~ msgstr "parooli ei korratud õieti; proovige uuesti"
 
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
+#~ msgid "%s.\n"
+#~ msgstr "%s.\n"
 
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
+#~ 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"
+#~ "using this program with the option \"--edit-key\".\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
+#~ "Ma siiski täidan teie soovi. Te saate oma parooli alati muuta,\n"
+#~ "kasutades seda programmi võtmega \"--edit-key\".\n"
+#~ "\n"
 
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
+#, fuzzy
+#~ msgid "storing key onto card failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-msgid "Options enforcing a passphrase policy"
-msgstr ""
+#, fuzzy
+#~| msgid "1 bad signature\n"
+#~ msgid "1 good signature\n"
+#~ msgstr "1 halb allkiri\n"
 
-msgid "do not allow to bypass the passphrase policy"
-msgstr ""
+#, fuzzy
+#~ msgid "%lu keys cached (%lu signatures)\n"
+#~ msgstr "kontrollitud %lu võtit (%lu allkirja)\n"
 
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
+#, fuzzy
+#~ msgid "refreshing 1 key from %s\n"
+#~ msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
+#, fuzzy
+#~ msgid "sending key %s to %s server %s\n"
+#~ msgstr "otsin \"%s\" HKP serverist %s\n"
 
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
+#, fuzzy
+#~ msgid "public key %s is %lu seconds newer than the signature\n"
+#~ msgstr "avalik võti %08lX on %lu sekundit uuem, kui allkiri\n"
 
 #, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|kasuta parooli moodi N"
+#~ 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"
 
 #, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "viga parooli loomisel: %s\n"
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "võtmehoidlat ei õnnestu avada"
 
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "`%s' ei õnnestu avada: %s\n"
 
 #, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NIMI|krüpti NIMEle"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
 
-msgid "|SPEC|set up email aliases"
-msgstr ""
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "palun valige ülimalt üks sekundaarne võti.\n"
 
-msgid "Configuration for Keyservers"
-msgstr ""
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
 #, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "ei saa parsida võtmeserveri URI\n"
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
+#, fuzzy
+#~ msgid "toggle between the secret and public key listings"
+#~ msgstr "lülita salajaste või avalike võtmete loendi vahel"
 
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
+#, fuzzy
+#~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
+#~ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-msgid "disable all access to the dirmngr"
-msgstr ""
+#~ msgid "gpg-agent is not available in this session\n"
+#~ msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
 #, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NIMI|kasuta paroolidega ¨ifri algoritmi NIMI"
+#~ msgid "use a standard location for the socket"
+#~ msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-msgid "do not check CRLs for root certificates"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: gpg-agent [options] (-h for help)"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-msgid "Options controlling the format of the output"
-msgstr ""
+#~ msgid "malformed GPG_AGENT_INFO environment variable\n"
+#~ msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
+#~ msgid "gpg-agent protocol version %d is not supported\n"
+#~ msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-msgid "Configuration for HTTP servers"
-msgstr ""
+#, fuzzy
+#~ msgid "can't fdopen pipe for reading: %s\n"
+#~ msgstr "faili ei õnnestu avada: %s\n"
 
-msgid "use system's HTTP proxy setting"
-msgstr ""
+#, fuzzy
+#~ msgid "error creating socket: %s\n"
+#~ msgstr "viga `%s' loomisel: %s\n"
 
-msgid "Configuration of LDAP servers to use"
-msgstr ""
+#, fuzzy
+#~ msgid "host not found"
+#~ msgstr "[Kasutaja id puudub]"
 
-msgid "LDAP server list"
-msgstr ""
+#, fuzzy
+#~ msgid "unknown key protection algorithm\n"
+#~ msgstr "tundmatu kaitsealgoritm\n"
 
-msgid "Configuration for OCSP"
-msgstr ""
+#, fuzzy
+#~ msgid "secret parts of key are not available\n"
+#~ msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#, c-format
-msgid "External verification of component %s failed"
-msgstr ""
+#, fuzzy
+#~ msgid "secret key already stored on a card\n"
+#~ msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-msgid "Note that group specifications are ignored\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing key to card: %s\n"
+#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-msgid "list all components"
-msgstr ""
+#~ msgid ""
+#~ "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+#~ msgstr ""
+#~ "RSA võtmeid pikkusega kuni 2048 bitti saab krüpteerida ainult --pgp2 "
+#~ "moodis\n"
 
-msgid "check all programs"
-msgstr ""
+#~ msgid ""
+#~ "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#~ msgstr "kõikide krüpteeritavate võtmetega ei saa IDEA šiffrit kasutada.\n"
 
-msgid "|COMPONENT|list options"
-msgstr ""
+#, fuzzy
+#~ msgid "remove the passphrase from exported subkeys"
+#~ msgstr "tühista sekundaarne võti"
 
-msgid "|COMPONENT|change options"
-msgstr ""
+#, fuzzy
+#~ msgid "key %s: not protected - skipped\n"
+#~ msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n"
 
-msgid "|COMPONENT|check options"
-msgstr ""
+#, fuzzy
+#~ msgid "failed to unprotect the subkey: %s\n"
+#~ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-msgid "apply global default values"
-msgstr ""
+#, fuzzy
+#~ msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+#~ msgstr "HOIATUS: salajases võtmes %08lX puudub lihtne SK kontrollsumma\n"
 
-msgid "get the configuration directories for gpgconf"
-msgstr ""
+#~ msgid "too many entries in pk cache - disabled\n"
+#~ msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n"
 
 #, fuzzy
-msgid "list global configuration file"
-msgstr "tundmatu seade \"%s\"\n"
+#~ msgid "no secret subkey for public subkey %s - ignoring\n"
+#~ msgstr "avalikul alamvõtmel %08lX puudub salajane alamvõti - ignoreerin\n"
 
 #, fuzzy
-msgid "check global configuration file"
-msgstr "tundmatu seade \"%s\"\n"
+#~ msgid "key %s: secret key without public key - skipped\n"
+#~ msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n"
 
-msgid "use as output file"
-msgstr "kasuta väljundfailina"
+#~ msgid "usage: gpg [options] "
+#~ msgstr "kasuta: gpg [võtmed] "
 
-msgid "activate changes at runtime, if possible"
-msgstr ""
+#~ msgid ""
+#~ "you can only make detached or clear signatures while in --pgp2 mode\n"
+#~ msgstr ""
+#~ "--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n"
 
-#, fuzzy
-msgid "Usage: gpgconf [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+#~ msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n"
 
-msgid ""
-"Syntax: gpgconf [options]\n"
-"Manage configuration options for tools of the GnuPG system\n"
-msgstr ""
+#~ msgid ""
+#~ "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+#~ msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#, fuzzy
-msgid "usage: gpgconf [options] "
-msgstr "kasuta: gpg [võtmed] "
+#~ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+#~ msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA šiffrit\n"
 
-msgid "Need one component argument"
-msgstr ""
+#, fuzzy
+#~ msgid "create a public key when importing a secret key"
+#~ msgstr "avalik võti ei sobi salajase võtmega!\n"
 
 #, fuzzy
-msgid "Component not found"
-msgstr "ei leia avalikku võtit"
+#~ msgid "key %s: already in secret keyring\n"
+#~ msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n"
 
 #, fuzzy
-msgid "No argument allowed"
-msgstr "kirjutan salajase võtme faili `%s'\n"
+#~ msgid "key %s: secret key not found: %s\n"
+#~ msgstr "võti %08lX: salajast võtit ei leitud: %s\n"
 
 #, fuzzy
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-"@Käsud:\n"
-" "
+#~ msgid "NOTE: a key's S/N does not match the card's one\n"
+#~ msgstr "avalik võti ei sobi salajase võtmega!\n"
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "lahtikrüpteerimine õnnestus\n"
+#~ msgid "NOTE: primary key is online and stored on card\n"
+#~ msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "lahtikrüpteerimine õnnestus\n"
+#~ msgid "NOTE: secondary key is online and stored on card\n"
+#~ msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid ""
+#~ "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+#~ "mode.\n"
+#~ msgstr "--pgp2 moodis ei saa PGP 2.x võtmele OpenPGP allkirja anda.\n"
+
+#~ msgid "This would make the key unusable in PGP 2.x.\n"
+#~ msgstr "See muudab võtme PGP 2.x programmidega mitte-kasutatavaks.\n"
+
+#~ msgid "This key is not protected.\n"
+#~ msgstr "See võti ei ole kaitstud.\n"
+
+#~ msgid "Key is protected.\n"
+#~ msgstr "Võti on kaitstud.\n"
+
+#~ msgid "Can't edit this key: %s\n"
+#~ msgstr "Seda võtit ei õnnestu toimetada: %s\n"
+
+#~ msgid ""
+#~ "Enter the new passphrase for this secret key.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sisestage sellele salajasele võtmele uus parool.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "You don't want a passphrase - this is probably a *bad* idea!\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
+#~ "\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [failinimi]"
+#~ msgid "Do you really want to do this? (y/N) "
+#~ msgstr "Kas te tõesti soovite seda teha? "
 
-msgid "secret key file (required)"
-msgstr ""
+#~ msgid "Please remove selections from the secret keys.\n"
+#~ msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
 
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "No corresponding signature in secret ring\n"
+#~ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "writing secret key stub to `%s'\n"
+#~ msgstr "kirjutan salajase võtme faili `%s'\n"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
+#~ msgid "writing secret key to `%s'\n"
+#~ msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ja %s ei ole koos lubatud!\n"
+#~ msgid "no writable secret keyring found: %s\n"
+#~ msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "faili ei õnnestu avada: %s\n"
+#~ msgid "WARNING: 2 files with confidential information exists.\n"
+#~ msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#, fuzzy, c-format
-msgid "can't create temporary directory `%s': %s\n"
-msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
+#~ msgid "%s is the unchanged one\n"
+#~ msgstr "%s ei ole muudetud\n"
 
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s ei õnnestu avada: %s\n"
+#~ msgid "%s is the new one\n"
+#~ msgstr "%s on uus\n"
 
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+#~ msgid "Please fix this possible security flaw\n"
+#~ msgstr "Palun parandage see võimalik turvaprobleem\n"
 
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+#, fuzzy
+#~ msgid "searching for names from %s server %s\n"
+#~ msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+#, fuzzy
+#~ msgid "searching for names from %s\n"
+#~ msgstr "otsin \"%s\" HKP serverist %s\n"
 
 #, fuzzy
-msgid "no --program option provided\n"
-msgstr "mittelokaalse programmi käivitamist ei toetata\n"
+#~ msgid "searching for \"%s\" from %s server %s\n"
+#~ msgstr "otsin \"%s\" HKP serverist %s\n"
 
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "searching for \"%s\" from %s\n"
+#~ msgstr "otsin \"%s\" HKP serverist %s\n"
 
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "keyserver timed out\n"
+#~ msgstr "võtmeserveri viga"
 
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "keyserver internal error\n"
+#~ msgstr "võtmeserveri viga"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "keyserver communications error: %s\n"
+#~ msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "WARNING: unable to parse URI %s\n"
+#~ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#~ msgid "invalid root packet detected in proc_tree()\n"
+#~ msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#~ msgid "the IDEA cipher plugin is not present\n"
+#~ msgstr "IDEA šifri lisandprogrammi pole\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#~ msgid "no corresponding public key: %s\n"
+#~ msgstr "vastavat avalikku võtit pole: %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#~ msgid "public key does not match secret key!\n"
+#~ msgstr "avalik võti ei sobi salajase võtmega!\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#~ msgid "unknown protection algorithm\n"
+#~ msgstr "tundmatu kaitsealgoritm\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#~ msgid "NOTE: This key is not protected!\n"
+#~ msgstr "MÄRKUS: See võti ei ole kaitstud!\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "protection digest %d is not supported\n"
+#~ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#~ msgid "Invalid passphrase; please try again"
+#~ msgstr "Vigane parool; palun proovige uuesti"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#~ msgid "%s ...\n"
+#~ msgstr "%s ...\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#~ msgid "WARNING: Weak key detected - please change passphrase again.\n"
+#~ msgstr "HOIATUS: Tuvastasin nõrga võtme - palun muutke uuesti parooli.\n"
 
-msgid "no class provided\n"
-msgstr ""
+#~ msgid ""
+#~ "generating the deprecated 16-bit checksum for secret key protection\n"
+#~ msgstr ""
+#~ "loon salajase võtme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#~ msgid ""
+#~ "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+#~ msgstr ""
+#~ "PGP 2.x stiilis võtmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
+
+#~ msgid ""
+#~ "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+#~ msgstr ""
+#~ "PGP 2.x stiilis võtmetega saab avateksti allkirjastada ainult --pgp2 "
+#~ "moodis\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "Usage: scdaemon [options] (-h for help)"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: gpgsm [options] [files] (-h for help)"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
 #, fuzzy
-#~ msgid "error loading `%s': %s\n"
-#~ msgstr "viga `%s' lugemisel: %s\n"
+#~ msgid "usage: gpgconf [options] "
+#~ msgstr "kasuta: gpg [võtmed] "
 
 #, fuzzy
 #~ msgid "failed to allocated keyDB handle\n"
-#~ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
+#~ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
 #~ msgid "Command> "
-#~ msgstr "Käsklus> "
+#~ msgstr "Käsklus> "
 
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-#~ msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n"
+#~ msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n"
 
 #~ msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 #~ msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
@@ -6987,14 +12543,14 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "DSA keypair will have %u bits.\n"
-#~ msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n"
+#~ msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n"
 
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Korrake parooli\n"
 
 #, fuzzy
 #~ msgid "read options from file"
-#~ msgstr "loen võtmeid failist `%s'\n"
+#~ msgstr "loen võtmeid failist `%s'\n"
 
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[fail]|loo allkiri"
@@ -7007,23 +12563,17 @@ msgstr ""
 #~ msgid "|[FILE]|make a clear text signature"
 #~ msgstr "|[fail]|loo avateksti allkiri"
 
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-
 #~ msgid "use the default key as default recipient"
-#~ msgstr "kasuta vaikimisi saajana vaikimisi võtit"
+#~ msgstr "kasuta vaikimisi saajana vaikimisi võtit"
 
 #~ msgid "force v3 signatures"
 #~ msgstr "kasuta v3 allkirju"
 
 #~ msgid "always use a MDC for encryption"
-#~ msgstr "krüptimisel kasuta alati MDC"
+#~ msgstr "krüptimisel kasuta alati MDC"
 
 #~ msgid "add this secret keyring to the list"
-#~ msgstr "lisa see salajaste võtmete hoidla nimekirja"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr "|NIMI|terminali kooditabel on NIMI"
+#~ msgstr "lisa see salajaste võtmete hoidla nimekirja"
 
 #~ msgid "|FILE|load extension module FILE"
 #~ msgstr "|FAIL|lae laiendusmoodul FAIL"
@@ -7033,7 +12583,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "remove key from the public keyring"
-#~ msgstr "eemalda võtmed avalike võtmete hoidlast"
+#~ msgstr "eemalda võtmed avalike võtmete hoidlast"
 
 #~ msgid ""
 #~ "It's up to you to assign a value here; this value will never be exported\n"
@@ -7041,8 +12591,8 @@ msgstr ""
 #~ "nothing\n"
 #~ "to do with the (implicitly created) web-of-certificates."
 #~ msgstr ""
-#~ "Teie ülesanne on sisestada nüüd väärtus; seda väärtust ei avalikustata\n"
-#~ "kolmandatele pooltele. Seda väärtust on vaja et realiseerida usaldusvõrk."
+#~ "Teie ülesanne on sisestada nüüd väärtus; seda väärtust ei avalikustata\n"
+#~ "kolmandatele pooltele. Seda väärtust on vaja et realiseerida usaldusvõrk."
 
 #~ msgid ""
 #~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
@@ -7050,14 +12600,14 @@ msgstr ""
 #~ "access to the secret key.  Answer \"yes\" to set this key to\n"
 #~ "ultimately trusted\n"
 #~ msgstr ""
-#~ "Usalduse võrgu loomiseks peab GnuPG teadma, millised võtmed on\n"
-#~ "absoluutselt usaldatavad. Need on tavaliselt võtmed, mille puhul\n"
-#~ "on teil juurdepääs ka nende salajastele võtmetele. Kui soovite\n"
-#~ "määrata seda võtit absoluutselt usaldatavaks, vastake \"jah\"\n"
+#~ "Usalduse võrgu loomiseks peab GnuPG teadma, millised võtmed on\n"
+#~ "absoluutselt usaldatavad. Need on tavaliselt võtmed, mille puhul\n"
+#~ "on teil juurdepääs ka nende salajastele võtmetele. Kui soovite\n"
+#~ "määrata seda võtit absoluutselt usaldatavaks, vastake \"jah\"\n"
 
 #~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 #~ msgstr ""
-#~ "Kui te ikkagi soovite kasutada seda mitteusaldatavat võtit, vastake \"jah"
+#~ "Kui te ikkagi soovite kasutada seda mitteusaldatavat võtit, vastake \"jah"
 #~ "\"."
 
 #~ msgid ""
@@ -7069,15 +12619,15 @@ msgstr ""
 #~ "encryption.  This algorithm should only be used in certain domains.\n"
 #~ "Please consult your security expert first."
 #~ msgstr ""
-#~ "Üldiselt ei ole hea mõte kasutada sama võtit allkirjastamiseks ja\n"
-#~ "krüpteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
+#~ "Üldiselt ei ole hea mõte kasutada sama võtit allkirjastamiseks ja\n"
+#~ "krüpteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
 #~ "Enne kasutamist konsulteerige palun oma turva eksperdiga."
 
 #~ msgid "Enter the size of the key"
-#~ msgstr "Sisestage võtmepikkus"
+#~ msgstr "Sisestage võtmepikkus"
 
 #~ msgid "Answer \"yes\" or \"no\""
-#~ msgstr "Vastake \"jah\" või \"ei\""
+#~ msgstr "Vastake \"jah\" või \"ei\""
 
 #~ msgid ""
 #~ "Enter the required value as shown in the prompt.\n"
@@ -7085,20 +12635,20 @@ msgstr ""
 #~ "get a good error response - instead the system tries to interpret\n"
 #~ "the given value as an interval."
 #~ msgstr ""
-#~ "Sisestage nõutav väärtus, nagu viibal näidati.\n"
-#~ "Võimalik on ka sisestada ISO kuupäev (AAAA-KK-PP), aga te ei\n"
-#~ "saa korrektset veateadet, kuna süsteem üritab antud väärtust\n"
-#~ "tõlgendada vahemikuna."
+#~ "Sisestage nõutav väärtus, nagu viibal näidati.\n"
+#~ "Võimalik on ka sisestada ISO kuupäev (AAAA-KK-PP), aga te ei\n"
+#~ "saa korrektset veateadet, kuna süsteem üritab antud väärtust\n"
+#~ "tõlgendada vahemikuna."
 
 #~ msgid "Enter the name of the key holder"
-#~ msgstr "Sisestage võtmehoidja nimi"
+#~ msgstr "Sisestage võtmehoidja nimi"
 
 #~ msgid "please enter an optional but highly suggested email address"
 #~ msgstr ""
-#~ "palun e-posti aadress, aadress ei ole kohustuslik, aga väga soovitav"
+#~ "palun e-posti aadress, aadress ei ole kohustuslik, aga väga soovitav"
 
 #~ msgid "Please enter an optional comment"
-#~ msgstr "Te võite nüüd sisestada kommentaari"
+#~ msgstr "Te võite nüüd sisestada kommentaari"
 
 #~ msgid ""
 #~ "N  to change the name.\n"
@@ -7110,12 +12660,12 @@ msgstr ""
 #~ "N  et muuta nime.\n"
 #~ "K  et muuta kommentaari.\n"
 #~ "E  et muuta e-posti aadressi.\n"
-#~ "O  et jätkata võtme loomist.\n"
-#~ "V  et lõpetada võtme loomine."
+#~ "O  et jätkata võtme loomist.\n"
+#~ "V  et lõpetada võtme loomine."
 
 #~ msgid ""
 #~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-#~ msgstr "Vastake \"jah\" (või \"j\"), kui võib alustada alamvõtme loomisega."
+#~ msgstr "Vastake \"jah\" (või \"j\"), kui võib alustada alamvõtme loomisega."
 
 #~ msgid ""
 #~ "When you sign a user ID on a key, you should first verify that the key\n"
@@ -7160,65 +12710,65 @@ msgstr ""
 #~ "\n"
 #~ "If you don't know what the right answer is, answer \"0\"."
 #~ msgstr ""
-#~ "Kui te allkirjastate võtme kasutaja ID, kontrollige kõigepealt, kas võti\n"
-#~ "ikka kuulub antud ID-ga näidatud isikule. Teistel inimestel on hea "
+#~ "Kui te allkirjastate võtme kasutaja ID, kontrollige kõigepealt, kas võti\n"
+#~ "ikka kuulub antud ID-ga näidatud isikule. Teistel inimestel on hea "
 #~ "teada,\n"
 #~ "kui hoolikalt te seda kontrolli olete teostanud.\n"
 #~ "\n"
-#~ "\"0\" tähendab, et te ei väida oma kontrollimise kohta midagi.\n"
+#~ "\"0\" tähendab, et te ei väida oma kontrollimise kohta midagi.\n"
 #~ "\n"
-#~ "\"1\" tähendab, et te usute, et võtit omab isik, kes seda väidab omavat, "
+#~ "\"1\" tähendab, et te usute, et võtit omab isik, kes seda väidab omavat, "
 #~ "kuid\n"
-#~ "    te ei saanud või ei soovinud seda väidet täiendavalt kontrollida. "
+#~ "    te ei saanud või ei soovinud seda väidet täiendavalt kontrollida. "
 #~ "See\n"
 #~ "    on kasulik \"persooni\" kontrolliks, kui te allkirjastate isiku "
 #~ "pseudo-\n"
-#~ "    nüümi võtit.\n"
+#~ "    nüümi võtit.\n"
 #~ "\n"
-#~ "\"2\" tähendab, et te teostasite võtme pealiskaudset kontrolli. See võib\n"
-#~ "    näiteks tähendada, et te kontrollisite võtme sõrmejälge ja "
+#~ "\"2\" tähendab, et te teostasite võtme pealiskaudset kontrolli. See võib\n"
+#~ "    näiteks tähendada, et te kontrollisite võtme sõrmejälge ja "
 #~ "kontrollisite\n"
-#~ "    võtme kasutaja ID foto ID vastu.\n"
+#~ "    võtme kasutaja ID foto ID vastu.\n"
 #~ "\n"
-#~ "\"3\" tähendab, et te teostasite võtme põhjalikku kontrolli. See võib "
-#~ "näiteks\n"
-#~ "    tähendada, et võrdlesite võtme sõrmejälge võrme omanikuga otse "
+#~ "\"3\" tähendab, et te teostasite võtme põhjalikku kontrolli. See võib "
+#~ "näiteks\n"
+#~ "    tähendada, et võrdlesite võtme sõrmejälge võrme omanikuga otse "
 #~ "suheldes\n"
-#~ "    ja et te kontrollisite raskesti võltsitavast allikast (nt. pass) et\n"
-#~ "    võtme omaniku nimi vastab võtmel näidatud kasutaja IDle ja te "
+#~ "    ja et te kontrollisite raskesti võltsitavast allikast (nt. pass) et\n"
+#~ "    võtme omaniku nimi vastab võtmel näidatud kasutaja IDle ja te "
 #~ "kontrol-\n"
-#~ "    lisite, et võtmel näidatud e-posti aadress kuulub võtme omanikule.\n"
+#~ "    lisite, et võtmel näidatud e-posti aadress kuulub võtme omanikule.\n"
 #~ "\n"
-#~ "pange tähele, et näited tasemete 2 ja 3 juures on *ainult* näited. "
-#~ "Sõltub\n"
-#~ "ainult teist, milline on \"pealiskaudse\" ja \"põhjaliku\" kontrolli "
-#~ "tähendus,\n"
-#~ "kui te allkirjastate teisi võtmeid.\n"
+#~ "pange tähele, et näited tasemete 2 ja 3 juures on *ainult* näited. "
+#~ "Sõltub\n"
+#~ "ainult teist, milline on \"pealiskaudse\" ja \"põhjaliku\" kontrolli "
+#~ "tähendus,\n"
+#~ "kui te allkirjastate teisi võtmeid.\n"
 #~ "\n"
-#~ "Kui te ei tea õiget vastust, vastake \"0\"."
+#~ "Kui te ei tea õiget vastust, vastake \"0\"."
 
 #, fuzzy
 #~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-#~ msgstr "Kui te soovite allkirjastada KÕIK kasutaja IDd, vastake \"jah\""
+#~ msgstr "Kui te soovite allkirjastada KÕIK kasutaja IDd, vastake \"jah\""
 
 #~ msgid ""
 #~ "Answer \"yes\" if you really want to delete this user ID.\n"
 #~ "All certificates are then also lost!"
 #~ msgstr ""
-#~ "Kui te tõesti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
+#~ "Kui te tõesti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 #~ "Sertifikaadid kustutatakse samuti!"
 
 #~ msgid "Answer \"yes\" if it is okay to delete the subkey"
-#~ msgstr "Kui selle alamvõtme võib kustutada, vastake \"jah\""
+#~ msgstr "Kui selle alamvõtme võib kustutada, vastake \"jah\""
 
 #~ msgid ""
 #~ "This is a valid signature on the key; you normally don't want\n"
 #~ "to delete this signature because it may be important to establish a\n"
 #~ "trust connection to the key or another key certified by this key."
 #~ msgstr ""
-#~ "See on võtme kehtiv allkiri; tavaliselt seda ei soovita kustutada,\n"
-#~ "kuna see allkiri võib olla vajalik, et kirjeldada antud võtme või\n"
-#~ "antud võtmega sertifitseeritud teise võtme usaldatavust."
+#~ "See on võtme kehtiv allkiri; tavaliselt seda ei soovita kustutada,\n"
+#~ "kuna see allkiri võib olla vajalik, et kirjeldada antud võtme või\n"
+#~ "antud võtmega sertifitseeritud teise võtme usaldatavust."
 
 #~ msgid ""
 #~ "This signature can't be checked because you don't have the\n"
@@ -7226,15 +12776,15 @@ msgstr ""
 #~ "know which key was used because this signing key might establish\n"
 #~ "a trust connection through another already certified key."
 #~ msgstr ""
-#~ "Seda allkirja ei saa kontrollida, kuna puudub allkirjale vastav võti.\n"
-#~ "Te peaksite peatama kustutamise, kuni on teada, millist võtit see\n"
-#~ "kasutab, sest see võti võib moodustada usaldussuhte läbi mõne juba\n"
-#~ "sertifitseeritud võtme."
+#~ "Seda allkirja ei saa kontrollida, kuna puudub allkirjale vastav võti.\n"
+#~ "Te peaksite peatama kustutamise, kuni on teada, millist võtit see\n"
+#~ "kasutab, sest see võti võib moodustada usaldussuhte läbi mõne juba\n"
+#~ "sertifitseeritud võtme."
 
 #~ msgid ""
 #~ "The signature is not valid.  It does make sense to remove it from\n"
 #~ "your keyring."
-#~ msgstr "Allkiri ei ole kehtiv. Oleks mõistlik see võtmehoidlast kustutada."
+#~ msgstr "Allkiri ei ole kehtiv. Oleks mõistlik see võtmehoidlast kustutada."
 
 #~ msgid ""
 #~ "This is a signature which binds the user ID to the key. It is\n"
@@ -7243,22 +12793,22 @@ msgstr ""
 #~ "only if this self-signature is for some reason not valid and\n"
 #~ "a second one is available."
 #~ msgstr ""
-#~ "See allkiri seob kasutaja ID võtmega. Sellist allkirja ei ole\n"
-#~ "üldiselt soovitatav eemaldada. Peale selle kustutamist ei pruugi\n"
-#~ "GnuPG enam olla võimeline seda võtit leidma. Kustutada võiks\n"
-#~ "vaid siis, kui see allkiri ei ole miskipärast kehtiv ja on\n"
-#~ "olemas ka teine allkiri, mis kasutajat võtmega seob."
+#~ "See allkiri seob kasutaja ID võtmega. Sellist allkirja ei ole\n"
+#~ "üldiselt soovitatav eemaldada. Peale selle kustutamist ei pruugi\n"
+#~ "GnuPG enam olla võimeline seda võtit leidma. Kustutada võiks\n"
+#~ "vaid siis, kui see allkiri ei ole miskipärast kehtiv ja on\n"
+#~ "olemas ka teine allkiri, mis kasutajat võtmega seob."
 
 #~ msgid ""
 #~ "Change the preferences of all user IDs (or just of the selected ones)\n"
 #~ "to the current list of preferences.  The timestamp of all affected\n"
 #~ "self-signatures will be advanced by one second.\n"
 #~ msgstr ""
-#~ "Muuda kõikide kasutaja ID-de seaded (või ainult valitud)\n"
-#~ "vastavaks hetkel määratud seadetele. Kõikide asjasse puutuvate\n"
-#~ "ise loodud allkirjade ajatempleid suurendatakse ühe sekundi võrra.\n"
+#~ "Muuda kõikide kasutaja ID-de seaded (või ainult valitud)\n"
+#~ "vastavaks hetkel määratud seadetele. Kõikide asjasse puutuvate\n"
+#~ "ise loodud allkirjade ajatempleid suurendatakse ühe sekundi võrra.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Palun sisestage parool; see on salajane tekst \n"
 
 #~ msgid ""
@@ -7269,7 +12819,7 @@ msgstr ""
 #~ msgstr "Sisestage palun failinimi, mida allkirjastada"
 
 #~ msgid "Answer \"yes\" if it is okay to overwrite the file"
-#~ msgstr "Vastake \"jah\", kui faili võib üle kirjutada"
+#~ msgstr "Vastake \"jah\", kui faili võib üle kirjutada"
 
 #~ msgid ""
 #~ "Please enter a new filename. If you just hit RETURN the default\n"
@@ -7292,18 +12842,18 @@ msgstr ""
 #~ "      Use this to state that the user ID should not longer be used;\n"
 #~ "      this is normally used to mark an email address invalid.\n"
 #~ msgstr ""
-#~ "Te peate määrama sertifitseerimise põhjuse. Sõltuvalt kontekstist on\n"
-#~ "teil võimalus valida üks järgnevaist:\n"
-#~ "  \"Võti on kompromiteeritud\"\n"
-#~ "      Kasutage seda, kui teil on põhjust uskuda, et autoriseerimata\n"
-#~ "      isikud on saanud juurdepääsu teie salajasele võtmele.\n"
-#~ "  \"Võti on asendatud\"\n"
-#~ "      Kasutage seda, kui te olete selle võtme asendanud uuemaga.\n"
-#~ "  \"Võti ei ole enam kasutusel\"\n"
-#~ "      Kasutage seda, kui te ei kasuta enam seda võtit.\n"
+#~ "Te peate määrama sertifitseerimise põhjuse. Sõltuvalt kontekstist on\n"
+#~ "teil võimalus valida üks järgnevaist:\n"
+#~ "  \"Võti on kompromiteeritud\"\n"
+#~ "      Kasutage seda, kui teil on põhjust uskuda, et autoriseerimata\n"
+#~ "      isikud on saanud juurdepääsu teie salajasele võtmele.\n"
+#~ "  \"Võti on asendatud\"\n"
+#~ "      Kasutage seda, kui te olete selle võtme asendanud uuemaga.\n"
+#~ "  \"Võti ei ole enam kasutusel\"\n"
+#~ "      Kasutage seda, kui te ei kasuta enam seda võtit.\n"
 #~ "  \"Kasutaja ID ei ole enam kehtiv\"\n"
-#~ "      Kasutage seda märkimaks, et konkreetset kasutaja ID ei peaks enam\n"
-#~ "      kasutama; seda kasutatakse tavaliselt märkimaks vigast e-posti "
+#~ "      Kasutage seda märkimaks, et konkreetset kasutaja ID ei peaks enam\n"
+#~ "      kasutama; seda kasutatakse tavaliselt märkimaks vigast e-posti "
 #~ "aadressi.\n"
 
 #~ msgid ""
@@ -7311,22 +12861,22 @@ msgstr ""
 #~ "revocation certificate.  Please keep this text concise.\n"
 #~ "An empty line ends the text.\n"
 #~ msgstr ""
-#~ "Kui te soovite, võite nüüd sisestada põhjenduse, miks te\n"
-#~ "soovite seda tühistamise sertifikaati esitada. Palun kirjutage\n"
-#~ "lühidalt. Tühi rida lõpetab teksti.\n"
+#~ "Kui te soovite, võite nüüd sisestada põhjenduse, miks te\n"
+#~ "soovite seda tühistamise sertifikaati esitada. Palun kirjutage\n"
+#~ "lühidalt. Tühi rida lõpetab teksti.\n"
 
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
 
 #~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 #~ msgstr ""
-#~ "noteerimise infot ei saa v3 (PGP 2.x stiilis) võtme allkirja lisada\n"
+#~ "noteerimise infot ei saa v3 (PGP 2.x stiilis) võtme allkirja lisada\n"
 
 #~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
 
 #~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-#~ msgstr "poliisi URLi ei saa v3 võtme (PGP 2.x) allkirjadesse panna\n"
+#~ msgstr "poliisi URLi ei saa v3 võtme (PGP 2.x) allkirjadesse panna\n"
 
 #, fuzzy
 #~ msgid "shelll"
@@ -7343,14 +12893,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "please use the script \"%s\" to generate a new key\n"
-#~ msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
+#~ msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
 #, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-#~ msgstr "ebaturvaliste õiguste tõttu ei laetud ¨ifri laiendust \"%s\"\n"
-
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
+#~ msgstr "ebaturvaliste õiguste tõttu ei laetud šifri laiendust \"%s\"\n"
 
 #, fuzzy
 #~ msgid ".\n"
@@ -7361,54 +12908,45 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "can't query passphrase in batch mode\n"
-#~ msgstr "pakettmoodis ei saa parooli küsida\n"
-
-#~ msgid "Enter passphrase: "
-#~ msgstr "Sisestage parool: "
+#~ msgstr "pakettmoodis ei saa parooli küsida\n"
 
 #~ msgid "Repeat passphrase: "
 #~ msgstr "Korrake parooli: "
 
 #~ msgid "-k[v][v][v][c] [user-id] [keyring]"
-#~ msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]"
+#~ msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]"
 
 #, fuzzy
 #~ msgid "can't gen prime with pbits=%u qbits=%u\n"
-#~ msgstr "vähem kui %d bitiga ei saa algarvu genereerida\n"
+#~ msgstr "vähem kui %d bitiga ei saa algarvu genereerida\n"
 
 #~ msgid "can't generate a prime with less than %d bits\n"
-#~ msgstr "vähem kui %d bitiga ei saa algarvu genereerida\n"
+#~ msgstr "vähem kui %d bitiga ei saa algarvu genereerida\n"
 
 #~ msgid "no entropy gathering module detected\n"
 #~ msgstr "entroopia kogumise moodul puudub\n"
 
 #, fuzzy
 #~ msgid "can't lock `%s': %s\n"
-#~ msgstr "`%s' ei õnnestu avada\n"
-
-#~ msgid "can't stat `%s': %s\n"
-#~ msgstr "ei õnnestu lugeda `%s' atribuute: %s\n"
+#~ msgstr "`%s' ei õnnestu avada\n"
 
 #~ msgid "`%s' is not a regular file - ignored\n"
 #~ msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
 #~ msgid "note: random_seed file is empty\n"
-#~ msgstr "märkus: random_seed fail on tühi\n"
-
-#~ msgid "WARNING: invalid size of random_seed file - not used\n"
-#~ msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
+#~ msgstr "märkus: random_seed fail on tühi\n"
 
 #~ msgid "can't read `%s': %s\n"
-#~ msgstr "`%s' ei õnnestu lugeda: %s\n"
+#~ msgstr "`%s' ei õnnestu lugeda: %s\n"
 
 #~ msgid "note: random_seed file not updated\n"
-#~ msgstr "märkus: random_seed faili ei uuendatud\n"
+#~ msgstr "märkus: random_seed faili ei uuendatud\n"
 
 #~ msgid "can't write `%s': %s\n"
-#~ msgstr "`%s' ei õnnestu kirjutada: %s\n"
+#~ msgstr "`%s' ei õnnestu kirjutada: %s\n"
 
 #~ msgid "can't close `%s': %s\n"
-#~ msgstr "`%s' ei õnnestu sulgeda: %s\n"
+#~ msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
 #~ msgid "WARNING: using insecure random number generator!!\n"
 #~ msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
@@ -7420,10 +12958,10 @@ msgstr ""
 #~ "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Juhuarvude generaator on ainult tühi kest, et programmid\n"
-#~ "käiks - see EI OLE tugev juhuarvude generaator!\n"
+#~ "Juhuarvude generaator on ainult tühi kest, et programmid\n"
+#~ "käiks - see EI OLE tugev juhuarvude generaator!\n"
 #~ "\n"
-#~ "ÄRGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
+#~ "ÄRGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 #~ "\n"
 
 #~ msgid ""
@@ -7431,9 +12969,9 @@ msgstr ""
 #~ "keep you from getting bored, because it will improve the quality\n"
 #~ "of the entropy.\n"
 #~ msgstr ""
-#~ "Palun oodake, kogutakse entroopiat. Igavuse vältimiseks võite teha "
+#~ "Palun oodake, kogutakse entroopiat. Igavuse vältimiseks võite teha "
 #~ "arvutiga\n"
-#~ "mingit tööd, see tõstab ka entroopia kvaliteeti.\n"
+#~ "mingit tööd, see tõstab ka entroopia kvaliteeti.\n"
 
 #~ msgid ""
 #~ "\n"
@@ -7441,12 +12979,12 @@ msgstr ""
 #~ "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid töid,\n"
-#~ "et anda masinal võimalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
+#~ "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid töid,\n"
+#~ "et anda masinal võimalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
 #, fuzzy
 #~ msgid "card reader not available\n"
-#~ msgstr "salajane võti ei ole kättesaadav"
+#~ msgstr "salajane võti ei ole kättesaadav"
 
 #, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
@@ -7454,25 +12992,22 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "         algorithms on these user IDs:\n"
-#~ msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
+#~ msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
 
 #~ msgid "general error"
-#~ msgstr "üldine viga"
+#~ msgstr "üldine viga"
 
 #~ msgid "unknown packet type"
-#~ msgstr "tundmatu paketi tüüp"
-
-#~ msgid "unknown pubkey algorithm"
-#~ msgstr "tundmatu avaliku võtme algoritm"
+#~ msgstr "tundmatu paketi tüüp"
 
 #~ msgid "unknown digest algorithm"
-#~ msgstr "tundmatu lühendi algoritm"
+#~ msgstr "tundmatu lühendi algoritm"
 
 #~ msgid "bad public key"
-#~ msgstr "halb avalik võti"
+#~ msgstr "halb avalik võti"
 
 #~ msgid "bad secret key"
-#~ msgstr "halb salajane võti"
+#~ msgstr "halb salajane võti"
 
 #~ msgid "bad signature"
 #~ msgstr "halb allkiri"
@@ -7481,10 +13016,7 @@ msgstr ""
 #~ msgstr "kontrollsumma viga"
 
 #~ msgid "unknown cipher algorithm"
-#~ msgstr "tundmatu ¨ifri algoritm"
-
-#~ msgid "can't open the keyring"
-#~ msgstr "võtmehoidlat ei õnnestu avada"
+#~ msgstr "tundmatu šifri algoritm"
 
 #~ msgid "invalid packet"
 #~ msgstr "vigane pakett"
@@ -7493,13 +13025,13 @@ msgstr ""
 #~ msgstr "sellist kasutaja id pole"
 
 #~ msgid "secret key not available"
-#~ msgstr "salajane võti ei ole kättesaadav"
+#~ msgstr "salajane võti ei ole kättesaadav"
 
 #~ msgid "wrong secret key used"
-#~ msgstr "kasutati valet salajast võtit"
+#~ msgstr "kasutati valet salajast võtit"
 
 #~ msgid "bad key"
-#~ msgstr "halb võti"
+#~ msgstr "halb võti"
 
 #~ msgid "file write error"
 #~ msgstr "viga faili kirjutamisel"
@@ -7514,10 +13046,10 @@ msgstr ""
 #~ msgstr "viga faili loomisel"
 
 #~ msgid "unimplemented pubkey algorithm"
-#~ msgstr "realiseerimata avaliku võtme algoritm"
+#~ msgstr "realiseerimata avaliku võtme algoritm"
 
 #~ msgid "unimplemented cipher algorithm"
-#~ msgstr "realiseerimata ¨ifri algoritm"
+#~ msgstr "realiseerimata šifri algoritm"
 
 #~ msgid "unknown signature class"
 #~ msgstr "tundmatu allkirja klass"
@@ -7529,7 +13061,7 @@ msgstr ""
 #~ msgstr "ressursi limiit"
 
 #~ msgid "invalid keyring"
-#~ msgstr "vigane võtmehoidla"
+#~ msgstr "vigane võtmehoidla"
 
 #~ msgid "malformed user id"
 #~ msgstr "vigane kasutaja id"
@@ -7538,50 +13070,41 @@ msgstr ""
 #~ msgstr "viga faili sulgemisel"
 
 #~ msgid "file rename error"
-#~ msgstr "viga faili ümber nimetamisel"
+#~ msgstr "viga faili ümber nimetamisel"
 
 #~ msgid "file delete error"
 #~ msgstr "viga faili kustutamisel"
 
-#~ msgid "unexpected data"
-#~ msgstr "ootamatud andmed"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "ajatemplite konflikt"
 
 #~ msgid "unusable pubkey algorithm"
-#~ msgstr "mittekasutatav avaliku võtme algoritm"
+#~ msgstr "mittekasutatav avaliku võtme algoritm"
 
 #~ msgid "file exists"
 #~ msgstr "fail on olemas"
 
 #~ msgid "weak key"
-#~ msgstr "nõrk võti"
+#~ msgstr "nõrk võti"
 
 #~ msgid "bad URI"
 #~ msgstr "halb URI"
 
-#~ msgid "unsupported URI"
-#~ msgstr "mittetoetatud URI"
-
-#~ msgid "network error"
-#~ msgstr "võrgu viga"
-
 #~ msgid "not processed"
-#~ msgstr "ei töödeldud"
+#~ msgstr "ei töödeldud"
 
 #~ msgid "unusable public key"
-#~ msgstr "mittekasutatav avalik võti"
+#~ msgstr "mittekasutatav avalik võti"
 
 #~ msgid "unusable secret key"
-#~ msgstr "mittekasutatav salajane võti"
+#~ msgstr "mittekasutatav salajane võti"
 
 #~ msgid "keyserver error"
-#~ msgstr "võtmeserveri viga"
+#~ msgstr "võtmeserveri viga"
 
 #, fuzzy
 #~ msgid "no card"
-#~ msgstr "krüptimata"
+#~ msgstr "krüptimata"
 
 #, fuzzy
 #~ msgid "no data"
@@ -7590,14 +13113,11 @@ msgstr ""
 #~ msgid "... this is a bug (%s:%d:%s)\n"
 #~ msgstr "... see on viga (%s:%d:%s)\n"
 
-#~ msgid "WARNING: using insecure memory!\n"
-#~ msgstr "HOIATUS: kasutan ebaturvalist mälu!\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
-#~ msgstr "initsialiseerimata turvalise mäluta ei ole operatsioon võimalik\n"
+#~ msgstr "initsialiseerimata turvalise mäluta ei ole operatsioon võimalik\n"
 
 #~ msgid "(you may have used the wrong program for this task)\n"
-#~ msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n"
+#~ msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n"
 
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
@@ -7605,11 +13125,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
-#~ msgstr "loe võtmed failist"
+#~ msgstr "loe võtmed failist"
 
 #, fuzzy
 #~ msgid "all import-clean-* options from above"
-#~ msgstr "loe võtmed failist"
+#~ msgstr "loe võtmed failist"
 
 #, fuzzy
 #~ msgid "expired: %s)"
@@ -7617,57 +13137,48 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "key %s: expired signature from key %s - skipped\n"
-#~ msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
+#~ msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
 
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
-#~ msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
+#~ msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
 
 #, fuzzy
 #~ msgid "No user IDs are removable.\n"
-#~ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+#~ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-#~ msgstr "halb parool või tundmatu ¨ifri algoritm (%d)\n"
+#~ msgstr "halb parool või tundmatu šifri algoritm (%d)\n"
 
 #~ msgid "can't set client pid for the agent\n"
-#~ msgstr "agendile ei õnnestu seada kliendi pid\n"
+#~ msgstr "agendile ei õnnestu seada kliendi pid\n"
 
 #~ msgid "can't get server read FD for the agent\n"
-#~ msgstr "agendiga suhtlemiseks ei õnnestu saada lugemise FD\n"
+#~ msgstr "agendiga suhtlemiseks ei õnnestu saada lugemise FD\n"
 
 #~ msgid "can't get server write FD for the agent\n"
-#~ msgstr "agendiga suhtlemiseks ei õnnestu saada kirjutamise FD\n"
-
-#~ msgid "invalid response from agent\n"
-#~ msgstr "vigane vastus agendilt\n"
+#~ msgstr "agendiga suhtlemiseks ei õnnestu saada kirjutamise FD\n"
 
 #~ msgid "select secondary key N"
-#~ msgstr "vali sekundaarne võti N"
+#~ msgstr "vali sekundaarne võti N"
 
 #~ msgid "list signatures"
-#~ msgstr "näita allkirju"
+#~ msgstr "näita allkirju"
 
 #~ msgid "sign the key"
-#~ msgstr "allkirjasta võti"
+#~ msgstr "allkirjasta võti"
 
 #~ msgid "add a secondary key"
-#~ msgstr "lisa sekundaarne võti"
+#~ msgstr "lisa sekundaarne võti"
 
 #~ msgid "delete signatures"
 #~ msgstr "kustuta allkirjad"
 
-#~ msgid "change the expire date"
-#~ msgstr "muuda aegumise kuupäeva"
-
-#~ msgid "set preference list"
-#~ msgstr "sea eelistuste nimekiri"
-
 #~ msgid "updated preferences"
 #~ msgstr "uuendatud eelistused"
 
 #~ msgid "No secondary key with index %d\n"
-#~ msgstr "Sekundaarne võti numbriga %d puudub\n"
+#~ msgstr "Sekundaarne võti numbriga %d puudub\n"
 
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key kasutaja-id"
@@ -7676,10 +13187,10 @@ msgstr ""
 #~ msgstr "--nrlsign-key kasutaja-id"
 
 #~ msgid "sign the key non-revocably"
-#~ msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana"
+#~ msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana"
 
 #~ msgid "sign the key locally and non-revocably"
-#~ msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana"
+#~ msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
 #~ msgid "q"
 #~ msgstr "v"
@@ -7711,7 +13222,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "generate"
-#~ msgstr "üldine viga"
+#~ msgstr "üldine viga"
 
 #~ msgid "passwd"
 #~ msgstr "passwd"
@@ -7725,9 +13236,6 @@ msgstr ""
 #~ msgid "uid"
 #~ msgstr "uid"
 
-#~ msgid "key"
-#~ msgstr "key"
-
 #~ msgid "check"
 #~ msgstr "check"
 
@@ -7785,7 +13293,7 @@ msgstr ""
 #~ msgstr "primaarne"
 
 #~ msgid "toggle"
-#~ msgstr "lülita"
+#~ msgstr "lülita"
 
 #~ msgid "t"
 #~ msgstr "t"
@@ -7804,7 +13312,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "keyserver"
-#~ msgstr "võtmeserveri viga"
+#~ msgstr "võtmeserveri viga"
 
 #~ msgid "trust"
 #~ msgstr "trust"
@@ -7828,7 +13336,7 @@ msgstr ""
 #~ msgstr "showphoto"
 
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
-#~ msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n"
+#~ msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n"
 
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
@@ -7836,40 +13344,40 @@ msgstr ""
 #~ "              default keysize is 1024 bits\n"
 #~ "    highest suggested keysize is 2048 bits\n"
 #~ msgstr ""
-#~ "Enne uue %s võtmepaari genereerimist.\n"
-#~ "           minimaalne võtmepikkus on  768 bitti\n"
-#~ "            vaikimisi võtmepikkus on 1024 bitti\n"
-#~ "    suurim soovitatav võtmepikkus on 2048 bitti\n"
+#~ "Enne uue %s võtmepaari genereerimist.\n"
+#~ "           minimaalne võtmepikkus on  768 bitti\n"
+#~ "            vaikimisi võtmepikkus on 1024 bitti\n"
+#~ "    suurim soovitatav võtmepikkus on 2048 bitti\n"
 
 #~ msgid "DSA only allows keysizes from 512 to 1024\n"
-#~ msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n"
+#~ msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
 #~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#~ msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n"
+#~ msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n"
 
 #~ msgid "keysize too small; 768 is smallest value allowed.\n"
-#~ msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n"
+#~ msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n"
 
 #~ msgid "keysize too large; %d is largest value allowed.\n"
-#~ msgstr "võtmepikkus on liiga suur; suurim lubatud väärtus on %d.\n"
+#~ msgstr "võtmepikkus on liiga suur; suurim lubatud väärtus on %d.\n"
 
 #~ msgid ""
 #~ "Keysizes larger than 2048 are not suggested because\n"
 #~ "computations take REALLY long!\n"
 #~ msgstr ""
-#~ "Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n"
-#~ "arvutused võtavad VÄGA palju aega!\n"
+#~ "Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n"
+#~ "arvutused võtavad VÄGA palju aega!\n"
 
 #, fuzzy
 #~ msgid "Are you sure that you want this keysize? (y/N) "
-#~ msgstr "Olete kindel, et soovite sellist võtmepikkust? "
+#~ msgstr "Olete kindel, et soovite sellist võtmepikkust? "
 
 #~ msgid ""
 #~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
 #~ "very vulnerable to attacks!\n"
 #~ msgstr ""
 #~ "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
-#~ "võimalikud ründeobjektid!\n"
+#~ "võimalikud ründeobjektid!\n"
 
 #~ msgid "Experimental algorithms should not be used!\n"
 #~ msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
@@ -7877,30 +13385,26 @@ msgstr ""
 #~ msgid ""
 #~ "this cipher algorithm is deprecated; please use a more standard one!\n"
 #~ msgstr ""
-#~ "see ¨ifri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n"
+#~ "see šifri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n"
 
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "vabandust, seda ei saa pakettmoodis teha\n"
 
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
-#~ msgstr "faili ei õnnestu avada: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                 ka \""
+#~ msgstr "faili ei õnnestu avada: %s\n"
 
 #~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "võti %08lX: võti on tühistatud!\n"
+#~ msgstr "võti %08lX: võti on tühistatud!\n"
 
 #~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "võti %08lX: alamvõti on tühistatud!\n"
+#~ msgstr "võti %08lX: alamvõti on tühistatud!\n"
 
 #~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: võti on aegunud\n"
+#~ msgstr "%08lX: võti on aegunud\n"
 
 #~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: Me EI usalda seda võtit\n"
+#~ msgstr "%08lX: Me EI usalda seda võtit\n"
 
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
@@ -7908,29 +13412,29 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
+#~ msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
 
 #, fuzzy
 #~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
+#~ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
 #, fuzzy
 #~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
+#~ msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
 
 #~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: ei õnnestu avada: %s\n"
+#~ msgstr "%s: ei õnnestu avada: %s\n"
 
 #~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: HOIATUS: tühi fail\n"
+#~ msgstr "%s: HOIATUS: tühi fail\n"
 
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = Usaldan vähesel määral\n"
+#~ msgstr " %d = Usaldan vähesel määral\n"
 
 #, fuzzy
 #~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = Usaldan täiesti\n"
+#~ msgstr " %d = Usaldan täiesti\n"
 
 #, fuzzy
 #~ msgid "expires"
@@ -7942,41 +13446,38 @@ msgstr ""
 #~ "locally signed with your key %s at %s\n"
 #~ msgstr ""
 #~ "\"\n"
-#~ "lokaalselt allkirjastatud teie võtmega %08lX %s\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: ei õnnestu kasutada: %s\n"
+#~ "lokaalselt allkirjastatud teie võtmega %08lX %s\n"
 
 #~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: ei õnnestu luua lukku\n"
+#~ msgstr "%s: ei õnnestu luua lukku\n"
 
 #~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: ei õnnestu seada lukku\n"
+#~ msgstr "%s: ei õnnestu seada lukku\n"
 
 #~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: ei õnnestu luua: %s\n"
+#~ msgstr "%s: ei õnnestu luua: %s\n"
 
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
-#~ "Kui te ikkagi soovite kasutada seda kehtetut võtit, vastake \"jah\"."
+#~ "Kui te ikkagi soovite kasutada seda kehtetut võtit, vastake \"jah\"."
 
 #~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Fotot \"%s\" ei õnnestu avada: %s\n"
+#~ msgstr "Fotot \"%s\" ei õnnestu avada: %s\n"
 
 #~ msgid "error: missing colon\n"
 #~ msgstr "viga: puudub koolon\n"
 
 #~ msgid "error: no ownertrust value\n"
-#~ msgstr "viga: usalduse väärtus puudub\n"
+#~ msgstr "viga: usalduse väärtus puudub\n"
 
 #~ msgid " (main key ID %08lX)"
-#~ msgstr " (peamise võtme ID %08lX)"
+#~ msgstr " (peamise võtme ID %08lX)"
 
 #~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! alamvõti on tühistatud: %s\n"
+#~ msgstr "rev! alamvõti on tühistatud: %s\n"
 
 #~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- leitud võltsitud tühistamine\n"
+#~ msgstr "rev- leitud võltsitud tühistamine\n"
 
 #, fuzzy
 #~ msgid " [expired: %s]"
@@ -7987,34 +13488,34 @@ msgstr ""
 
 #, fuzzy
 #~ msgid " [revoked: %s]"
-#~ msgstr "[tühistatud] "
+#~ msgstr "[tühistatud] "
 
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
-#~ "HOIATUS: sõnumilühend `%s' ei ole OpenPGP osa.  Kasutamine omal "
+#~ "HOIATUS: sõnumilühend `%s' ei ole OpenPGP osa.  Kasutamine omal "
 #~ "vastutusel!\n"
 
 #~ msgid "|[files]|encrypt files"
-#~ msgstr "|[failid]|krüpteeri failid"
+#~ msgstr "|[failid]|krüpteeri failid"
 
 #~ msgid "store only"
 #~ msgstr "ainult salvesta"
 
 #~ msgid "|[files]|decrypt files"
-#~ msgstr "|[failid]|dekrüpteeri failid"
+#~ msgstr "|[failid]|dekrüpteeri failid"
 
 #~ msgid "sign a key non-revocably"
-#~ msgstr "allkirjasta võti mitte-tühistatavana"
+#~ msgstr "allkirjasta võti mitte-tühistatavana"
 
 #~ msgid "sign a key locally and non-revocably"
-#~ msgstr "allkirjasta võti lokaalselt ja mitte-tühistatavana"
+#~ msgstr "allkirjasta võti lokaalselt ja mitte-tühistatavana"
 
 #~ msgid "list only the sequence of packets"
-#~ msgstr "näita ainult pakettide järjendeid"
+#~ msgstr "näita ainult pakettide järjendeid"
 
 #~ msgid "export the ownertrust values"
-#~ msgstr "ekspordi usalduse väärtused"
+#~ msgstr "ekspordi usalduse väärtused"
 
 #~ msgid "unattended trust database update"
 #~ msgstr "hooldusvaba usalduse andmebaasi uuendamine"
@@ -8023,47 +13524,44 @@ msgstr ""
 #~ msgstr "paranda vigane usalduse andmebaas"
 
 #~ msgid "De-Armor a file or stdin"
-#~ msgstr "Pakenda fail või standardsisend lahti"
+#~ msgstr "Pakenda fail või standardsisend lahti"
 
 #~ msgid "En-Armor a file or stdin"
-#~ msgstr "Pakenda fail või standardsisend"
+#~ msgstr "Pakenda fail või standardsisend"
 
 #~ msgid "do not force v3 signatures"
-#~ msgstr "ära kasuta v3 allkirju"
+#~ msgstr "ära kasuta v3 allkirju"
 
 #~ msgid "force v4 key signatures"
-#~ msgstr "kasuta v4 võtme allkirju"
+#~ msgstr "kasuta v4 võtme allkirju"
 
 #~ msgid "do not force v4 key signatures"
-#~ msgstr "ära kasuta v3 võtme allkirju"
+#~ msgstr "ära kasuta v3 võtme allkirju"
 
 #~ msgid "never use a MDC for encryption"
-#~ msgstr "krüptimisel ära kasuta kunagi MDC"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "kasuta gpg-agenti"
+#~ msgstr "krüptimisel ära kasuta kunagi MDC"
 
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[fail]|kirjuta olekuinfo faili"
 
 #~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|VÕTMEID|usalda seda võtit täielikult"
+#~ msgstr "|VÕTMEID|usalda seda võtit täielikult"
 
 #~ msgid "emulate the mode described in RFC1991"
 #~ msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
 #~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr "kasuta kõikides tegevustes OpenPGP võtmeid"
+#~ msgstr "kasuta kõikides tegevustes OpenPGP võtmeid"
 
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr ""
-#~ "kasuta kõikide pakettide, ¨iffrite ja lühendi seadeid PGP 2.x moodis"
+#~ "kasuta kõikide pakettide, šiffrite ja lühendi seadeid PGP 2.x moodis"
 
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|NIMI|kasuta paroolidega lühendialgoritmi NIMI"
+#~ msgstr "|NIMI|kasuta paroolidega lühendialgoritmi NIMI"
 
 #~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "ära lisa krüptimisel võtme id"
+#~ msgstr "ära lisa krüptimisel võtme id"
 
 #~ msgid "Show Photo IDs"
 #~ msgstr "Esita foto IDd"
@@ -8072,7 +13570,7 @@ msgstr ""
 #~ msgstr "Ei esita foto IDd"
 
 #~ msgid "Set command line to view Photo IDs"
-#~ msgstr "Sea käsurida foto ID vaatamiseks"
+#~ msgstr "Sea käsurida foto ID vaatamiseks"
 
 #~ msgid "compress algorithm `%s' is read-only in this release\n"
 #~ msgstr "pakkimise algoritm `%s' on selles versioonis ainult lugemiseks\n"
@@ -8084,78 +13582,72 @@ msgstr ""
 #~ "%08lX: It is not sure that this key really belongs to the owner\n"
 #~ "but it is accepted anyway\n"
 #~ msgstr ""
-#~ "%08lX: Ei ole kindel, et see võti tõesti kuulub omanikule,\n"
+#~ "%08lX: Ei ole kindel, et see võti tõesti kuulub omanikule,\n"
 #~ "aktsepteerime seda siiski\n"
 
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "eelistus %c%lu ei ole lubatud\n"
 
 #~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "võti %08lX: ei ole rfc2440 võti - jätsin vahele\n"
+#~ msgstr "võti %08lX: ei ole rfc2440 võti - jätsin vahele\n"
 
 #~ msgid ""
 #~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
 #~ msgstr ""
-#~ "MÄRKUS: Tuvastasin Elgamal primaarvõtme - importimine võib võtta mõne "
+#~ "MÄRKUS: Tuvastasin Elgamal primaarvõtme - importimine võib võtta mõne "
 #~ "aja\n"
 
-#~ msgid " (default)"
-#~ msgstr " (vaikimisi)"
-
 #~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 #~ msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#~ msgid "Policy: "
-#~ msgstr "Poliis: "
-
 #~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "võtmeserverist ei saa võtit: %s\n"
+#~ msgstr "võtmeserverist ei saa võtit: %s\n"
 
 #~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "teate saatmine serverile `%s' õnnestus (olek=%u)\n"
+#~ msgstr "teate saatmine serverile `%s' õnnestus (olek=%u)\n"
 
 #~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n"
+#~ msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n"
 
 #~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "see võtmeserver ei toeta --search-keys\n"
+#~ msgstr "see võtmeserver ei toeta --search-keys\n"
 
 #~ msgid "can't search keyserver: %s\n"
-#~ msgstr "võtmeserverist ei saa otsida: %s\n"
+#~ msgstr "võtmeserverist ei saa otsida: %s\n"
 
 #~ msgid ""
 #~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
 #~ "signatures!\n"
 #~ msgstr ""
-#~ "võti %08lX: see on PGP genereeritud ElGamal võti ja EI OLE "
+#~ "võti %08lX: see on PGP genereeritud ElGamal võti ja EI OLE "
 #~ "allkirjastamiseks turvaline!\n"
 
 #~ msgid ""
 #~ "key %08lX has been created %lu second in future (time warp or clock "
 #~ "problem)\n"
 #~ msgstr ""
-#~ "võti %08lX loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+#~ "võti %08lX loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
 #~ msgid ""
 #~ "key %08lX has been created %lu seconds in future (time warp or clock "
 #~ "problem)\n"
 #~ msgstr ""
-#~ "võti %08lX loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
+#~ "võti %08lX loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
 
 #~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "võti %08lX on märgitud abslouutselt usaldatavaks\n"
+#~ msgstr "võti %08lX on märgitud abslouutselt usaldatavaks\n"
 
 #~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
 #~ msgstr ""
-#~ "jätsin Elgamal allkirjastamise võtme %08lX allkirja %08lX-le vahele\n"
+#~ "jätsin Elgamal allkirjastamise võtme %08lX allkirja %08lX-le vahele\n"
 
 #~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
 #~ msgstr ""
-#~ "jätsin %08lX allkirja Elgamal allkirjastamise võtmele %08lX vahele\n"
+#~ "jätsin %08lX allkirja Elgamal allkirjastamise võtmele %08lX vahele\n"
 
 #~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 #~ msgstr ""
-#~ "kontrollin sügavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/"
+#~ "kontrollin sügavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/"
 #~ "%d\n"
 
 #~ msgid ""
@@ -8188,30 +13680,30 @@ msgstr ""
 #~ "on oluliselt kiirem ElGamal allkirjade kontrollimisest.\n"
 #~ "\n"
 #~ "ElGamal on algoritm, mida saab kasutada nii allkirjastamisel, kui ka\n"
-#~ "krüptimisel. OpenPGP eristab selle algoritmi kahte varianti: ainult\n"
-#~ "krüptivat ja krüptivat ning allkirjastavat. Algoritm on sama, aga\n"
+#~ "krüptimisel. OpenPGP eristab selle algoritmi kahte varianti: ainult\n"
+#~ "krüptivat ja krüptivat ning allkirjastavat. Algoritm on sama, aga\n"
 #~ "turvaliseks allkirjastamiseks on vaja valida sobivad parameetrid. See\n"
-#~ "programm toetab mõlemat varianti, aga teised OpenPGP realisatsioonid\n"
-#~ "ei pruugi krüptivat ning allkirjastavat võimalust tunda.\n"
+#~ "programm toetab mõlemat varianti, aga teised OpenPGP realisatsioonid\n"
+#~ "ei pruugi krüptivat ning allkirjastavat võimalust tunda.\n"
 #~ "\n"
-#~ "Esimene (primaarne) võti peab alati olema selline, mida saab kasutada\n"
-#~ "allkirjastamisel; see on ka põhjus, miks selles menüüs ei lubata valida\n"
-#~ "ainult krüptivat ElGamal võtit."
+#~ "Esimene (primaarne) võti peab alati olema selline, mida saab kasutada\n"
+#~ "allkirjastamisel; see on ka põhjus, miks selles menüüs ei lubata valida\n"
+#~ "ainult krüptivat ElGamal võtit."
 
 #~ msgid ""
 #~ "Although these keys are defined in RFC2440 they are not suggested\n"
 #~ "because they are not supported by all programs and signatures created\n"
 #~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "Kuigi need võtmed on kirjeldatud dokumendis RFC2440, ei ole nende\n"
-#~ "kasutamine soovitatav, kuna mitte kõik programmid ei toeta neid\n"
+#~ "Kuigi need võtmed on kirjeldatud dokumendis RFC2440, ei ole nende\n"
+#~ "kasutamine soovitatav, kuna mitte kõik programmid ei toeta neid\n"
 #~ "ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
 
 #~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "seni on kontrollitud %lu võtit (%lu allkirja)\n"
+#~ msgstr "seni on kontrollitud %lu võtit (%lu allkirja)\n"
 
 #~ msgid "key incomplete\n"
-#~ msgstr "mittetäielik võti\n"
+#~ msgstr "mittetäielik võti\n"
 
 #~ msgid "key %08lX incomplete\n"
-#~ msgstr "võti %08lX ei ole täielik\n"
+#~ msgstr "võti %08lX ei ole täielik\n"