aboutsummaryrefslogtreecommitdiffstats
path: root/po/et.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/et.po')
-rw-r--r--po/et.po1484
1 files changed, 830 insertions, 654 deletions
diff --git a/po/et.po b/po/et.po
index ee1577aed..4b9e9f140 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
"PO-Revision-Date: 2002-04-22 12:07+0200\n"
"Last-Translator: Toomas Soome <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "ei"
msgid "nN"
msgstr "eE"
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
msgid "quit"
msgstr "v�lju"
@@ -272,7 +272,7 @@ msgstr "... see on viga (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "te leidsite vea ... (%s:%d)\n"
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
@@ -337,7 +337,7 @@ msgstr ""
"�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
"\n"
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
#, c-format
msgid ""
"\n"
@@ -348,7 +348,7 @@ msgstr ""
"Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
"et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
-#: g10/g10.c:287
+#: g10/g10.c:300
msgid ""
"@Commands:\n"
" "
@@ -356,163 +356,163 @@ msgstr ""
"@K�sud:\n"
" "
-#: g10/g10.c:289
+#: g10/g10.c:302
msgid "|[file]|make a signature"
msgstr "|[fail]|loo allkiri"
-#: g10/g10.c:290
+#: g10/g10.c:303
msgid "|[file]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/g10.c:291
+#: g10/g10.c:304
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/g10.c:292
+#: g10/g10.c:305
msgid "encrypt data"
msgstr "kr�pteeri andmed"
-#: g10/g10.c:293
+#: g10/g10.c:306
msgid "|[files]|encrypt files"
msgstr "|[failid]|kr�pteeri failid"
-#: g10/g10.c:294
+#: g10/g10.c:307
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
-#: g10/g10.c:295
+#: g10/g10.c:308
msgid "store only"
msgstr "ainult salvesta"
-#: g10/g10.c:296
+#: g10/g10.c:309
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
-#: g10/g10.c:297
+#: g10/g10.c:310
msgid "|[files]|decrypt files"
msgstr "|[failid]|dekr�pteeri failid"
-#: g10/g10.c:298
+#: g10/g10.c:311
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/g10.c:300
+#: g10/g10.c:313
msgid "list keys"
msgstr "n�ita v�tmeid"
-#: g10/g10.c:302
+#: g10/g10.c:315
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
-#: g10/g10.c:303
+#: g10/g10.c:316
msgid "check key signatures"
msgstr "kontrolli v�tmete allkirju"
-#: g10/g10.c:304
+#: g10/g10.c:317
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
-#: g10/g10.c:305
+#: g10/g10.c:318
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
-#: g10/g10.c:306
+#: g10/g10.c:319
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
-#: g10/g10.c:307
+#: g10/g10.c:320
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
-#: g10/g10.c:309
+#: g10/g10.c:322
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
-#: g10/g10.c:310
+#: g10/g10.c:323
msgid "sign a key"
msgstr "allkirjasta v�ti"
-#: g10/g10.c:311
+#: g10/g10.c:324
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/g10.c:312
+#: g10/g10.c:325
msgid "sign a key non-revocably"
msgstr "allkirjasta v�ti mitte-t�histatavana"
-#: g10/g10.c:313
+#: g10/g10.c:326
msgid "sign a key locally and non-revocably"
msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
-#: g10/g10.c:314
+#: g10/g10.c:327
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
-#: g10/g10.c:315
+#: g10/g10.c:328
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
-#: g10/g10.c:316
+#: g10/g10.c:330
msgid "export keys"
msgstr "ekspordi v�tmed"
-#: g10/g10.c:317
+#: g10/g10.c:331
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
-#: g10/g10.c:318
+#: g10/g10.c:332
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/g10.c:320
+#: g10/g10.c:334
msgid "search for keys on a key server"
msgstr "otsi v�tmeid v�tmeserverist"
-#: g10/g10.c:322
+#: g10/g10.c:336
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
-#: g10/g10.c:326
+#: g10/g10.c:340
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
-#: g10/g10.c:328
+#: g10/g10.c:342
msgid "list only the sequence of packets"
msgstr "n�ita ainult pakettide j�rjendeid"
-#: g10/g10.c:330
+#: g10/g10.c:344
msgid "export the ownertrust values"
msgstr "ekspordi usalduse v��rtused"
-#: g10/g10.c:332
+#: g10/g10.c:346
msgid "import ownertrust values"
msgstr "impordi usalduse v��rtused"
-#: g10/g10.c:334
+#: g10/g10.c:348
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
-#: g10/g10.c:336
+#: g10/g10.c:350
msgid "unattended trust database update"
msgstr "hooldusvaba usalduse andmebaasi uuendamine"
-#: g10/g10.c:337
+#: g10/g10.c:351
msgid "fix a corrupted trust database"
msgstr "paranda vigane usalduse andmebaas"
-#: g10/g10.c:338
+#: g10/g10.c:352
msgid "De-Armor a file or stdin"
msgstr "Pakenda fail v�i standardsisend lahti"
-#: g10/g10.c:340
+#: g10/g10.c:354
msgid "En-Armor a file or stdin"
msgstr "Pakenda fail v�i standardsisend"
-#: g10/g10.c:342
+#: g10/g10.c:356
msgid "|algo [files]|print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
-#: g10/g10.c:346
+#: g10/g10.c:360
msgid ""
"@\n"
"Options:\n"
@@ -522,196 +522,192 @@ msgstr ""
"V�tmed:\n"
" "
-#: g10/g10.c:348
+#: g10/g10.c:362
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
-#: g10/g10.c:350
+#: g10/g10.c:364
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|kr�pti NIMEle"
-#: g10/g10.c:353
+#: g10/g10.c:367
msgid "|NAME|use NAME as default recipient"
msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-#: g10/g10.c:355
+#: g10/g10.c:369
msgid "use the default key as default recipient"
msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
-#: g10/g10.c:361
+#: g10/g10.c:375
msgid "use this user-id to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/g10.c:362
+#: g10/g10.c:376
msgid "|N|set compress level N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
-#: g10/g10.c:364
+#: g10/g10.c:378
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/g10.c:371
+#: g10/g10.c:385
msgid "use as output file"
msgstr "kasuta v�ljundfailina"
-#: g10/g10.c:372
+#: g10/g10.c:386
msgid "verbose"
msgstr "ole jutukas"
-#: g10/g10.c:373
+#: g10/g10.c:387
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
-#: g10/g10.c:374
+#: g10/g10.c:388
msgid "don't use the terminal at all"
msgstr "�ra kasuta terminali"
-#: g10/g10.c:375
+#: g10/g10.c:389
msgid "force v3 signatures"
msgstr "kasuta v3 allkirju"
-#: g10/g10.c:376
+#: g10/g10.c:390
msgid "do not force v3 signatures"
msgstr "�ra kasuta v3 allkirju"
-#: g10/g10.c:377
+#: g10/g10.c:391
msgid "force v4 key signatures"
msgstr "kasuta v4 v�tme allkirju"
-#: g10/g10.c:378
+#: g10/g10.c:392
msgid "do not force v4 key signatures"
msgstr "�ra kasuta v3 v�tme allkirju"
-#: g10/g10.c:379
+#: g10/g10.c:393
msgid "always use a MDC for encryption"
msgstr "kr�ptimisel kasuta alati MDC"
-#: g10/g10.c:381
+#: g10/g10.c:395
msgid "never use a MDC for encryption"
msgstr "kr�ptimisel �ra kasuta kunagi MDC"
-#: g10/g10.c:383
+#: g10/g10.c:397
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
msgid "use the gpg-agent"
msgstr "kasuta gpg-agenti"
-#: g10/g10.c:388
+#: g10/g10.c:402
msgid "batch mode: never ask"
msgstr "pakettmood: �ra k�si kunagi"
-#: g10/g10.c:389
+#: g10/g10.c:403
msgid "assume yes on most questions"
msgstr "eelda enamus k�simustele jah vastust"
-#: g10/g10.c:390
+#: g10/g10.c:404
msgid "assume no on most questions"
msgstr "eelda enamus k�simustele ei vastust"
-#: g10/g10.c:391
+#: g10/g10.c:405
msgid "add this keyring to the list of keyrings"
msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
-#: g10/g10.c:392
+#: g10/g10.c:406
msgid "add this secret keyring to the list"
msgstr "lisa see salajaste v�tmete hoidla nimekirja"
-#: g10/g10.c:393
+#: g10/g10.c:407
msgid "show which keyring a listed key is on"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
-#: g10/g10.c:394
+#: g10/g10.c:408
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
-#: g10/g10.c:395
+#: g10/g10.c:409
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda v�tmeserverit"
-#: g10/g10.c:397
+#: g10/g10.c:411
msgid "|NAME|set terminal charset to NAME"
msgstr "|NIMI|terminali kooditabel on NIMI"
-#: g10/g10.c:398
+#: g10/g10.c:412
msgid "read options from file"
msgstr "loe v�tmed failist"
-#: g10/g10.c:402
+#: g10/g10.c:416
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-#: g10/g10.c:404
+#: g10/g10.c:418
msgid "|[file]|write status info to file"
msgstr "|[fail]|kirjuta olekuinfo faili"
-#: g10/g10.c:410
+#: g10/g10.c:430
msgid "|KEYID|ultimately trust this key"
msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
-#: g10/g10.c:411
+#: g10/g10.c:431
msgid "|FILE|load extension module FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
-#: g10/g10.c:412
+#: g10/g10.c:432
msgid "emulate the mode described in RFC1991"
msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
-#: g10/g10.c:413
+#: g10/g10.c:433
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
-#: g10/g10.c:414
+#: g10/g10.c:434
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"
-#: g10/g10.c:418
+#: g10/g10.c:440
msgid "|N|use passphrase mode N"
msgstr "|N|kasuta parooli moodi N"
-#: g10/g10.c:420
+#: g10/g10.c:442
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
-#: g10/g10.c:422
+#: g10/g10.c:444
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
-#: g10/g10.c:424
+#: g10/g10.c:446
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
-#: g10/g10.c:425
+#: g10/g10.c:447
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
-#: g10/g10.c:426
+#: g10/g10.c:449
msgid "|N|use compress algorithm N"
msgstr "|N|kasuta pakkimisalgoritmi N"
-#: g10/g10.c:427
+#: g10/g10.c:450
msgid "throw keyid field of encrypted packets"
msgstr "�ra lisa kr�ptimisel v�tme id"
-#: g10/g10.c:428
+#: g10/g10.c:451
msgid "Show Photo IDs"
msgstr "Esita foto IDd"
-#: g10/g10.c:429
+#: g10/g10.c:452
msgid "Don't show Photo IDs"
msgstr "Ei esita foto IDd"
-#: g10/g10.c:430
+#: g10/g10.c:453
msgid "Set command line to view Photo IDs"
msgstr "Sea k�surida foto ID vaatamiseks"
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -719,7 +715,7 @@ msgstr ""
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
-#: g10/g10.c:437
+#: g10/g10.c:462
msgid ""
"@\n"
"Examples:\n"
@@ -739,15 +735,15 @@ msgstr ""
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
-#: g10/g10.c:579
+#: g10/g10.c:613
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
-#: g10/g10.c:583
+#: g10/g10.c:617
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/g10.c:586
+#: g10/g10.c:620
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -757,7 +753,7 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: g10/g10.c:597
+#: g10/g10.c:631
msgid ""
"\n"
"Supported algorithms:\n"
@@ -765,265 +761,276 @@ msgstr ""
"\n"
"Toetatud algoritmid:\n"
-#: g10/g10.c:671
+#: g10/g10.c:735
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: g10/g10.c:728
+#: g10/g10.c:792
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-#: g10/g10.c:907
+#: g10/g10.c:1001
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
-#: g10/g10.c:914
+#: g10/g10.c:1008
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/g10.c:1197
+#: g10/g10.c:1309
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/g10.c:1214
+#: g10/g10.c:1326
msgid "could not parse keyserver URI\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/g10.c:1228
+#: g10/g10.c:1340
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
-#: g10/g10.c:1351
+#: g10/g10.c:1480
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: g10/g10.c:1363
+#: g10/g10.c:1492
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
-#: g10/g10.c:1389
+#: g10/g10.c:1519
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"
-#: g10/g10.c:1395
+#: g10/g10.c:1525
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"
-#: g10/g10.c:1401
+#: g10/g10.c:1531
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"
-#: g10/g10.c:1414
+#: g10/g10.c:1544
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
msgid "this message may not be usable by PGP 2.x\n"
msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "antud allkirja poliisi URL on vigane\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "antud sertifikaadi poliisi URL on vigane\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:1499
+#: g10/g10.c:1628
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
-#: g10/g10.c:1501
+#: g10/g10.c:1630
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
-#: g10/g10.c:1503
+#: g10/g10.c:1632
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
-#: g10/g10.c:1505
+#: g10/g10.c:1634
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
-#: g10/g10.c:1508
+#: g10/g10.c:1637
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
-#: g10/g10.c:1512
+#: g10/g10.c:1641
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
-#: g10/g10.c:1516
+#: g10/g10.c:1645
msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
msgstr "vigane vaikimisi kontrolli mood; peab olema 0, 1, 2 v�i 3\n"
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
msgstr "vigased eelistused\n"
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1761
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
msgid "--store [filename]"
msgstr "--store [failinimi]"
-#: g10/g10.c:1640
+#: g10/g10.c:1788
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/g10.c:1648
+#: g10/g10.c:1796
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
-#: g10/g10.c:1665
+#: g10/g10.c:1813
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
-#: g10/g10.c:1678
+#: g10/g10.c:1826
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:1692
+#: g10/g10.c:1840
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
-#: g10/g10.c:1701
+#: g10/g10.c:1849
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
-#: g10/g10.c:1719
+#: g10/g10.c:1867
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
-#: g10/g10.c:1730
+#: g10/g10.c:1878
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
-#: g10/g10.c:1738
+#: g10/g10.c:1886
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
-#: g10/g10.c:1746
+#: g10/g10.c:1894
msgid "--nrsign-key user-id"
msgstr "--nrsign-key kasutaja-id"
-#: g10/g10.c:1754
+#: g10/g10.c:1902
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key kasutaja-id"
-#: g10/g10.c:1762
+#: g10/g10.c:1910
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s ei �nnestu avada: %s\n"
-#: g10/g10.c:1833
+#: g10/g10.c:1981
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
-#: g10/g10.c:1916
+#: g10/g10.c:2072
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
-#: g10/g10.c:1924
+#: g10/g10.c:2080
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
-#: g10/g10.c:2011
+#: g10/g10.c:2167
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane teatel�hendi algoritm `%s'\n"
-#: g10/g10.c:2097
+#: g10/g10.c:2253
msgid "[filename]"
msgstr "[failinimi]"
-#: g10/g10.c:2101
+#: g10/g10.c:2257
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
#: g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' ei �nnestu avada\n"
-#: g10/g10.c:2313
+#: g10/g10.c:2474
+#, fuzzy
msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
-
-#: g10/g10.c:2319
-msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
msgstr ""
"noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
"ning l�pus peab olema '='\n"
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
msgid "a notation value must not use any control characters\n"
msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "antud sertifikaadi poliisi URL on vigane\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "antud allkirja poliisi URL on vigane\n"
+
#: g10/armor.c:314
#, c-format
msgid "armor: %s\n"
@@ -1119,11 +1126,13 @@ msgid "User ID is no longer valid"
msgstr "Kasutaja ID ei ole enam kehtiv"
#: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
msgstr "T�histamise p�hjus: "
#: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
msgstr "T�histamise kommentaar: "
#. a string with valid answers
@@ -1316,21 +1325,21 @@ msgstr ""
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:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: j�tsin vahele: %s\n"
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
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"
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1338,120 +1347,130 @@ msgstr ""
"\n"
"Sisestage kasutaja ID. L�petage t�hja reaga: "
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
msgid "skipped: public key already set as default recipient\n"
msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
msgid "Public key is disabled.\n"
msgstr "Avalik v�ti on blokeeritud.\n"
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
msgid "skipped: public key already set\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
-#: g10/keygen.c:180
+#: g10/keygen.c:182
#, c-format
msgid "preference %c%lu is not valid\n"
msgstr "eelistus %c%lu ei ole lubatud\n"
-#: g10/keygen.c:187
+#: g10/keygen.c:189
#, c-format
msgid "preference %c%lu duplicated\n"
msgstr "eelistus %c%lu on duplikaat\n"
-#: g10/keygen.c:192
+#: g10/keygen.c:194
#, c-format
msgid "too many `%c' preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:257
+#: g10/keygen.c:264
msgid "invalid character in preference string\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "kirjutan iseenda allkirja\n"
+
+#: g10/keygen.c:563
msgid "writing self signature\n"
msgstr "kirjutan iseenda allkirja\n"
-#: g10/keygen.c:443
+#: g10/keygen.c:607
msgid "writing key binding signature\n"
msgstr "kirjutan v�tit siduva allkirja\n"
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane v�tme suurus; kasutan %u bitti\n"
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "v�tme suurus �mardatud �les %u bitini\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:941
msgid "Please select what kind of key you want:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
-#: g10/keygen.c:779
+#: g10/keygen.c:943
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
-#: g10/keygen.c:780
+#: g10/keygen.c:944
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:782
+#: g10/keygen.c:946
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
-#: g10/keygen.c:783
+#: g10/keygen.c:948
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
-#: g10/keygen.c:784
+#: g10/keygen.c:949
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:786
+#: g10/keygen.c:951
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
msgid "Your selection? "
msgstr "Teie valik? "
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
msgid "The use of this algorithm is deprecated - create anyway? "
msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1464,19 +1483,19 @@ msgstr ""
" vaikimisi v�tmepikkus on 1024 bitti\n"
" suurim soovitatav v�tmepikkus on 2048 bitti\n"
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
msgid "What keysize do you want? (1024) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
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"
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
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"
@@ -1488,12 +1507,12 @@ msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1501,11 +1520,11 @@ msgstr ""
"Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
"arvutused v�tavad V�GA palju aega!\n"
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
msgid "Are you sure that you want this keysize? "
msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1513,17 +1532,17 @@ msgstr ""
"Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
"v�imalikud r�ndeobjektid!\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Soovitud v�tmepikkus on %u bitti\n"
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1539,7 +1558,7 @@ msgstr ""
" <n>m = v�ti aegub n kuuga\n"
" <n>y = v�ti aegub n aastaga\n"
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1555,30 +1574,30 @@ msgstr ""
" <n>m = allkiri aegub n kuuga\n"
" <n>y = allkiri aegub n aastaga\n"
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
msgid "Key is valid for? (0) "
msgstr "V�ti on kehtiv kuni? (0) "
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
msgid "Signature is valid for? (0) "
msgstr "Allkiri on kehtiv kuni? (0) "
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
msgid "invalid value\n"
msgstr "vigane v��rtus\n"
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
#. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
#, c-format
msgid "%s expires at %s\n"
msgstr "%s aegub %s\n"
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1586,11 +1605,11 @@ msgstr ""
"Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
"Siiski k�sitletakse neid korrektselt aastani 2106.\n"
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
msgid "Is this correct (y/n)? "
msgstr "On see �ige (j/e)? "
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1605,44 +1624,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
msgid "Real name: "
msgstr "P�risnimi: "
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
msgid "Invalid character in name\n"
msgstr "Lubamatu s�mbol nimes\n"
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
msgid "Name may not start with a digit\n"
msgstr "Nimi ei v�i alata numbriga\n"
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
msgid "Invalid character in comment\n"
msgstr "Lubamatu s�mbol kommentaaris\n"
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1653,27 +1672,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
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"
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
msgid "Please correct the error first\n"
msgstr "Palun parandage k�igepealt viga\n"
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1681,16 +1700,16 @@ msgstr ""
"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
"\n"
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
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"
@@ -1702,7 +1721,7 @@ msgstr ""
"kasutades seda programmi v�tmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
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"
@@ -1714,53 +1733,53 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
msgid "Key generation canceled.\n"
msgstr "V�tme genereerimine katkestati.\n"
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku v�tme faili `%s'\n"
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
msgid "key marked as ultimately trusted.\n"
msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1769,102 +1788,112 @@ msgstr ""
"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
"kasutades v�tit \"--edit-key\".\n"
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
#, c-format
msgid "Key generation failed: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
msgid "Really create? "
msgstr "Loon t�esti? "
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
#, c-format
msgid "`%s' already compressed\n"
msgstr "`%s' on juba pakitud\n"
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
#: g10/tdbio.c:552
#, c-format
msgid "%s: can't open: %s\n"
msgstr "%s: ei �nnestu avada: %s\n"
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: HOIATUS: t�hi fail\n"
-#: g10/encode.c:285
+#: g10/encode.c:340
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"
-#: g10/encode.c:313
+#: g10/encode.c:368
#, c-format
msgid "reading from `%s'\n"
msgstr "loen failist `%s'\n"
-#: g10/encode.c:347
+#: g10/encode.c:402
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"
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
+
+#: g10/encode.c:646
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s kr�ptitud kasutajale: %s\n"
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
-#: g10/export.c:169
+#: g10/export.c:172
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
-#: g10/export.c:180
+#: g10/export.c:188
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
-#: g10/export.c:188
+#: g10/export.c:196
#, c-format
msgid "key %08lX: PGP 2.x style key - skipped\n"
msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
-#: g10/export.c:255
+#: g10/export.c:279
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
@@ -1874,23 +1903,23 @@ msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
msgid "[User id not found]"
msgstr "[Kasutaja id puudub]"
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
#, c-format
msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
"kasutamisega\n"
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -1970,179 +1999,184 @@ msgstr " salajasi v�tmeid imporditud: %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi v�tmeid: %lu\n"
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+
+#: g10/import.c:527 g10/import.c:756
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
-#: g10/import.c:455
+#: g10/import.c:544
#, c-format
msgid "key %08lX: accepted non self-signed user ID '%s'\n"
msgstr ""
"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
-#: g10/import.c:462
+#: g10/import.c:551
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
-#: g10/import.c:464
+#: g10/import.c:553
msgid "this may be caused by a missing self-signature\n"
msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
-#: g10/import.c:479
+#: g10/import.c:568
#, c-format
msgid "key %08lX: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
-#: g10/import.c:489
+#: g10/import.c:578
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
#, c-format
msgid "writing to `%s'\n"
msgstr "kirjutan faili `%s'\n"
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
msgstr "v�ti %08lX: avalik v�ti on imporditud\n"
-#: g10/import.c:524
+#: g10/import.c:617
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
msgstr "v�ti %08lX: 1 uus kasutaja ID\n"
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
msgstr "v�ti %08lX: %d uut kasutaja IDd\n"
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: 1 uus allkiri\n"
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: %d uut allkirja\n"
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: 1 uus alamv�ti\n"
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: %d uut alamv�tit\n"
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
msgstr "v�ti %08lX: ei muudetud\n"
-#: g10/import.c:671
+#: g10/import.c:770
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
-#: g10/import.c:682
+#: g10/import.c:781
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
#. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
-#: g10/import.c:691
+#: g10/import.c:790
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
-#: g10/import.c:720
+#: g10/import.c:819
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
-#: g10/import.c:760
+#: g10/import.c:859
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: t�histamise sertifikaat imporditud\n"
-#: g10/import.c:826
+#: g10/import.c:928
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
-#: g10/import.c:839
+#: g10/import.c:941
#, c-format
msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
-#: g10/import.c:841
+#: g10/import.c:943
#, c-format
msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
-#: g10/import.c:858
+#: g10/import.c:960
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
-#: g10/import.c:868
+#: g10/import.c:970
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
-#: g10/import.c:869
+#: g10/import.c:971
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
-#: g10/import.c:899
+#: g10/import.c:1001
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
-#: g10/import.c:922
+#: g10/import.c:1024
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
@@ -2151,108 +2185,128 @@ msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
-#: g10/import.c:954
+#: g10/import.c:1056
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
-#: g10/import.c:971
+#: g10/import.c:1073
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
-#: g10/import.c:1072
+#: g10/import.c:1174
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
-#: g10/import.c:1131
+#: g10/import.c:1233
#, c-format
msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
msgstr ""
"Hoiatus: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
-#: g10/import.c:1145
+#: g10/import.c:1247
#, c-format
msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
msgstr ""
"Hoiatus: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
-#: g10/import.c:1231
+#: g10/import.c:1335
#, c-format
msgid "key %08lX: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
msgid "[revocation]"
msgstr "[t�histamine]"
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
msgid "1 bad signature\n"
msgstr "1 halb allkiri\n"
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
#, c-format
msgid "%d bad signatures\n"
msgstr "%d halba allkirja\n"
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
msgid "1 signature not checked due to a missing key\n"
msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
msgid "1 signature not checked due to an error\n"
msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
msgid "1 user ID without valid self-signature detected\n"
msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on t�histatud."
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
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:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Teie praegune allkiri \"%s\"\n"
+"on lokaalne allkiri.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
+
#. It's a local sig, and we want to make a
#. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2261,50 +2315,50 @@ msgstr ""
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
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) "
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
#, c-format
msgid "\"%s\" was already locally signed by key %08lX\n"
msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
#, c-format
msgid "\"%s\" was already signed by key %08lX\n"
msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
msgid "This key has expired!"
msgstr "See v�ti on aegunud!"
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See v�ti aegub %s.\n"
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
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"
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
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:500
+#: g10/keyedit.c:556
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2314,27 +2368,27 @@ msgstr ""
"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole �ldse kontrollinud.%s\n"
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2342,7 +2396,32 @@ msgstr ""
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Allkiri m�rgitakse mitte-eksporditavaks.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
+
+#: g10/keyedit.c:616
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2350,7 +2429,7 @@ msgstr ""
"\n"
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2358,7 +2437,7 @@ msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2366,7 +2445,7 @@ msgstr ""
"\n"
"Ma ei ole seda v�tit �ldse kontrollinud.\n"
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2374,7 +2453,7 @@ msgstr ""
"\n"
"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2382,33 +2461,33 @@ msgstr ""
"\n"
"Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
msgid "Really sign? "
msgstr "Allkirjastan t�esti? "
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
msgid "This key is not protected.\n"
msgstr "See v�ti ei ole kaitstud.\n"
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
msgid "Key is protected.\n"
msgstr "V�ti on kaitstud.\n"
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2416,7 +2495,7 @@ msgstr ""
"Sisestage sellele salajasele v�tmele uus parool.\n"
"\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2424,470 +2503,468 @@ msgstr ""
"Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
"\n"
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
msgid "Do you really want to do this? "
msgstr "Kas te t�esti soovite seda teha? "
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
msgid "moving a key signature to the correct place\n"
msgstr "t�stan v�tme allkirja �igesse kohta\n"
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
msgid "quit this menu"
msgstr "v�lju sellest men��st"
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
msgid "q"
msgstr "v"
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
msgid "save"
msgstr "save"
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
msgid "save and quit"
msgstr "salvesta ja v�lju"
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
msgid "help"
msgstr "help"
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
msgid "show this help"
msgstr "n�ita seda abiinfot"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
msgid "show fingerprint"
msgstr "n�ita s�rmej�lge"
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
msgid "list"
msgstr "list"
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
msgid "l"
msgstr "l"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
msgid "select user ID N"
msgstr "vali kasutaja ID N"
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
msgid "key"
msgstr "key"
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
msgid "select secondary key N"
msgstr "vali sekundaarne v�ti N"
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
msgid "check"
msgstr "check"
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
msgid "list signatures"
msgstr "n�ita allkirju"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
msgid "c"
msgstr "c"
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
msgid "sign the key"
msgstr "allkirjasta v�ti"
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
msgid "s"
msgstr "s"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
msgid "sign the key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
msgid "sign the key non-revocably"
msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
msgid "sign the key locally and non-revocably"
msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
msgid "add a user ID"
msgstr "lisa kasutaja ID"
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
msgid "addphoto"
msgstr "lisa foto"
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
msgid "add a photo ID"
msgstr "lisa foto ID"
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
msgid "delete user ID"
msgstr "kustuta kasutaja ID"
#. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
msgid "add a secondary key"
msgstr "lisa sekundaarne v�ti"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
msgid "delete a secondary key"
msgstr "kustuta sekundaarne v�ti"
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "lisa sekundaarne v�ti"
+
+#: g10/keyedit.c:923
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
msgid "delete signatures"
msgstr "kustuta allkirjad"
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
msgid "change the expire date"
msgstr "muuda aegumise kuup�eva"
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
msgid "primary"
msgstr "primaarne"
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
msgid "flag user ID as primary"
msgstr "m�rgi kasutaja ID primaarseks"
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
msgid "toggle"
msgstr "l�lita"
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
msgid "toggle between secret and public key listing"
msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
msgid "t"
msgstr "t"
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
msgid "list preferences (expert)"
msgstr "n�ita eelistusi (ekspert)"
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
msgid "list preferences (verbose)"
msgstr "n�ita eelistusi (detailsena)"
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
msgid "set preference list"
msgstr "sea eelistuste nimekiri"
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
msgid "updated preferences"
msgstr "uuendatud eelistused"
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
msgid "change the passphrase"
msgstr "muuda parooli"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
msgid "revoke signatures"
msgstr "t�hista allkirjad"
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
msgid "revoke a secondary key"
msgstr "t�hista sekundaarne v�ti"
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
msgid "disable a key"
msgstr "blokeeri v�ti"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
msgid "enable a key"
msgstr "luba v�ti"
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
msgid "show photo ID"
msgstr "n�ita foto ID"
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
msgid "can't do that in batchmode\n"
msgstr "seda ei saa teha pakettmoodis\n"
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
msgid "Command> "
msgstr "K�sklus> "
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
msgid "Please use the command \"toggle\" first.\n"
msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
msgid "Key is revoked."
msgstr "V�ti on t�histatud."
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
msgid "Really sign all user IDs? "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
#, 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:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
msgid "Really remove all selected user IDs? "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
msgid "Really remove this user ID? "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
msgid "Do you really want to delete the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
msgid "Do you really want to delete this key? "
msgstr "Kas te t�esti soovite seda v�tit kustutada? "
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
msgid "Do you really want to revoke the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
msgid "Do you really want to revoke this key? "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
msgid "Really update the preferences for the selected user IDs? "
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
msgid "Really update the preferences? "
msgstr "Kas t�esti uuendan seaded? "
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
msgid "Save changes? "
msgstr "Salvestan muutused? "
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
msgid "Quit without saving? "
msgstr "V�ljun salvestamata? "
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
#, c-format
msgid "update secret failed: %s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
msgstr "Selle v�tme v�ib olla t�histanud %s v�ti %s%s\n"
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
msgid " (sensitive)"
msgstr " (tundlik)"
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX loodud: %s aegub: %s"
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
#, c-format
msgid " trust: %c/%c"
msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! alamv�ti on t�histatud: %s\n"
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
msgid "rev- faked revocation found\n"
msgstr "rev- leitud v�ltsitud t�histamine\n"
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"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�idatud v�tme kehtivus olla tingimata korrektne.\n"
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-" Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"HOIATUS: Sellel v�tmel on juba foto ID.\n"
-" J�rgmise foto ID lisamine v�ib tekitada segadusi m�ne PGP\n"
-" versiooni kasutamisel.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-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:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -2896,83 +2973,108 @@ 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"
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+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:1934
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Kustutatud %d allkiri.\n"
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Kustutatud %d allkirja.\n"
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Sisestage v�tmepikkus"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
msgid "Please remove selections from the secret keys.\n"
msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
msgid "Please select at most one secondary key.\n"
msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
msgid "Changing expiration time for a secondary key.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
msgid "No corresponding signature in secret ring\n"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
+
+#: g10/keyedit.c:2671
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Sekundaarne v�ti numbriga %d puudub\n"
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
msgid "user ID: \""
msgstr "kasutaja ID: \""
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
#, c-format
msgid ""
"\"\n"
@@ -2981,7 +3083,7 @@ msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
#, c-format
msgid ""
"\"\n"
@@ -2990,234 +3092,242 @@ msgstr ""
"\"\n"
"lokaalselt allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
msgid "You have signed these user IDs:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
#, c-format
msgid " signed by %08lX at %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " t�histanud %08lX %s\n"
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
#, c-format
msgid " signed by %08lX at %s%s\n"
msgstr " allkirjastanud %08lX %s%s\n"
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
#, c-format
msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Allkirja poliitika: "
+
+#: g10/keylist.c:93
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
msgid "WARNING: invalid notation data found\n"
msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Allkirja noteerimine: "
+
+#: g10/keylist.c:129
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
-#: g10/keylist.c:127
+#: g10/keylist.c:136
msgid "not human readable"
msgstr "pole inimese poolt loetav"
-#: g10/keylist.c:216
+#: g10/keylist.c:225
msgid "Keyring"
msgstr "V�tmehoidla"
#. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
#, c-format
msgid " [expires: %s]"
msgstr " [aegub: %s]"
-#: g10/keylist.c:889
+#: g10/keylist.c:952
msgid "Fingerprint:"
msgstr "S�rmej�lg:"
#. use tty
#. Translators: this should fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
msgid " Fingerprint:"
msgstr " S�rmej�lg:"
-#: g10/keylist.c:899
+#: g10/keylist.c:962
msgid " Key fingerprint ="
msgstr " V�tme s�rmej�lg ="
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
#, c-format
msgid "%s encrypted data\n"
msgstr "%s kr�pteeritud andmed\n"
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
#, c-format
msgid "public key is %08lX\n"
msgstr "avalik v�ti on %08lX\n"
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
msgid "public key encrypted data: good DEK\n"
msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "eeldan %s kr�pteeritud andmeid\n"
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
msgid "decryption okay\n"
msgstr "lahtikr�pteerimine �nnestus\n"
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
#, c-format
msgid "decryption failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
#, c-format
msgid "original file name='%.*s'\n"
msgstr "algne failinimi on='%.*s'\n"
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
msgid "Notation: "
msgstr "Noteering: "
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
msgid "Policy: "
msgstr "Poliis: "
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll j�eti �ra\n"
#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
msgid "can't handle these multiple signatures\n"
msgstr "neid allkirju ei �nnestu t��delda\n"
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
msgid "BAD signature from \""
msgstr "HALB allkiri kasutajalt \""
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
msgid "Expired signature from \""
msgstr "Aegunud allkiri kasutajalt \""
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
msgid "Good signature from \""
msgstr "Korrektne allkiri kasutajalt \""
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
msgid "[uncertain]"
msgstr "[ebakindel]"
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
msgid " aka \""
msgstr " ka \""
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
@@ -3235,31 +3345,46 @@ 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"
-#: g10/misc.c:378
+#: g10/misc.c:386
#, c-format
msgid "Warning: unsafe ownership on %s \"%s\"\n"
msgstr "Hoiatus: ebaturvaline omanik %s \"%s\"\n"
-#: g10/misc.c:410
+#: g10/misc.c:418
#, c-format
msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgstr "Hoiatus: ebaturvalised �igused %s \"%s\"\n"
-#: g10/misc.c:435
+#: g10/misc.c:443
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA �ifri lisandprogrammi pole\n"
-#: g10/misc.c:436
+#: g10/misc.c:444
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
+
+#: g10/parse-packet.c:120
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -3400,34 +3525,39 @@ msgstr "allkirjastatud andmeid pole\n"
msgid "can't open signed data `%s'\n"
msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
#, c-format
msgid "anonymous recipient; trying secret key %08lX ...\n"
msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, me oleme anon��mne teate saaja.\n"
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
msgid "old encoding of the DEK is not supported\n"
msgstr "vana DEK kodeerimine ei ole toetatud\n"
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
#, c-format
msgid "NOTE: cipher algorithm %d not found in preferences\n"
msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
#, c-format
msgid "NOTE: secret key %08lX expired at %s\n"
msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "v�ti %08lX: v�ti on t�histatud!\n"
+
#. HKP does not support v3 fingerprints
#: g10/hkp.c:70
#, c-format
@@ -3454,12 +3584,16 @@ 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"
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
#, c-format
msgid "searching for \"%s\" from HKP server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/hkp.c:521
+#: g10/hkp.c:543
#, c-format
msgid "can't search keyserver: %s\n"
msgstr "v�tmeserverist ei saa otsida: %s\n"
@@ -3516,7 +3650,14 @@ msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
+"kompaktset.\n"
+
+#: g10/sign.c:151
#, c-format
msgid ""
"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
@@ -3524,40 +3665,46 @@ msgstr ""
"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
"kompaktset.\n"
-#: g10/sign.c:274
+#: g10/sign.c:303
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
-#: g10/sign.c:283
+#: g10/sign.c:312
#, c-format
msgid "%s signature from: %s\n"
msgstr "%s allkiri kasutajalt: %s\n"
-#: g10/sign.c:430
+#: g10/sign.c:461
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "HOIATUS: `%s' on t�hi fail\n"
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+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 allkirjastada ainult --pgp2 moodis\n"
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
#, c-format
msgid "can't create %s: %s\n"
msgstr "%s ei �nnestu luua: %s\n"
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
+
+#: g10/sign.c:784
msgid "signing:"
msgstr "allkirjastan:"
-#: g10/sign.c:796
+#: g10/sign.c:876
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:953
+#: g10/sign.c:1029
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s kr�pteerimist\n"
@@ -3785,26 +3932,26 @@ msgstr ""
msgid "input line %u too long or missing LF\n"
msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
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"
-#: g10/skclist.c:138
+#: g10/skclist.c:157
#, c-format
msgid "skipped `%s': duplicated\n"
msgstr "`%s' j�tsin vahele: duplikaat\n"
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
#, c-format
msgid "skipped `%s': %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
-#: g10/skclist.c:149
+#: g10/skclist.c:168
msgid "skipped: secret key already present\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
-#: g10/skclist.c:160
+#: g10/skclist.c:179
#, c-format
msgid ""
"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3996,16 +4143,23 @@ msgstr ""
"kasutamine soovitatav, kuna mitte k�ik programmid ei toeta neid\n"
"ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption. This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
msgid "Enter the size of the key"
msgstr "Sisestage v�tmepikkus"
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
msgid "Answer \"yes\" or \"no\""
msgstr "Vastake \"jah\" v�i \"ei\""
-#: g10/helptext.c:113
+#: g10/helptext.c:119
msgid ""
"Enter the required value as shown in the prompt.\n"
"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4017,19 +4171,19 @@ msgstr ""
"saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
"t�lgendada vahemikuna."
-#: g10/helptext.c:125
+#: g10/helptext.c:131
msgid "Enter the name of the key holder"
msgstr "Sisestage v�tmehoidja nimi"
-#: g10/helptext.c:130
+#: g10/helptext.c:136
msgid "please enter an optional but highly suggested email address"
msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
-#: g10/helptext.c:134
+#: g10/helptext.c:140
msgid "Please enter an optional comment"
msgstr "Te v�ite n��d sisestada kommentaari"
-#: g10/helptext.c:139
+#: g10/helptext.c:145
msgid ""
"N to change the name.\n"
"C to change the comment.\n"
@@ -4043,11 +4197,11 @@ msgstr ""
"O et j�tkata v�tme loomist.\n"
"V et l�petada v�tme loomine."
-#: g10/helptext.c:148
+#: g10/helptext.c:154
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."
-#: g10/helptext.c:156
+#: g10/helptext.c:162
msgid ""
"When you sign a user ID on a key, you should first verify that the key\n"
"belongs to the person named in the user ID. It is useful for others to\n"
@@ -4118,11 +4272,11 @@ msgstr ""
"\n"
"Kui te ei tea �iget vastust, vastake \"0\"."
-#: g10/helptext.c:194
+#: g10/helptext.c:200
msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
-#: g10/helptext.c:198
+#: g10/helptext.c:204
msgid ""
"Answer \"yes\" if you really want to delete this user ID.\n"
"All certificates are then also lost!"
@@ -4130,11 +4284,11 @@ msgstr ""
"Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
"Sertifikaadid kustutatakse samuti!"
-#: g10/helptext.c:203
+#: g10/helptext.c:209
msgid "Answer \"yes\" if it is okay to delete the subkey"
msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
-#: g10/helptext.c:208
+#: g10/helptext.c:214
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"
@@ -4144,7 +4298,7 @@ msgstr ""
"kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
"antud v�tmega sertifitseeritud teise v�tme usaldatavust."
-#: g10/helptext.c:213
+#: g10/helptext.c:219
msgid ""
"This signature can't be checked because you don't have the\n"
"corresponding key. You should postpone its deletion until you\n"
@@ -4156,13 +4310,13 @@ msgstr ""
"kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
"sertifitseeritud v�tme."
-#: g10/helptext.c:219
+#: g10/helptext.c:225
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."
-#: g10/helptext.c:223
+#: g10/helptext.c:229
msgid ""
"This is a signature which binds the user ID to the key. It is\n"
"usually not a good idea to remove such a signature. Actually\n"
@@ -4176,7 +4330,7 @@ msgstr ""
"vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
"olemas ka teine allkiri, mis kasutajat v�tmega seob."
-#: g10/helptext.c:231
+#: g10/helptext.c:237
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"
@@ -4186,23 +4340,23 @@ msgstr ""
"vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
"ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
-#: g10/helptext.c:238
+#: g10/helptext.c:244
msgid "Please enter the passhrase; this is a secret sentence \n"
msgstr "Palun sisestage parool; see on salajane tekst \n"
-#: g10/helptext.c:244
+#: g10/helptext.c:250
msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
-#: g10/helptext.c:248
+#: g10/helptext.c:254
msgid "Give the name of the file to which the signature applies"
msgstr "Sisestage palun failinimi, mida allkirjastada"
-#: g10/helptext.c:253
+#: g10/helptext.c:259
msgid "Answer \"yes\" if it is okay to overwrite the file"
msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
-#: g10/helptext.c:258
+#: g10/helptext.c:264
msgid ""
"Please enter a new filename. If you just hit RETURN the default\n"
"file (which is shown in brackets) will be used."
@@ -4210,7 +4364,7 @@ msgstr ""
"Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
"kasutatakse vaikimisi faili (nimi on nurksulgudes)."
-#: g10/helptext.c:264
+#: g10/helptext.c:270
msgid ""
"You should specify a reason for the certification. Depending on the\n"
"context you have the ability to choose from this list:\n"
@@ -4239,7 +4393,7 @@ msgstr ""
" kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
"aadressi.\n"
-#: g10/helptext.c:280
+#: g10/helptext.c:286
msgid ""
"If you like, you can enter a text describing why you issue this\n"
"revocation certificate. Please keep this text concise.\n"
@@ -4249,11 +4403,11 @@ msgstr ""
"soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
"l�hidalt. T�hi rida l�petab teksti.\n"
-#: g10/helptext.c:295
+#: g10/helptext.c:301
msgid "No help available"
msgstr "Abiinfo puudub"
-#: g10/helptext.c:303
+#: g10/helptext.c:309
#, c-format
msgid "No help available for `%s'"
msgstr "`%s' kohta abiinfo puudub"
@@ -4315,3 +4469,25 @@ msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: v�tmehoidla on loodud\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ " Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "HOIATUS: Sellel v�tmel on juba foto ID.\n"
+#~ " J�rgmise foto ID lisamine v�ib tekitada segadusi m�ne PGP\n"
+#~ " versiooni kasutamisel.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"