aboutsummaryrefslogtreecommitdiffstats
path: root/po/et.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/et.po')
-rw-r--r--po/et.po1659
1 files changed, 891 insertions, 768 deletions
diff --git a/po/et.po b/po/et.po
index c37d64999..62a31bc18 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+0100\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
@@ -28,9 +28,9 @@ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
msgid "no entropy gathering module detected\n"
msgstr "entroopia kogumise moodul puudub\n"
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -66,8 +66,8 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "m�rkus: random_seed faili ei uuendatud\n"
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
#, c-format
msgid "can't create `%s': %s\n"
@@ -121,146 +121,149 @@ 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/app-openpgp.c:539
+#: g10/app-openpgp.c:547
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
msgid "access to admin commands is not configured\n"
msgstr ""
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
msgid "card is permanently locked!\n"
msgstr ""
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
msgid "|A|Admin PIN"
msgstr ""
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
msgid "|AN|New Admin PIN"
msgstr ""
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
msgid "|N|New PIN"
msgstr ""
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
#, fuzzy
msgid "error reading application data\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' on juba pakitud\n"
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
msgid "existing key will be replaced\n"
msgstr ""
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
#, fuzzy
msgid "generating new key\n"
msgstr "genereeri uus v�tmepaar"
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
#, fuzzy
msgid "generating key failed\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
msgid "response does not contain the public key data\n"
msgstr ""
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
#, c-format
msgid "PIN [sigs done: %lu]"
msgstr ""
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\n"
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
#, fuzzy, c-format
msgid "error getting serial number: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
#, fuzzy
msgid "reading the key failed\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
@@ -295,7 +298,7 @@ msgstr "ootamatu pakend:"
msgid "invalid dash escaped line: "
msgstr "vigane kriipsudega m�rgitud rida: "
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
@@ -312,7 +315,7 @@ msgstr "enneaegne failil�pp (poolik CRC)\n"
msgid "malformed CRC\n"
msgstr "vigane CRC\n"
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC viga; %06lx - %06lx\n"
@@ -326,22 +329,22 @@ msgstr "enneaegne failil�pp (l�petaval real)\n"
msgid "error in trailer line\n"
msgstr "viga l�petaval real\n"
-#: g10/armor.c:1115
+#: g10/armor.c:1137
msgid "no valid OpenPGP data found.\n"
msgstr "ei leia OpenPGP andmeid.\n"
-#: g10/armor.c:1120
+#: g10/armor.c:1142
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
-#: g10/armor.c:1124
+#: g10/armor.c:1146
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salajane v�ti ei ole k�ttesaadav"
@@ -351,15 +354,15 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
msgid "OpenPGP card no. %s detected\n"
msgstr ""
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
msgid "Your selection? "
msgstr "Teie valik? "
@@ -367,150 +370,150 @@ msgstr "Teie valik? "
msgid "[not set]"
msgstr ""
-#: g10/card-util.c:378
+#: g10/card-util.c:379
#, fuzzy
msgid "male"
msgstr "enable"
-#: g10/card-util.c:379
+#: g10/card-util.c:380
#, fuzzy
msgid "female"
msgstr "enable"
-#: g10/card-util.c:379
+#: g10/card-util.c:380
#, fuzzy
msgid "unspecified"
msgstr "P�hjus puudub"
-#: g10/card-util.c:406
+#: g10/card-util.c:407
#, fuzzy
msgid "not forced"
msgstr "ei t��deldud"
-#: g10/card-util.c:406
+#: g10/card-util.c:407
msgid "forced"
msgstr ""
-#: g10/card-util.c:458
+#: g10/card-util.c:485
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr ""
-#: g10/card-util.c:460
+#: g10/card-util.c:487
msgid "Error: The \"<\" character may not be used.\n"
msgstr ""
-#: g10/card-util.c:462
+#: g10/card-util.c:489
msgid "Error: Double spaces are not allowed.\n"
msgstr ""
-#: g10/card-util.c:479
+#: g10/card-util.c:506
msgid "Cardholder's surname: "
msgstr ""
-#: g10/card-util.c:481
+#: g10/card-util.c:508
msgid "Cardholder's given name: "
msgstr ""
-#: g10/card-util.c:499
+#: g10/card-util.c:526
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:521
+#: g10/card-util.c:548
#, fuzzy
msgid "URL to retrieve public key: "
msgstr "vastavat avalikku v�tit pole: %s\n"
-#: g10/card-util.c:529
+#: g10/card-util.c:556
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
#, c-format
msgid "error reading `%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: g10/card-util.c:630
+#: g10/card-util.c:657
msgid "Login data (account name): "
msgstr ""
-#: g10/card-util.c:640
+#: g10/card-util.c:667
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:699
+#: g10/card-util.c:726
msgid "Private DO data: "
msgstr ""
-#: g10/card-util.c:709
+#: g10/card-util.c:736
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:729
+#: g10/card-util.c:756
#, fuzzy
msgid "Language preferences: "
msgstr "uuendatud eelistused"
-#: g10/card-util.c:737
+#: g10/card-util.c:764
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
-#: g10/card-util.c:746
+#: g10/card-util.c:773
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
-#: g10/card-util.c:767
+#: g10/card-util.c:794
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
-#: g10/card-util.c:781
+#: g10/card-util.c:808
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "viga: vigane s�rmej�lg\n"
-#: g10/card-util.c:802
+#: g10/card-util.c:829
#, fuzzy
msgid "CA fingerprint: "
msgstr "n�ita s�rmej�lge"
-#: g10/card-util.c:825
+#: g10/card-util.c:852
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "viga: vigane s�rmej�lg\n"
-#: g10/card-util.c:873
+#: g10/card-util.c:900
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
-#: g10/card-util.c:874
+#: g10/card-util.c:901
#, fuzzy
msgid "not an OpenPGP card"
msgstr "ei leia OpenPGP andmeid.\n"
-#: g10/card-util.c:883
+#: g10/card-util.c:910
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/card-util.c:966
+#: g10/card-util.c:993
msgid "Replace existing key? (y/N) "
msgstr ""
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
msgid "Replace existing keys? (y/N) "
msgstr ""
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@ -518,132 +521,132 @@ msgid ""
"You should change them using the command --change-pin\n"
msgstr ""
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allkiri aegus %s\n"
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
msgid " (3) Authentication key\n"
msgstr ""
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Palun valige t�histamise p�hjus:\n"
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
#, fuzzy
msgid "unknown key protection algorithm\n"
msgstr "tundmatu kaitsealgoritm\n"
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
#, fuzzy
msgid "secret parts of key are not available\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
#, fuzzy
msgid "secret key already stored on a card\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
msgid "quit this menu"
msgstr "v�lju sellest men��st"
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
#, fuzzy
msgid "show admin commands"
msgstr "vastuolulised k�sud\n"
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
msgid "show this help"
msgstr "n�ita seda abiinfot"
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
#, fuzzy
msgid "list all available data"
msgstr "V�tme leiate: "
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
msgid "change card holder's name"
msgstr ""
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
msgid "change URL to retrieve key"
msgstr ""
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
msgid "fetch the key specified in the card URL"
msgstr ""
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
#, fuzzy
msgid "change the login name"
msgstr "muuda aegumise kuup�eva"
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
#, fuzzy
msgid "change the language preferences"
msgstr "muuda omaniku usaldust"
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
msgid "change card holder's sex"
msgstr ""
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
#, fuzzy
msgid "change a CA fingerprint"
msgstr "n�ita s�rmej�lge"
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
msgid "toggle the signature force PIN flag"
msgstr ""
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
#, fuzzy
msgid "generate new keys"
msgstr "genereeri uus v�tmepaar"
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
msgid "menu to change or unblock the PIN"
msgstr ""
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
msgid "Command> "
msgstr "K�sklus> "
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
#, fuzzy
msgid "Admin-only command\n"
msgstr "vastuolulised k�sud\n"
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "vastuolulised k�sud\n"
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
@@ -651,44 +654,44 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
msgid "Please insert the card and hit return or enter 'c' to cancel: "
msgstr ""
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
#, c-format
msgid ""
"Please remove the current card and insert the one with serial number:\n"
" %.*s\n"
msgstr ""
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
msgid "Hit return when ready or enter 'c' to cancel: "
msgstr ""
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
msgid "Enter New Admin PIN: "
msgstr ""
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
msgid "Enter New PIN: "
msgstr ""
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
msgid "Enter Admin PIN: "
msgstr ""
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
msgid "Enter PIN: "
msgstr ""
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
#, fuzzy
msgid "Repeat this PIN: "
msgstr "Korrake parooli: "
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
#, c-format
msgid "can't open `%s'\n"
@@ -698,14 +701,14 @@ msgstr "`%s' ei �nnestu avada\n"
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
#: g10/revoke.c:226
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
@@ -897,31 +900,31 @@ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
-#: g10/export.c:182
+#: g10/export.c:183
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/export.c:211
+#: g10/export.c:212
#, fuzzy, c-format
msgid "key %s: not protected - skipped\n"
msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
-#: g10/export.c:219
+#: g10/export.c:220
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
-#: g10/export.c:384
+#: g10/export.c:395
#, fuzzy, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
-#: g10/export.c:416
+#: g10/export.c:427
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
-#: g10/g10.c:358
+#: g10/g10.c:360
msgid ""
"@Commands:\n"
" "
@@ -929,128 +932,128 @@ msgstr ""
"@K�sud:\n"
" "
-#: g10/g10.c:360
+#: g10/g10.c:362
msgid "|[file]|make a signature"
msgstr "|[fail]|loo allkiri"
-#: g10/g10.c:361
+#: g10/g10.c:363
msgid "|[file]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/g10.c:362
+#: g10/g10.c:364
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/g10.c:363
+#: g10/g10.c:365
msgid "encrypt data"
msgstr "kr�pteeri andmed"
-#: g10/g10.c:365
+#: g10/g10.c:367
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
-#: g10/g10.c:367
+#: g10/g10.c:369
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
-#: g10/g10.c:369
+#: g10/g10.c:371
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/g10.c:371
+#: g10/g10.c:373
msgid "list keys"
msgstr "n�ita v�tmeid"
-#: g10/g10.c:373
+#: g10/g10.c:375
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
-#: g10/g10.c:374
+#: g10/g10.c:376
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
-#: g10/g10.c:375
+#: g10/g10.c:377
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
-#: g10/g10.c:376
+#: g10/g10.c:378
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
-#: g10/g10.c:377
+#: g10/g10.c:379
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
-#: g10/g10.c:378
+#: g10/g10.c:380
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
-#: g10/g10.c:380
+#: g10/g10.c:382
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
-#: g10/g10.c:381
+#: g10/g10.c:383
msgid "sign a key"
msgstr "allkirjasta v�ti"
-#: g10/g10.c:382
+#: g10/g10.c:384
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/g10.c:383
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
-#: g10/g10.c:384
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
-#: g10/g10.c:386
+#: g10/g10.c:388
msgid "export keys"
msgstr "ekspordi v�tmed"
-#: g10/g10.c:387
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
-#: g10/g10.c:388
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/g10.c:390
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "otsi v�tmeid v�tmeserverist"
-#: g10/g10.c:392
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
-#: g10/g10.c:395
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
-#: g10/g10.c:398
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:399
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:400
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:408
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
-#: g10/g10.c:415
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
msgid ""
"@\n"
"Options:\n"
@@ -1060,51 +1063,51 @@ msgstr ""
"V�tmed:\n"
" "
-#: g10/g10.c:421
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
-#: g10/g10.c:423
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|kr�pti NIMEle"
-#: g10/g10.c:434
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/g10.c:435
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
-#: g10/g10.c:440
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/g10.c:450
+#: g10/g10.c:452
msgid "use as output file"
msgstr "kasuta v�ljundfailina"
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
msgid "verbose"
msgstr "ole jutukas"
-#: g10/g10.c:463
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
-#: g10/g10.c:464
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
-#: g10/g10.c:505
+#: g10/g10.c:507
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:506
+#: g10/g10.c:508
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:532
+#: g10/g10.c:536
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1112,7 +1115,7 @@ msgstr ""
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
-#: g10/g10.c:535
+#: g10/g10.c:539
msgid ""
"@\n"
"Examples:\n"
@@ -1132,15 +1135,15 @@ msgstr ""
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
-#: g10/g10.c:733
+#: g10/g10.c:737
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/g10.c:736
+#: g10/g10.c:740
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1150,7 +1153,7 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: g10/g10.c:747
+#: g10/g10.c:751
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1158,458 +1161,458 @@ msgstr ""
"\n"
"Toetatud algoritmid:\n"
-#: g10/g10.c:750
+#: g10/g10.c:754
msgid "Pubkey: "
msgstr "Avalik v�ti: "
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
msgid "Cipher: "
msgstr "�iffer: "
-#: g10/g10.c:762
+#: g10/g10.c:766
msgid "Hash: "
msgstr "R�si: "
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
msgid "Compression: "
msgstr "Pakkimine: "
-#: g10/g10.c:851
+#: g10/g10.c:855
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: g10/g10.c:999
+#: g10/g10.c:1003
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
-#: g10/g10.c:1017
+#: g10/g10.c:1021
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
-#: g10/g10.c:1214
+#: g10/g10.c:1218
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/g10.c:1217
+#: g10/g10.c:1221
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/g10.c:1220
+#: g10/g10.c:1224
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1230
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/g10.c:1229
+#: g10/g10.c:1233
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/g10.c:1232
+#: g10/g10.c:1236
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/g10.c:1238
+#: g10/g10.c:1242
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/g10.c:1241
+#: g10/g10.c:1245
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/g10.c:1244
+#: g10/g10.c:1248
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/g10.c:1250
+#: g10/g10.c:1254
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/g10.c:1253
+#: g10/g10.c:1257
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/g10.c:1256
+#: g10/g10.c:1260
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/g10.c:1397
+#: g10/g10.c:1401
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tundmatu seade \"%s\"\n"
-#: g10/g10.c:1798
+#: g10/g10.c:1796
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
-#: g10/g10.c:1840
+#: g10/g10.c:1838
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-#: g10/g10.c:1844
+#: g10/g10.c:1842
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
-#: g10/g10.c:1851
+#: g10/g10.c:1849
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-#: g10/g10.c:2078
+#: g10/g10.c:2076
#, fuzzy, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
-#: g10/g10.c:2292
+#: g10/g10.c:2293
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/g10.c:2317
+#: g10/g10.c:2318
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/g10.c:2320
+#: g10/g10.c:2321
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/g10.c:2327
+#: g10/g10.c:2328
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/g10.c:2330
+#: g10/g10.c:2331
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/g10.c:2337
+#: g10/g10.c:2338
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/g10.c:2340
+#: g10/g10.c:2341
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/g10.c:2347
+#: g10/g10.c:2348
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/g10.c:2350
+#: g10/g10.c:2351
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/g10.c:2372
+#: g10/g10.c:2373
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/g10.c:2375
+#: g10/g10.c:2376
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/g10.c:2382
+#: g10/g10.c:2383
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2573
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2577
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
-#: g10/g10.c:2585
+#: g10/g10.c:2586
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: g10/g10.c:2588
+#: g10/g10.c:2589
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/g10.c:2616
+#: g10/g10.c:2617
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:2622
+#: g10/g10.c:2623
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:2628
+#: g10/g10.c:2629
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:2641
+#: g10/g10.c:2642
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:2723
+#: g10/g10.c:2724
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/g10.c:2729
+#: g10/g10.c:2730
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:2744
+#: g10/g10.c:2745
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
-#: g10/g10.c:2746
+#: g10/g10.c:2747
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
-#: g10/g10.c:2748
+#: g10/g10.c:2749
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
-#: g10/g10.c:2750
+#: g10/g10.c:2751
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
-#: g10/g10.c:2752
+#: g10/g10.c:2753
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
-#: g10/g10.c:2755
+#: g10/g10.c:2756
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
-#: g10/g10.c:2759
+#: g10/g10.c:2760
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:2766
+#: g10/g10.c:2767
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
-#: g10/g10.c:2775
+#: g10/g10.c:2776
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
-#: g10/g10.c:2779
+#: g10/g10.c:2780
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
-#: g10/g10.c:2783
+#: g10/g10.c:2784
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
-#: g10/g10.c:2816
+#: g10/g10.c:2817
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
-#: g10/g10.c:2863
+#: g10/g10.c:2864
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/g10.c:2868
+#: g10/g10.c:2869
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/g10.c:2873
+#: g10/g10.c:2874
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/g10.c:2969
+#: g10/g10.c:2970
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/g10.c:2980
+#: g10/g10.c:2981
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
-#: g10/g10.c:2991
+#: g10/g10.c:2992
msgid "--store [filename]"
msgstr "--store [failinimi]"
-#: g10/g10.c:2998
+#: g10/g10.c:2999
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/g10.c:3000
+#: g10/g10.c:3001
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
-#: g10/g10.c:3010
+#: g10/g10.c:3011
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
-#: g10/g10.c:3023
+#: g10/g10.c:3024
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:3025
+#: g10/g10.c:3026
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:3028
+#: g10/g10.c:3029
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/g10.c:3046
+#: g10/g10.c:3047
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
-#: g10/g10.c:3059
+#: g10/g10.c:3060
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:3074
+#: g10/g10.c:3075
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:3076
+#: g10/g10.c:3077
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:3079
+#: g10/g10.c:3080
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/g10.c:3099
+#: g10/g10.c:3100
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
-#: g10/g10.c:3108
+#: g10/g10.c:3109
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
-#: g10/g10.c:3133
+#: g10/g10.c:3134
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
-#: g10/g10.c:3141
+#: g10/g10.c:3142
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
-#: g10/g10.c:3145
+#: g10/g10.c:3146
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
-#: g10/g10.c:3166
+#: g10/g10.c:3167
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
-#: g10/g10.c:3237
+#: g10/g10.c:3238
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
-#: g10/g10.c:3274
+#: g10/g10.c:3275
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
-#: g10/g10.c:3276
+#: g10/g10.c:3277
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-#: g10/g10.c:3278
+#: g10/g10.c:3279
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
-#: g10/g10.c:3289
+#: g10/g10.c:3290
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
-#: g10/g10.c:3299
+#: g10/g10.c:3300
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
-#: g10/g10.c:3340
+#: g10/g10.c:3341
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
-#: g10/g10.c:3348
+#: g10/g10.c:3349
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
-#: g10/g10.c:3435
+#: g10/g10.c:3436
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
-#: g10/g10.c:3558
+#: g10/g10.c:3559
msgid "[filename]"
msgstr "[failinimi]"
-#: g10/g10.c:3562
+#: g10/g10.c:3563
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
-#: g10/g10.c:3852
+#: g10/g10.c:3853
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1617,23 +1620,23 @@ msgstr ""
"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
"ning l�pus peab olema '='\n"
-#: g10/g10.c:3860
+#: g10/g10.c:3861
msgid "a user notation name must contain the '@' character\n"
msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
-#: g10/g10.c:3870
+#: g10/g10.c:3871
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:3904
+#: g10/g10.c:3905
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
-#: g10/g10.c:3906
+#: g10/g10.c:3907
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/g10.c:3939
+#: g10/g10.c:3940
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1642,54 +1645,54 @@ msgstr "antud allkirja poliisi URL on vigane\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
#, fuzzy
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
"kasutamisega\n"
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
-#: g10/getkey.c:2420
+#: g10/getkey.c:2458
#, fuzzy, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+msgid "using subkey %s instead of primary key %s\n"
msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
#, fuzzy, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
msgid "take the keys from this keyring"
msgstr "v�ta v�tmed sellest v�tmehoidlast"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -2015,382 +2018,403 @@ msgstr "Abiinfo puudub"
msgid "No help available for `%s'"
msgstr "`%s' kohta abiinfo puudub"
-#: g10/import.c:249
+#: g10/import.c:250
#, c-format
msgid "skipping block of type %d\n"
msgstr "j�tan bloki t��biga %d vahele\n"
-#: g10/import.c:258
+#: g10/import.c:259
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu v�tit on seni t��deldud\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "Total number processed: %lu\n"
msgstr "T��deldud kokku: %lu\n"
-#: g10/import.c:277
+#: g10/import.c:278
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
-#: g10/import.c:280
+#: g10/import.c:281
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " puudub kasutaja ID: %lu\n"
-#: g10/import.c:282
+#: g10/import.c:283
#, c-format
msgid " imported: %lu"
msgstr " imporditud: %lu"
-#: g10/import.c:288
+#: g10/import.c:289
#, c-format
msgid " unchanged: %lu\n"
msgstr " muutmata: %lu\n"
-#: g10/import.c:290
+#: g10/import.c:291
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusi kasutajaid: %lu\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusi alamv�tmeid: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusi allkirju: %lu\n"
-#: g10/import.c:296
+#: g10/import.c:297
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusi t�histamisi: %lu\n"
-#: g10/import.c:298
+#: g10/import.c:299
#, c-format
msgid " secret keys read: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
-#: g10/import.c:300
+#: g10/import.c:301
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " salajasi v�tmeid imporditud: %lu\n"
-#: g10/import.c:302
+#: g10/import.c:303
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi v�tmeid: %lu\n"
-#: g10/import.c:304
+#: g10/import.c:305
#, c-format
msgid " not imported: %lu\n"
msgstr " pole imporditud: %lu\n"
-#: g10/import.c:545
+#: g10/import.c:546
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
-#: g10/import.c:547
+#: g10/import.c:548
#, fuzzy
msgid "algorithms on these user IDs:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/import.c:584
+#: g10/import.c:585
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:596
+#: g10/import.c:597
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
-#: g10/import.c:608
+#: g10/import.c:609
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:621
+#: g10/import.c:622
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:623
+#: g10/import.c:624
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:647
+#: g10/import.c:648
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
-#: g10/import.c:715
+#: g10/import.c:716
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
-#: g10/import.c:730
+#: g10/import.c:731
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
-#: g10/import.c:736
+#: g10/import.c:737
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
-#: g10/import.c:738
+#: g10/import.c:739
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:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
-#: g10/import.c:754
+#: g10/import.c:755
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
-#: g10/import.c:763
+#: g10/import.c:764
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
#, c-format
msgid "writing to `%s'\n"
msgstr "kirjutan faili `%s'\n"
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/import.c:793
+#: g10/import.c:794
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
-#: g10/import.c:817
+#: g10/import.c:818
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
-#: g10/import.c:874
+#: g10/import.c:875
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
-#: g10/import.c:877
+#: g10/import.c:878
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
-#: g10/import.c:880
+#: g10/import.c:881
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
-#: g10/import.c:883
+#: g10/import.c:884
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
-#: g10/import.c:886
+#: g10/import.c:887
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
-#: g10/import.c:889
+#: g10/import.c:890
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
-#: g10/import.c:910
+#: g10/import.c:911
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
-#: g10/import.c:1055
+#: g10/import.c:1056
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
-#: g10/import.c:1066
+#: g10/import.c:1067
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
-#: g10/import.c:1094
+#: g10/import.c:1095
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
-#: g10/import.c:1123
+#: g10/import.c:1124
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
-#: g10/import.c:1133
+#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
-#: g10/import.c:1206
+#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
-#: g10/import.c:1238
+#: g10/import.c:1239
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
-#: g10/import.c:1303
+#: g10/import.c:1304
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
-#: g10/import.c:1318
+#: g10/import.c:1319
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
-#: g10/import.c:1320
+#: g10/import.c:1321
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
-#: g10/import.c:1338
+#: g10/import.c:1339
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
-#: g10/import.c:1351
+#: g10/import.c:1352
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
-#: g10/import.c:1366
+#: g10/import.c:1367
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
-#: g10/import.c:1388
+#: g10/import.c:1389
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
-#: g10/import.c:1401
+#: g10/import.c:1402
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
-#: g10/import.c:1416
+#: g10/import.c:1417
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
-#: g10/import.c:1458
+#: g10/import.c:1459
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
-#: g10/import.c:1479
+#: g10/import.c:1480
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
-#: g10/import.c:1506
+#: g10/import.c:1507
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
-#: g10/import.c:1516
+#: g10/import.c:1517
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
-#: g10/import.c:1533
+#: g10/import.c:1534
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
-#: g10/import.c:1547
+#: g10/import.c:1548
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
-#: g10/import.c:1555
+#: g10/import.c:1556
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
+
+#: g10/import.c:1680
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
-#: g10/import.c:1717
+#: g10/import.c:1742
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
-#: g10/import.c:1731
+#: g10/import.c:1756
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
-#: g10/import.c:1790
+#: g10/import.c:1815
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
-#: g10/import.c:1824
+#: g10/import.c:1849
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+
#: g10/keydb.c:167
#, c-format
msgid "error creating keyring `%s': %s\n"
@@ -2406,51 +2430,51 @@ msgstr "v�tmehoidla `%s' on loodud\n"
msgid "failed to rebuild keyring cache: %s\n"
msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
msgid "[revocation]"
msgstr "[t�histamine]"
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
msgid "1 bad signature\n"
msgstr "1 halb allkiri\n"
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
#, c-format
msgid "%d bad signatures\n"
msgstr "%d halba allkirja\n"
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
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:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
#, 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:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
msgid "1 signature not checked due to an error\n"
msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
msgid "1 user ID without valid self-signature detected\n"
msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@ -2463,53 +2487,53 @@ msgstr ""
"passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
"\n"
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Usaldan v�hesel m��ral\n"
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Usaldan t�iesti\n"
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on t�histatud."
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kasutaja ID \"%s\" on aegunud."
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2518,11 +2542,11 @@ msgstr ""
"Iseenda allkiri \"%s\"\n"
"on PGP 2.x stiilis allkiri.\n"
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2531,11 +2555,11 @@ msgstr ""
"Teie praegune allkiri \"%s\"\n"
"on aegunud.\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2544,54 +2568,54 @@ msgstr ""
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
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:748
+#: g10/keyedit.c:749
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
msgid "This key has expired!"
msgstr "See v�ti on aegunud!"
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See v�ti aegub %s.\n"
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
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:850
+#: g10/keyedit.c:851
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:852
+#: g10/keyedit.c:853
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:877
+#: g10/keyedit.c:878
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2601,32 +2625,32 @@ msgstr ""
"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole �ldse kontrollinud.%s\n"
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
#, 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:894
+#: g10/keyedit.c:895
#, fuzzy
msgid "Your selection? (enter `?' for more information): "
msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@ -2635,91 +2659,100 @@ msgstr ""
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
"HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Ma ei ole seda v�tit �ldse kontrollinud.\n"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Allkirjastan t�esti? "
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
msgid "This key is not protected.\n"
msgstr "See v�ti ei ole kaitstud.\n"
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
msgid "Key is protected.\n"
msgstr "V�ti on kaitstud.\n"
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2727,11 +2760,11 @@ msgstr ""
"Sisestage sellele salajasele v�tmele uus parool.\n"
"\n"
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2739,371 +2772,412 @@ msgstr ""
"Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
"\n"
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
#, fuzzy
msgid "Do you really want to do this? (y/N) "
msgstr "Kas te t�esti soovite seda teha? "
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
msgid "moving a key signature to the correct place\n"
msgstr "t�stan v�tme allkirja �igesse kohta\n"
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
msgid "save and quit"
msgstr "salvesta ja v�lju"
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
msgstr "n�ita s�rmej�lge"
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
msgid "select user ID N"
msgstr "vali kasutaja ID N"
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "vali sekundaarne v�ti N"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "vali kasutaja ID N"
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "n�ita allkirju"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "t�hista allkirjad"
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "allkirjasta v�ti"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
msgid "add a user ID"
msgstr "lisa kasutaja ID"
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
msgid "add a photo ID"
msgstr "lisa foto ID"
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
msgstr "kustuta kasutaja ID"
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "lisa sekundaarne v�ti"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
msgid "add a key to a smartcard"
msgstr ""
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
msgid "move a key to a smartcard"
msgstr ""
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
msgstr "kustuta sekundaarne v�ti"
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
msgid "add a revocation key"
msgstr "lisa t�histamise v�ti"
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "kustuta allkirjad"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "muuda aegumise kuup�eva"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
msgstr "m�rgi kasutaja ID primaarseks"
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
msgid "list preferences (expert)"
msgstr "n�ita eelistusi (ekspert)"
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
msgid "list preferences (verbose)"
msgstr "n�ita eelistusi (detailsena)"
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "sea eelistuste nimekiri"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "uuendatud eelistused"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1360
#, fuzzy
-msgid "set preferred keyserver URL"
+msgid "set preferred keyserver URL for the selected user IDs"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
msgid "change the passphrase"
msgstr "muuda parooli"
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "t�hista allkirjad"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
msgstr "t�hista kasutaja ID"
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
msgstr "t�hista sekundaarne v�ti"
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "blokeeri v�ti"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
msgstr "luba v�ti"
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "blokeeri v�ti"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
msgstr "n�ita foto ID"
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
#, fuzzy, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
msgid "Please use the command \"toggle\" first.\n"
msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+" a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
msgid "Key is revoked."
msgstr "V�ti on t�histatud."
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
#, fuzzy, c-format
msgid "Unknown signature type `%s'\n"
msgstr "tundmatu allkirja klass"
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
#, 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:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
#, fuzzy
msgid "Really remove this user ID? (y/N) "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Kas te t�esti soovite seda v�tit kustutada? "
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Kas t�histan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Kas te t�esti soovite seda v�tit t�histada? "
+
+#: g10/keyedit.c:1822
#, fuzzy
-msgid "Do you really want to revoke the selected keys? (y/N) "
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1824
#, fuzzy
-msgid "Do you really want to revoke this key? (y/N) "
+msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
#, fuzzy
msgid "Set preference list to:\n"
msgstr "sea eelistuste nimekiri"
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Kas t�esti uuendan seaded? "
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvestan muutused? "
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "V�ljun salvestamata? "
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
#, c-format
msgid "update secret failed: %s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
msgid "Digest: "
msgstr "Teatel�hend: "
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
msgid "Features: "
msgstr "Omadused: "
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
msgid "Preferred keyserver: "
msgstr ""
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
+
+#: g10/keyedit.c:2384
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
#, fuzzy
msgid "(sensitive)"
msgstr " (tundlik)"
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei �nnestu luua: %s\n"
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[t�histatud] "
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [aegub: %s]"
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [aegub: %s]"
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
#, fuzzy, c-format
msgid "usage: %s"
msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
#, fuzzy, c-format
msgid "trust: %s"
msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
msgid "card-no: "
msgstr ""
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3111,19 +3185,19 @@ msgstr ""
"Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
"n�idatud v�tme kehtivus olla tingimata korrektne.\n"
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
#: g10/trustdb.c:1164
#, fuzzy
msgid "revoked"
msgstr "[t�histatud] "
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
#: g10/trustdb.c:531
#, fuzzy
msgid "expired"
msgstr "expire"
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3131,7 +3205,7 @@ msgstr ""
"HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks. See k�sklus v�ib\n"
" p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3140,45 +3214,45 @@ 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:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
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:2671
+#: g10/keyedit.c:2746
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:2811
+#: g10/keyedit.c:2886
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Kustutatud %d allkiri.\n"
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Kustutatud %d allkirja.\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3187,160 +3261,172 @@ msgstr ""
"HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
" p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
msgid "Please remove selections from the secret keys.\n"
msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
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:3190
+#: g10/keyedit.c:3265
msgid "No corresponding signature in secret ring\n"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "Sekundaarne v�ti numbriga %d puudub\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "kasutaja ID: \""
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
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:3802
+#: g10/keyedit.c:3878
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
#, fuzzy
msgid " (non-revocable)"
msgstr " (mitte-eksporditav)"
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " t�histanud %08lX %s\n"
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:4318
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@ -3370,145 +3456,145 @@ msgstr "liiga palju `%c' eelistusi\n"
msgid "invalid item `%s' in preference string\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:829
msgid "writing direct signature\n"
msgstr "kirjutan otsese allkirja\n"
-#: g10/keygen.c:866
+#: g10/keygen.c:868
msgid "writing self signature\n"
msgstr "kirjutan iseenda allkirja\n"
-#: g10/keygen.c:912
+#: g10/keygen.c:914
msgid "writing key binding signature\n"
msgstr "kirjutan v�tit siduva allkirja\n"
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane v�tme suurus; kasutan %u bitti\n"
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "v�tme suurus �mardatud �les %u bitini\n"
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
#, fuzzy
msgid "Encrypt"
msgstr "kr�pteeri andmed"
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
msgid "Authenticate"
msgstr ""
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
msgid "Please select what kind of key you want:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Soovitud v�tmepikkus on %u bitti\n"
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -3524,7 +3610,7 @@ msgstr ""
" <n>m = v�ti aegub n kuuga\n"
" <n>y = v�ti aegub n aastaga\n"
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -3540,29 +3626,39 @@ msgstr ""
" <n>m = allkiri aegub n kuuga\n"
" <n>y = allkiri aegub n aastaga\n"
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
msgid "Key is valid for? (0) "
msgstr "V�ti on kehtiv kuni? (0) "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
msgid "Signature is valid for? (0) "
msgstr "Allkiri on kehtiv kuni? (0) "
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
msgid "invalid value\n"
msgstr "vigane v��rtus\n"
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s ei aegu kunagi\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
msgstr "%s aegub %s\n"
#: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "Allkiri aegub %s\n"
+
+#: g10/keygen.c:1590
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -3570,12 +3666,12 @@ msgstr ""
"Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
"Siiski k�sitletakse neid korrektselt aastani 2106.\n"
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "On see �ige (j/e)? "
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
#, fuzzy
msgid ""
"\n"
@@ -3591,44 +3687,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
msgid "Real name: "
msgstr "P�risnimi: "
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
msgid "Invalid character in name\n"
msgstr "Lubamatu s�mbol nimes\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
msgid "Name may not start with a digit\n"
msgstr "Nimi ei v�i alata numbriga\n"
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
msgid "Invalid character in comment\n"
msgstr "Lubamatu s�mbol kommentaaris\n"
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3639,27 +3735,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
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:1739
+#: g10/keygen.c:1745
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
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:1750
+#: g10/keygen.c:1756
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:1769
+#: g10/keygen.c:1775
msgid "Please correct the error first\n"
msgstr "Palun parandage k�igepealt viga\n"
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3667,12 +3763,12 @@ msgstr ""
"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
"\n"
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
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"
@@ -3684,7 +3780,7 @@ msgstr ""
"kasutades seda programmi v�tmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
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"
@@ -3696,109 +3792,110 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
msgid "Key generation canceled.\n"
msgstr "V�tme genereerimine katkestati.\n"
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku v�tme faili `%s'\n"
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
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"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
"Pidage silmas, et seda v�tit ei saa kasutada kr�ptimiseks. \n"
"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
"kasutades v�tit \"--edit-key\".\n"
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
#, c-format
msgid "Key generation failed: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
#, 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:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
#, 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:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
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:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon t�esti? "
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
#, c-format
msgid "length of RSA modulus is not %d\n"
msgstr ""
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
msgid "public exponent too large (more than 32 bits)\n"
msgstr ""
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
#, c-format
msgid "length of an RSA prime is not %d\n"
msgstr ""
@@ -3807,65 +3904,67 @@ msgstr ""
msgid "never "
msgstr "mitte kunagi"
-#: g10/keylist.c:201
+#: g10/keylist.c:264
msgid "Critical signature policy: "
msgstr "Kriitiline allkirja poliitika: "
-#: g10/keylist.c:203
+#: g10/keylist.c:266
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
-#: g10/keylist.c:242
+#: g10/keylist.c:305
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
msgid "WARNING: invalid notation data found\n"
msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
-#: g10/keylist.c:309
+#: g10/keylist.c:372
msgid "Critical signature notation: "
msgstr "Kriitiline allkirja noteerimine: "
-#: g10/keylist.c:311
+#: g10/keylist.c:374
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
-#: g10/keylist.c:322
+#: g10/keylist.c:385
msgid "not human readable"
msgstr "pole inimese poolt loetav"
-#: g10/keylist.c:423
+#: g10/keylist.c:486
msgid "Keyring"
msgstr "V�tmehoidla"
-#: g10/keylist.c:729
+#: g10/keylist.c:792
#, fuzzy, c-format
msgid "expired: %s)"
msgstr " [aegub: %s]"
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
msgid "Primary key fingerprint:"
msgstr "Primaarse v�tme s�rmej�lg:"
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
msgid " Primary key fingerprint:"
msgstr " Primaarse v�tme s�rmej�lg:"
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
#, fuzzy
msgid " Key fingerprint ="
msgstr " V�tme s�rmej�lg ="
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
msgid " Card serial no. ="
msgstr ""
@@ -3917,130 +4016,130 @@ msgstr "%s: v�tmehoidla on loodud\n"
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
#, fuzzy
msgid "no keyserver action!\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
#, c-format
msgid "gpgkeys_%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
#, fuzzy
msgid "keyserver timed out\n"
msgstr "v�tmeserveri viga"
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
#, fuzzy
msgid "keyserver internal error\n"
msgstr "v�tmeserveri viga"
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
@@ -4248,86 +4347,86 @@ msgstr "vana stiili (PGP 2.x) allkiri\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
-#: g10/misc.c:105
+#: g10/misc.c:119
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
#, fuzzy, c-format
msgid "fstat of `%s' failed in %s: %s\n"
msgstr "faili ei �nnestu avada: %s\n"
-#: g10/misc.c:190
+#: g10/misc.c:204
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
-#: g10/misc.c:299
+#: g10/misc.c:313
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
-#: g10/misc.c:314
+#: g10/misc.c:328
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "realiseerimata �ifri algoritm"
-#: g10/misc.c:329
+#: g10/misc.c:343
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
-#: g10/misc.c:334
+#: g10/misc.c:348
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
-#: g10/misc.c:430
+#: g10/misc.c:444
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA �ifri lisandprogrammi pole\n"
-#: g10/misc.c:431
+#: g10/misc.c:445
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/misc.c:664
+#: g10/misc.c:678
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
-#: g10/misc.c:668
+#: g10/misc.c:682
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
-#: g10/misc.c:670
+#: g10/misc.c:684
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "palun kasutage selle asemel \"%s%s\"\n"
-#: g10/misc.c:681
+#: g10/misc.c:695
msgid "Uncompressed"
msgstr "Pakkimata"
-#: g10/misc.c:706
+#: g10/misc.c:720
#, fuzzy
msgid "uncompressed|none"
msgstr "Pakkimata"
-#: g10/misc.c:816
+#: g10/misc.c:830
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
-#: g10/misc.c:973
+#: g10/misc.c:987
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/misc.c:998
+#: g10/misc.c:1012
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -4375,18 +4474,18 @@ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
msgid "directory `%s' created\n"
msgstr "%s: kataloog on loodud\n"
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
#, 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:688
+#: g10/parse-packet.c:707
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
"v�ti\n"
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -4425,16 +4524,16 @@ msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "probleem gpg-agent programmiga suhtlemisel\n"
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
msgid "problem with the agent - disabling agent use\n"
msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (peamise v�tme ID %08lX)"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -4445,27 +4544,27 @@ msgstr ""
"\"%.*s\"\n"
"%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
msgid "Repeat passphrase\n"
msgstr "Korrake parooli\n"
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
msgid "Enter passphrase\n"
msgstr "Sisestage parool\n"
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
msgid "passphrase too long\n"
msgstr "liiga pikk parool\n"
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
msgid "invalid response from agent\n"
msgstr "vigane vastus agendilt\n"
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
msgid "cancelled by user\n"
msgstr "katkestatud kasutaja poolt\n"
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@ -5001,20 +5100,20 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
msgid "protection digest %d is not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
msgid "Invalid passphrase; please try again"
msgstr "Vigane parool; palun proovige uuesti"
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
#, c-format
msgid "%s ...\n"
msgstr "%s ...\n"
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
msgstr ""
"loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
@@ -5373,12 +5472,12 @@ msgstr "%s: kirje lisamine eba�nnestus: %s\n"
msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
#, c-format
msgid "input line longer than %d characters\n"
msgstr "sisendrida on pikem, kui %d s�mbolit\n"
@@ -5854,6 +5953,33 @@ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
+#~ msgid "select secondary key N"
+#~ msgstr "vali sekundaarne v�ti N"
+
+#~ msgid "list signatures"
+#~ msgstr "n�ita allkirju"
+
+#~ msgid "sign the key"
+#~ msgstr "allkirjasta v�ti"
+
+#~ msgid "add a secondary key"
+#~ msgstr "lisa sekundaarne v�ti"
+
+#~ msgid "delete signatures"
+#~ msgstr "kustuta allkirjad"
+
+#~ msgid "change the expire date"
+#~ msgstr "muuda aegumise kuup�eva"
+
+#~ msgid "set preference list"
+#~ msgstr "sea eelistuste nimekiri"
+
+#~ msgid "updated preferences"
+#~ msgstr "uuendatud eelistused"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "Sekundaarne v�ti numbriga %d puudub\n"
+
#~ msgid "--nrsign-key user-id"
#~ msgstr "--nrsign-key kasutaja-id"
@@ -5957,9 +6083,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
#~ msgid "delphoto"
#~ msgstr "delphoto"
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
#, fuzzy
#~ msgid "addcardkey"
#~ msgstr "addkey"