Imported Upstream version 2.2.27upstream/2.2.27

1 files changed, 116 insertions, 117 deletions

diff --git a/po/et.po b/po/et.po
index f41fe7e..bb82db3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2020-12-21 17:43+0100\n"
+"POT-Creation-Date: 2021-01-11 18:47+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -160,10 +160,10 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:850 g10/card-util.c:932
+#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:932
 #: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1352 g10/keygen.c:4998
-#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1007
-#: g10/sign.c:1321 g10/tdbio.c:753
+#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1009
+#: g10/sign.c:1323 g10/tdbio.c:753
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -174,8 +174,8 @@ msgstr "`%s' ei õnnestu luua: %s\n"
 #: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1353
 #: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
-#: g10/plaintext.c:649 g10/sign.c:989 g10/sign.c:1200 g10/sign.c:1305
-#: g10/sign.c:1450 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
+#: g10/plaintext.c:649 g10/sign.c:991 g10/sign.c:1202 g10/sign.c:1307
+#: g10/sign.c:1452 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
 #: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2219
 #: sm/gpgsm.c:2249 sm/gpgsm.c:2287 sm/qualified.c:66 dirmngr/certcache.c:396
 #: dirmngr/certcache.c:476 dirmngr/certcache.c:478 dirmngr/crlcache.c:2588
@@ -551,21 +551,21 @@ msgstr ""
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:945 g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1631
+#: agent/gpg-agent.c:945 g10/gpg.c:3753 g10/gpg.c:3777 sm/gpgsm.c:1631
 #: sm/gpgsm.c:1637
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
 #: agent/gpg-agent.c:1168 agent/gpg-agent.c:2023 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2539 scd/scdaemon.c:532 sm/gpgsm.c:1063
+#: common/argparse.c:1847 g10/gpg.c:2482 scd/scdaemon.c:532 sm/gpgsm.c:1063
 #: dirmngr/dirmngr.c:956 dirmngr/dirmngr.c:1841
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1300 g10/gpg.c:3755 scd/scdaemon.c:655 sm/gpgsm.c:1571
+#: agent/gpg-agent.c:1300 g10/gpg.c:3704 scd/scdaemon.c:655 sm/gpgsm.c:1571
 #: dirmngr/dirmngr.c:1067 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:624
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is a deprecated option\n"
@@ -988,22 +988,22 @@ msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
 
-#: common/sysutils.c:282
+#: common/sysutils.c:408
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: common/sysutils.c:314
+#: common/sysutils.c:440
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: common/sysutils.c:753
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/sysutils.c:779
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
@@ -1399,7 +1399,7 @@ msgstr "vigased impordi võtmed\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3547
+#: common/argparse.c:558 g10/gpg.c:3490
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
@@ -1461,36 +1461,36 @@ msgstr "faili ei õnnestu avada: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: common/dotlock.c:722
+#: common/dotlock.c:724
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: common/dotlock.c:784
+#: common/dotlock.c:786
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/dotlock.c:1127
+#: common/dotlock.c:1129
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1163
+#: common/dotlock.c:1165
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/dotlock.c:1164
+#: common/dotlock.c:1166
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1205
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: common/dotlock.c:1230
+#: common/dotlock.c:1232
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
@@ -1734,7 +1734,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4451
+#: g10/call-dirmngr.c:437 g10/gpg.c:4400
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -2170,14 +2170,14 @@ msgstr "Vigane käsklus (proovige \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5134 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5083 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:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:1964 g10/gpg.c:5079 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/getkey.c:1964 g10/gpg.c:5028 g10/keyedit.c:1444 g10/keyedit.c:2334
 #: g10/keyedit.c:2580 g10/keyedit.c:4543 g10/keylist.c:689 g10/keyserver.c:1259
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
@@ -2185,7 +2185,7 @@ msgid "key \"%s\" not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1972 g10/getkey.c:4346
-#: g10/gpg.c:5088 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
+#: g10/gpg.c:5037 g10/keyedit.c:2307 g10/keyserver.c:1277 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2274,7 +2274,7 @@ msgstr "avaliku võtme \"%s\" jaoks on salajane võti!\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:202 g10/sign.c:1469
+#: g10/encrypt.c:202 g10/sign.c:1471
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -2301,13 +2301,13 @@ msgstr "`%s' on juba pakitud\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on tühi fail\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3952
-#: g10/gpg.c:3992 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3901
+#: g10/gpg.c:3941 sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1655
 #, 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"
 
-#: g10/encrypt.c:396 g10/gpg.c:3958 g10/gpg.c:4004 g10/sig-check.c:146
+#: g10/encrypt.c:396 g10/gpg.c:3907 g10/gpg.c:3953 g10/sig-check.c:146
 #: g10/sign.c:391 sm/gpgsm.c:1665 sm/gpgsm.c:1675 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2331,7 +2331,7 @@ msgstr ""
 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:751 g10/sign.c:1161
+#: g10/encrypt.c:751 g10/sign.c:1163
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2477,7 +2477,7 @@ msgid " - skipped"
 msgstr "%s: jätsin vahele: %s\n"
 
 #: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:1011 g10/sign.c:1325
+#: g10/sign.c:1013 g10/sign.c:1327
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
@@ -3030,391 +3030,385 @@ msgstr "tundmatu vaikimisi saaja `%s'\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2272
-#, fuzzy, c-format
-#| 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"
-
-#: g10/gpg.c:2897 g10/gpg.c:3722 g10/gpg.c:3734
+#: g10/gpg.c:2840 g10/gpg.c:3671 g10/gpg.c:3683
 #, 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:3074 g10/gpg.c:3086
+#: g10/gpg.c:3017 g10/gpg.c:3029
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3108
+#: g10/gpg.c:3051
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3140 sm/gpgsm.c:1177
+#: g10/gpg.c:3083 sm/gpgsm.c:1177
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3146 sm/gpgsm.c:1183
+#: g10/gpg.c:3089 sm/gpgsm.c:1183
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3143
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3222 g10/gpg.c:3432 g10/keyedit.c:5281
+#: g10/gpg.c:3165 g10/gpg.c:3375 g10/keyedit.c:5281
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3183
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3250
+#: g10/gpg.c:3193
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3196
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3259 g10/gpg.c:3274
+#: g10/gpg.c:3202 g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3265
+#: g10/gpg.c:3208
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3211
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3223
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3226
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3234
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3236
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3295
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3240
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3244
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3246
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3305
+#: g10/gpg.c:3248
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3307
+#: g10/gpg.c:3250
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3309
+#: g10/gpg.c:3252
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3254
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3256
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3273
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3535
+#: g10/gpg.c:3478
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3538
+#: g10/gpg.c:3481
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3704 sm/gpgsm.c:1541
+#: g10/gpg.c:3653 sm/gpgsm.c:1541
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3715
+#: g10/gpg.c:3664
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3673
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3676
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3742 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
+#: g10/gpg.c:3691 sm/gpgsm.c:1558 dirmngr/dirmngr.c:1082
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3712
 #, 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:3798 g10/gpg.c:3822 sm/gpgsm.c:1625
+#: g10/gpg.c:3747 g10/gpg.c:3771 sm/gpgsm.c:1625
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3759
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3765
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3831
+#: g10/gpg.c:3780
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3782
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3835
+#: g10/gpg.c:3784
 #, 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:3837
+#: g10/gpg.c:3786
 #, 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"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3788
 #, 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"
 
-#: g10/gpg.c:3842
+#: g10/gpg.c:3791
 #, 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:3846
+#: g10/gpg.c:3795
 #, 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"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3802
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3857
+#: g10/gpg.c:3806
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku šifri eelistused\n"
 
-#: g10/gpg.c:3861
+#: g10/gpg.c:3810
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3814
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3901
+#: g10/gpg.c:3850
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 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:4108
+#: g10/gpg.c:4057
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4069
 #, 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"
 
-#: g10/gpg.c:4192
+#: g10/gpg.c:4141
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4221
+#: g10/gpg.c:4170
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4224
+#: g10/gpg.c:4173
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4282
+#: g10/gpg.c:4231
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4285
+#: g10/gpg.c:4234
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4673 g10/keyserver.c:1881
+#: g10/gpg.c:4622 g10/keyserver.c:1881
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4678
+#: g10/gpg.c:4627
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4684
+#: g10/gpg.c:4633
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4646
 #, 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:4709
+#: g10/gpg.c:4658
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4722
+#: g10/gpg.c:4671
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4789
+#: g10/gpg.c:4738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4800
+#: g10/gpg.c:4749
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4841
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5044 g10/tofu.c:2153
+#: g10/gpg.c:4993 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5057
+#: g10/gpg.c:5006
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5113
+#: g10/gpg.c:5062
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5124
+#: g10/gpg.c:5073
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5469
+#: g10/gpg.c:5418
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5471
+#: g10/gpg.c:5420
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5504
+#: g10/gpg.c:5453
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -7251,19 +7245,19 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:1044
+#: g10/sign.c:1046
 #, 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"
 
-#: g10/sign.c:1186
+#: g10/sign.c:1188
 #, c-format
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1463
+#: g10/sign.c:1465
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s krüpteerimist\n"
@@ -11412,6 +11406,11 @@ msgid ""
 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"
+
+#, fuzzy
 #~ msgid ""
 #~ "@\n"
 #~ "Commands:\n"