msgmerge'd.

18 files changed, 15085 insertions, 12051 deletions

diff --git a/po/cs.po b/po/cs.po
index 6cd170f22..e0e269a42 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-20 10:20+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -44,7 +44,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "ukonèit"
 
@@ -271,7 +271,7 @@ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otevøít `%s': %s\n"
@@ -336,7 +336,7 @@ msgstr ""
 "NEPOU®ÍVEJTE JAKÁKOLIV DATA VYTVOØENÁ TÍMTO PROGRAMEM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -347,7 +347,7 @@ msgstr ""
 "Nedostatek náhodných bajtù. Prosím, pracujte s operaèním systémem, abyste\n"
 "mu umo¾nili získat více entropie (je potøeba %d bajtù).\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -355,169 +355,169 @@ msgstr ""
 "@Pøíkazy:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvoøit podpis"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvoøit podpis v èitelném dokumentu"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "vytvoøit podpis oddìlený od dokumentu"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "¹ifrovat data"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[soubor]|¹ifrovat soubor"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "¹ifrování pouze se symetrickou ¹ifrou"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "pouze ulo¾ení"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "de¹ifrovat data (implicitnì)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[soubor]|de¹ifrovat soubor"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "vypsat seznam klíèù"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "vypsat seznam klíèù a podpisù"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "zkontrolovat podpisy klíèù"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klíèù a fingerprintù"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klíèù"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "vytvoøit nový pár klíèù"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "odstranit klíè ze souboru veøejných klíèù"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klíè ze souboru tajných klíèù"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "podepsat klíè"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "podepsat klíè lokálnì"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "podepsat klíè bez mo¾nosti revokace podpisu"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "podepsat klíè lokálnì a bez mo¾nosti\n"
 " revokace podpisu"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klíè"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "vytvoøit revokaèní certifikát"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exportovat klíèe"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exportovat klíèe na server klíèù"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importovat klíèe ze serveru klíèù"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "vyhledat klíèe na serveru klíèù"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v¹echny klíèe ze serveru klíèù"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importovat/slouèit klíèe"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "vypsat pouze poøadí paketù"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr ""
 "exportovat hodnoty dùvìryhodnosti\n"
 " vlastníka klíèe"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr ""
 "importovat hodnoty dùvìryhodnosti\n"
 " vlastníka klíèe"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "aktualizovat databázi dùvìry"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "neinteraktivní aktualizace databáze dùvìry"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "opravit naru¹enou databázi dùvìry"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Dekódovat ASCII soubor nebo std. vstup"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Zakódovat soubor nebo std. vstup do ASCII"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]|vypi¹ hash"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -527,214 +527,210 @@ msgstr ""
 "Mo¾nosti:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "vytvoø výstup zakódovaný pomocí ASCII"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|JMÉNO|¹ifrovat pro JMÉNO"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|JMÉNO|pou¾ít JMÉNO jako implicitního adresáta"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr ""
 "pou¾ít implicitní klíè jako implicitního\n"
 " adresáta"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou¾ít tento id u¾ivatele pro podepsání\n"
 " nebo de¹ifrování"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit úrovìò komprimace N (0 - ¾ádná\n"
 " komprimace)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "pou¾ít kanonický textový mód"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "pou¾ít jako výstupní soubor"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "s dodateènými informacemi"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "vùbec nepou¾ívat terminál"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "vynutit podpisy verze 3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "nevynucovat podpisy verze 3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "vynutit podpisy verze 4"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "nevynucovat podpisy verze 4"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "pro ¹ifrování v¾dy pou¾ít MDC"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "pro ¹ifrování nikdy nepou¾ít MDC"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "neprovádìt ¾ádné zmìny"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "pou¾ijte gpg-agenta"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "dávkový re¾im: nikdy se na nic neptat"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "automaticky odpovìdìt ANO na vìt¹inu otázek"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "automaticky odpovìdìt NE na vìt¹inu otázek"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "pøidat tento soubor klíèù do seznamu\n"
 " pou¾ívaných souborù klíèù"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "pøidat tento soubor tajných klíèù do seznamu"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "uka¾ ve kterém souboru klíèù je vypsaný klíè"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|JMÉNO|pou¾ij JMÉNO jako implicitní tajný klíè"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|POÈÍTAÈ|pou¾ij tento server klíèù pro vyhledávání\n"
 " klíèù"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JMÉNO|nastav znakovou sadu terminálu na JMÉNO"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "èíst nastavení ze souboru"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[SOUBOR]|zapi¹ informaci o stavu do SOUBORu"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLÍÈ|úplnì dùvìøovat tomuto klíèi"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|SOUBOR|nahrát roz¹iøující modul SOUBOR"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emulovat mód popsaný v RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "nastav v¹echny vlastnosti paketù, ¹ifer\n"
 " a hashù jako v OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "nastav v¹echny vlastnosti paketù, ¹ifer\n"
 " a hashù jako v PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|pou¾ít mód hesla N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|pou¾ít hashovací algoritmus ALG pro hesla"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|pou¾ít ¹ifrovací algoritmus ALG pro hesla"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou¾ít ¹ifrovací algoritmus ALG"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou¾ít hashovací algoritmus ALG"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou¾ít kompresní algoritmus N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "zahodit identifikátor klíèe z ¹ifrovaných\n"
 " paketù"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Zobrazit fotografický ID"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazovat fotografický ID"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Nastavit pøíkazový øádek k prohlí¾ení\n"
 " fotografického ID"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|JMÉNO=HODNOTA|pou¾ít tento zápis dat"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -742,7 +738,7 @@ msgstr ""
 "@\n"
 "(Pou¾ijte manuálové stránky pro kompletní seznam v¹ech pøíkazù a mo¾ností)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -760,17 +756,17 @@ msgstr ""
 " --list-keys [jména]        vypsat klíèe\n"
 " --fingerprint [jména]      vypsat fingerprinty \n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby oznamte, prosím, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pøipomínky k pøekladu <translations.cs@gnupg.cz>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -780,7 +776,7 @@ msgstr ""
 "podepsat, ovìøit, ¹ifrovat nebo de¹ifrovat\n"
 "implicitní operace závisí na vstupních datech\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -788,265 +784,277 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "u¾ití: gpg [mo¾nosti]"
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "konfliktní pøíkazy\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZNÁMKA: neexistuje implicitní soubor s mo¾nostmi `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo¾nostmi `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "ètu mo¾nosti z `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s není platná znaková sada\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "nelze pou¾ít URI serveru klíèù - chyba analýzy URI\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "VAROVÁNÍ: pou¾ívání paralteru %s se nedoporuèuje.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "pu¾íjte místo nìj \"--keyserver-options %s\" \n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s pøepí¹e %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno pou¾ívat %s s %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 mù¾ete vytváøet pouze oddìlené podpisy nebo podpisy èitelné "
 "jako text\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v módu --pgp2 nelze souèasnì ¹ifrovat a podepisovat\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "¹ifrování zpráv v módu --pgp2 vy¾aduje algoritmus IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "tato zpráva není pro PGP 2.x pou¾itelná\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný ¹ifrovací algoritmus je neplatný\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "zadané URL pro podepisovací politiku je neplatné\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "zadané URL pro certifikaèní politiku je neplatné\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompresní algoritmus musí být v rozmezí %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "polo¾ka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dùraznì nedoporuèován\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatná implicitní úroveò kontroly; musí být 0, 1, 2 nebo 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "neplatné pøedvolby \n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "neplatné pøedvolby \n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "neplatné pøedvolby \n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "neplatné pøedvolby \n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi dùvìry: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [jméno souboru]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jméno souboru]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jméno souboru]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [jméno souboru]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jméno souboru]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jméno souboru]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jméno souboru]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jméno souboru]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key id u¾ivatele"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u¾ivatele"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u¾ivatele"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u¾ivatele"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u¾ivatele [pøíkazy]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nelze otevøít %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Zaènìte psát svou zprávu ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otevøít `%s'\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "první znak jména musí být písmeno nebo podtr¾ítko\n"
-
-#: g10/g10.c:2319
-msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "jméno mù¾e obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka a konèit "
 "s '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "teèky ve jménì musí být obklopeny jinými znaky\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "zadané URL pro certifikaèní politiku je neplatné\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "zadané URL pro podepisovací politiku je neplatné\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1143,11 +1151,13 @@ msgid "User ID is no longer valid"
 msgstr "Identifikátor u¾ivatele ji¾ neplatí"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Dùvod pro revokaci: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Revokaèní poznámka: "
 
 #. a string with valid answers
@@ -1340,22 +1350,22 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Není jisté, zda tento podpis patøí vlastníkovi.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pøeskoèeno: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pøeskoèeno: veøejný klíè je ji¾ obsa¾en v databázi\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifikátor u¾ivatele (user ID). Mù¾ete pou¾ít \"-r\"\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1363,121 +1373,131 @@ msgstr ""
 "\n"
 "Napi¹te identifikátor u¾ivatele (user ID). Ukonèete prázdným øádkem: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Takový identifikátor u¾ivatele neexistuje.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pøeskoèeno: veøejný klíè je u¾ nastaven podle implicitního adresáta\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Veøejný klíè je neplatný (disabled).\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "pøeskoèeno: veøejný klíè je ji¾ nastaven\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "neznámý implicitní adresát `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pøeskoèeno: veøejný klíè je neplatný (disabled)\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "¾ádné platné adresy\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "pøedvolba %c%lu není platná\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "duplicita pøedvolby %c%lu\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "pøíli¹ mnoho `%c' pøedvoleb\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "neplatný znak v øetìzci s pøedvolbami\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "zapisuji podpis klíèe sebou samým\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "zapisuji podpis klíèe sebou samým\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná délka klíèe; pou¾iji %u bitù\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "délka klíèe zaokrouhlena na %u bitù\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh klíèe, který chcete:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitní)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro ¹ifrování)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (pro ¹ifrování a podpis)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro ¹ifrování)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (pro ¹ifrování a podpis)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Vá¹ výbìr? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Pou¾ití tohoto algoritmu se ji¾ nedoporuèuje - chcete ho pøesto vytvoøit? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Neplatný výbìr.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1490,21 +1510,21 @@ msgstr ""
 "                      implicitní velikost klíèe je 1024 bitù\n"
 "             nejvy¹¹í navrhovaná velikost klíèe je 2048 bitù\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Jakou velikost klíèe si pøejete? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klíè DSA musí mít velikost od 512 do 1024 bitù.\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "velikost klíèe je pøíli¹ malá; minimální dovolená velikost pro RSA je 1024 "
 "bitù.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "velikost klíèe je pøíli¹ malá; minimální dovolená velikost je 768 bitù.\n"
@@ -1517,12 +1537,12 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "velikost klíèe je pøíli¹ velká; maximální dovolená hodnota je %d.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1530,11 +1550,11 @@ msgstr ""
 "Velikosti klíèe vìt¹í jak 2048 bitù se nedoporuèují, proto¾e\n"
 "výpoèty pak trvají VELMI dlouho!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Opravdu chcete vytvoøit klíè této délky? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1542,17 +1562,17 @@ msgstr ""
 "Dobøe, ale nezapomeòte, ¾e informace mohou být vyzrazeny z poèítaèe také "
 "elektromagnetickým vyzaøováním monitoru nebo klávesnice!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po¾adovaná délka klíèe je %u bitù.\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bitù\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1568,7 +1588,7 @@ msgstr ""
 "      <n>m = doba platnosti klíèe skonèí za n mìsícù\n"
 "      <n>y = doba platnosti klíèe skonèí za n let\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1584,30 +1604,30 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skonèí za n mìsícù\n"
 "      <n>y = doba platnosti podpisu skonèí za n let\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Klíè je platný pro? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platný pro? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "platnost %s neskonèí\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "platnost %s skonèí %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1615,11 +1635,11 @@ msgstr ""
 "Vá¹ systém neumí zobrazit data po roce 2038.\n"
 "V ka¾dém pøípadì budou data korektnì zpracovávána do roku 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Je to správnì (a/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1635,44 +1655,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Jméno a pøíjmení: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve jménì\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Jméno nemù¾e zaèínat èíslicí\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jméno musí být dlouhé alespoò 5 znakù\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Komentáø: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentáøi\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou¾íváte znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1683,29 +1703,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jméno nebo komentáø nepi¹te, prosím, e-mailovou adresu.\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmìnit (J)méno, (K)omentáø, (E)-mail nebo (U)konèit? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmìnit (J)méno, (K)omentáø, (E)-mail, (P)okraèovat dál nebo (U)konèit "
 "program? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Nejdøív, prosím, opravte chybu\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1713,16 +1733,16 @@ msgstr ""
 "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo není zopakováno správnì; zkuste to znovu"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1734,7 +1754,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1747,53 +1767,53 @@ msgstr ""
 "pou¾ívat disky); díky tomu má generátor lep¹í ¹anci získat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Pár klíèù DSA bude dlouhý 1024 bitù.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Vytváøení klíèe bylo zru¹eno.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji veøejný klíè do `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajný klíè do `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor veøejných klíèù (pubring): %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor tajných klíèù (secring): %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pøi zápisu do souboru veøejných klíèù `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pøi zápisu do souboru tajných klíèù `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "veøejný a tajný klíè byly vytvoøeny a podepsány.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "klíè oznaèen jako absolutnì dùvìryhodný.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1801,12 +1821,12 @@ msgstr ""
 "Tento klíè nemù¾e být pou¾itý pro ¹ifrování. K vytvoøení\n"
 "sekundárního klíèe pro tento úèel mù¾ete pou¾ít pøíkaz \"--edit-key\".\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoøení klíèe se nepodaøilo: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1814,7 +1834,7 @@ msgstr ""
 "klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n"
 "je problém se systémovým èasem)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1822,85 +1842,95 @@ msgstr ""
 "klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n"
 "je problém se systémovým èasem)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZNÁMKA: vytvoøení podklíèe pro klíèe v3 není v souladu s OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Opravdu vytvoøit? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento pøíkaz není platný\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji¾ zakomprimován\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nemohu otevøít: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pøi vytváøení hesla: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VAROVÁNÍ: soubor je prázdný\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 mù¾ete ¹ifrovat pouze RSA klíèem o délce 2048 bitù a ménì\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "ètu z `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nelze pou¾ít pro v¹echny klíèe, pro které ¹ifrujete.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "POZNÁMKA: v pøedvolbách nenalezen ¹ifrovací algoritmus %d\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s za¹ifrovaný pro: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "klíè `%s' nenalezen: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pøi ètení bloku klíèe: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klíè %08lX: není ve formátu RFC 2440 - pøeskoèeno\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klíè %08lX: není chránìný - pøeskoèeno\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klíè %08lX: PGP 2.x klíè - pøeskoèeno\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
 
@@ -1910,23 +1940,23 @@ msgstr "pøíli¹ mnoho polo¾ek v bufferu veøejých klíèù - vypnuto\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User ID not found]"
 
 # c-format
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatný klíè %08lX zmìnìn na platný pomocí --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "pou¾ívám sekundární klíè %08lX místo primárního klíèe %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klíè %08lX: tajný klíè bez klíèe veøejného - pøeskoèeno\n"
@@ -2006,182 +2036,187 @@ msgstr "  importované tajné klíèe: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajné klíèe nezmìnìny: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "klíè %08lX: neplatná vazba podklíèe\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klíè %08lX: chybí identifikátor u¾ivatele\n"
 
 # c-format
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "klíè %08lX: pøijat id u¾ivatele '%s',který není podepsán jím samým\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klíè %08lX: chybí platný identifikátor u¾ivatele\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mù¾e to být zpùsobeno chybìjícím podpisem klíèe jím samým\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klíè %08lX: veøejný klíè nenalezen: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klíè %08lX: nový klíè - pøeskoèen\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor klíèù (keyring): %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pøi zápisu souboru klíèù (keyring)  `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "klíè %08lX: veøejný klíè importován\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klíè %08lX: neodpovídá na¹í kopii\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klíè %08lX: nemohu najít originální blok klíèe: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klíè %08lX: nemohu èíst originální blok klíèe: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "klíè %08lX: 1 nový identifikátor u¾ivatele\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "klíè %08lX: %d nových identifikátorù u¾ivatele\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "klíè %08lX: 1 nový podpis\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "klíè %08lX: %d nových podpisù\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "klíè %08lX: 1 nový podklíè\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "klíè %08lX: %d nových podklíèù\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "klíè %08lX: beze zmìn\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "není nastaven implicitní soubor tajných klíèù %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "klíè %08lX: tajný klíè importován\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "klíè %08lX: je ji¾ v souboru tajných klíèù\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klíè %08lX: nenalezen tajný klíè: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klíè %08lX: chybí veøejný klíè - nemohu aplikovat revokaèní certifikát\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - zamítnuto\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "klíè %08lX: revokaèní certifikát importován\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klíè %08lX: neexistuje id u¾ivatele pro podpis\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "klíè %08lX: nepodporovaný algoritmus veøejného klíèe u u¾ivatelského id \"%s"
 "\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr ""
 "klíè %08lX: neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klíè %08lX: neexistuje podklíè pro vázání klíèù\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "klíè %08lX: nepodporovaný algoritmus veøejného klíèe\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klíè %08lX: neplatná vazba podklíèe\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klíè %08lX: identifikátor u¾ivatele pøeskoèen '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klíè %08lX: podklíè pøeskoèen\n"
@@ -2190,109 +2225,129 @@ msgstr "klíè %08lX: podklíè pøeskoèen\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klíè %08lX: podpis není exportovatelný (tøída %02x) - pøeskoèeno\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "klíè %08lX: revokaèní certifikát na ¹patném místì - pøeskoèeno \n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - pøeskoèen\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "klíè %08lX: objeven duplikovaný identifikátor u¾ivatele - slouèen\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "VAROVÁNÍ: klíè %08lX mù¾e být revokován: zkou¹ím získat revokaèní klíè %"
 "08lX\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "VAROVÁNÍ: klíè %08lX mù¾e být revokován: revokaèní klíè %08lX nenalezen.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "klíè %08lX: pøidán revokaèní certifikát\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "klíè %08lX: podpis klíèe jím samým (direct key signature)\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[podpis klíèe jím samým]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 ¹patný podpis\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ¹patných podpisù\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neovìøen, proto¾e chybí klíè\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisù neovìøených, proto¾e chybí klíè\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neovìøen, proto¾e vznikla chyba\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisù neovìøených, proto¾e vznikly chyby\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifikátor u¾ivatele bez platného podpisu jím samým\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifikátorù u¾ivatele bez platného podpisu jím samým\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U¾ivatelské ID \"%s\" je revokováno."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jistý(á), ¾e stále chcete podpsat tento klíè? (a/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Va¹ souèasný podpis na \"%s\"\n"
+"je pouze lokální.\n"
+"\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Pøejete si jej zmìnit na plnì exportovatelný podpise? (a/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2302,50 +2357,50 @@ msgstr ""
 "je pouze lokální.\n"
 "\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Pøejete si jej zmìnit na plnì exportovatelný podpise? (a/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" je ji¾ lokálnì podepsán klíèem %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" je ji¾ podepsán klíèem %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nic k podepsání klíèem %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Platnost klíèe vypr¹ela!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost klíèe vypr¹í %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va¹eho podpisu vypr¹ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nemù¾ete udìlat OpenPGP podpis klíèe typu PGP 2.x, kdy¾ jste v --pgp2 módu.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zpùsobilo nepou¾itelnost klíèe v PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2355,27 +2410,27 @@ msgstr ""
 "patøí vý¹e uvedené osobì.\n"
 "Pokud neznáte odpovìï, zadejte \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpovím.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Èáseènì jsem to ovìøil(a).%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi peèlivì jsem to ovìøil(a).%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2383,7 +2438,33 @@ msgstr ""
 "Jste si jistý(á), ¾e chcete podepsat tento klíè\n"
 "svým klíèem: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "mù¾e to být zpùsobeno chybìjícím podpisem klíèe jím samým\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Podpis bude oznaèen jako neexportovatelný.\n"
+"\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Podpis bude oznaèen jako neodvolatelný (non-revocable).\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2392,7 +2473,7 @@ msgstr ""
 "Podpis bude oznaèen jako neexportovatelný.\n"
 "\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2400,7 +2481,7 @@ msgstr ""
 "\n"
 "Podpis bude oznaèen jako neodvolatelný (non-revocable).\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2408,7 +2489,7 @@ msgstr ""
 "\n"
 "Nijak jsem tento klíè neovìøil.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2416,7 +2497,7 @@ msgstr ""
 "\n"
 "Èásteènì jsem ovìøil tento klíè.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2424,33 +2505,33 @@ msgstr ""
 "\n"
 "Velmi peèlivì jsem ovìøil tento klíè.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Skuteènì podepsat? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Tento klíè není chránìný.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajné èásti primárního klíèe nejsou dostupné.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Klíè je chránìný.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Není mo¾né editovat tento klíè: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2458,7 +2539,7 @@ msgstr ""
 "Vlo¾te nové heslo (passphrase) pro tento tajný klíè.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2466,469 +2547,468 @@ msgstr ""
 "Nechcete heslo - to *není* dobrý nápad!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Opravdu to chcete udìlat? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "pøesunuji podpis klíèe na správné místo\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "ukonèit toto menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "u"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "ulo¾it"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "ulo¾it a ukonèit"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "vypsat seznam klíèù a id u¾ivatelù"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "vyberte identifikátor u¾ivatele N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "vyberte sekundární klíè N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "vypsat seznam podpisù"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "podepsat klíè"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "podepsat klíè lokálnì"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "podepsat klíè lokálnì a  bez mo¾nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "pøidat identifikátor u¾ivatele"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "pøidat fotografický ID"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "smazat identifikátor u¾ivatele"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "pøidat sekundární klíè"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "smazat sekundární klíè"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "pøidat sekundární klíè"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "smazat podpisy"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "zmìnit dobu platnosti"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "oznaèit u¾ivatelské ID jako primární"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "pøepnout mezi vypsáním seznamu tajných a veøejných klíèù"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "vypsat seznam pøedvoleb (pro experty)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam pøedvoleb (podrobnì)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "nastavit seznam pøedvoleb"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "aktualizovat pøedvolby"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "zmìnit heslo"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "zmìnit dùvìryhodnost vlastníka klíèe"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revokovat sekundární klíè"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "nastavit klíè jako neplatný (disable)"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "nastavit klíè jako platný (enable)"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "ukázat fotografický ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "nelze provést v dávkovém módu\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "chyba pøi ètení bloku tajného klíèe `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Tajný klíè je dostupný.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Pøíkaz> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Pro provedení této operace je potøeba tajný klíè.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Prosím, nejdøíve pou¾ijte pøíkaz \"toggle\" (pøepnout).\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Klíè revokován."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Opravdu podepsat v¹echny id u¾ivatele? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápovìda: Vyberte id u¾ivatele k podepsání\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pøíkaz není v módù %s dovolený.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Musíte vybrat alespoò jeden id u¾ivatele.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Opravdu odstranit tento id u¾ivatele? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrat alespoò jeden klíè.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Opravdu chcete smazat vybrané klíèe? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Opravdu chcete smazat tento klíè? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Opravdu chcete revokovat vybrané klíèe? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Opravdu chcete revokovat tento klíè? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Opravdu aktualizovat pøedvoleby pro vybraný id u¾ivatele? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Opravdu aktualizovat pøedvolby? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Ulo¾it zmìny? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Ukonèit bez ulo¾ení? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajného klíèe selhala: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Klíè nebyl zmìnìn, tak¾e není potøeba jej aktualizovat.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný pøíkaz (zkuste \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Tento klíè mù¾e být revokován %s klíèem %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  vytvoøen: %s platnost skonèí: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr "dùvìra: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Tento klíè byl oznaèen za neplatný (disabled)"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! podklíè byl revokován: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- nalezena padìlaná revokace\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problém ovìøení revokace: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Prosím nezapomeòte, ¾e zobrazované údaje o platnosti klíèù nemusí\n"
 "být správné, dokud znova nespustíte program.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"VAROVÁNÍ: Tento klíè ji¾ obsahuje fotografický ID.\n"
-"         Pøidání dal¹í fotografie mù¾e zmást nìkteré verze PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Jste si jistý, ¾e jej chcete stále pøidat? (a/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Mìli byste mít jen jeden fotografický ID na klíèi.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2937,83 +3017,109 @@ msgstr ""
 "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání fotografického ID mù¾e v nìkterých\n"
 "         verzích PGP vést k odmítnutí tohoto klíèe.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Jste si jistý, ¾e jej chcete stále pøidat? (a/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemìli by jste pøidávat fotografický ID k PGP2 klíèi.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smazán %d podpis.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smazáno %d podpisù.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaznáno.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Vlo¾te délku klíèe"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosím, odstraòte výbìr z tajných klíèù.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Mìním dobu platnosti sekundárního klíèe.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mìním dobu platnosti primárního klíèe.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemù¾ete zmìnit dobu platnosti klíèe verze 3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajných klíèù chybí odpovídající podpis\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr ""
+"klíè %08lX: neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekundární klíè s indexem %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "id u¾ivatele: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3022,7 +3128,7 @@ msgstr ""
 "\"\n"
 "podepsáno Va¹ím klíèem %08lX v %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3031,243 +3137,251 @@ msgstr ""
 "\"\n"
 "lokálnì podepsáno Va¹ím klíèem %08lX v %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr¹í %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jistý, ¾e jej chcete stále revokovat? (a/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoøit pro tento podpis revokaèní certifikát? (a/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Podepsal(a) jste následující identifikátory u¾ivatele:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   podepsáno %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokováno %08lX v %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   podepsáno %08lX v %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (nexeportovatelné)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíè\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 "Zobrazuji %s fotografický ID o velikosti %ld pro klíè 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Podepisovací politika: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Podepisovací politika: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu datumu\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Podepisovací notace: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Podepisovací notace: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "není v pøímo èitelném formátu"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "soubor klíèù (keyring)"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [platnost skonèí: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Miniatura (fingerprint):"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "             Fingerprint:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "   Fingerprint klíèe ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za¹ifrovaná data\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za¹ifrováno neznámým algoritmem %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "veøejný klíè je %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za¹ifrována veøejným klíèem: správný DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "za¹ifrována %u-bitovým %s klíèem, ID %08lX, vytvoøeným %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "za¹ifrováno %s klíèem, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de¹ifrování veøeným klíèem selhalo: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "pøedpokládám %s ¹ifrovaných dat\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA není dostupný; optimisticky se jej pokusíme nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "de¹ifrování o.k.\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVÁNÍ: se za¹ifrovanou zprávou bylo manipulováno!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de¹ifrování selhalo: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZNÁMKA: odesílatel po¾adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pùvodní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatný revokaèní certifikát -  pou¾ijte \"gpg --import\", chcete-li jej "
 "u¾ít\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notace: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Politika: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potlaèena\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "neumím pracovat s tìmito násobnými podpisy\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Podpis vytvoøen %.*s pomocí %s klíèe s identifikátorem u¾ivatele %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "©PATNÝ podpis od \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Podpis s vypr¹enou platností od \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[nejistý]  "
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ovìøit podpis: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "toto není podpis oddìlený od dokumentu\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis tøídy 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatný koøenový paket v proc_tree()\n"
 
@@ -3286,32 +3400,47 @@ msgstr ""
 "tento ¹ifrovací algoritmus se nedoporuèuje; prosím, pou¾ijte nìjaký "
 "standardnìj¹í!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROVÁNÍ: vlastnictví pro %s nastaveno nebezpeènì \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVÁNÍ: pøístupová práva pro %s nejsou nastavena bezpeènì \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "více informací naleznete v dokumentu http://www.gnupg.cz/why-not-idea.html\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "VAROVÁNÍ: pou¾ívání paralteru %s se nedoporuèuje.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROVÁNÍ: pou¾ívání paralteru %s se nedoporuèuje.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "pu¾íjte místo nìj \"--keyserver-options %s\" \n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem veøejného klíèe %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
@@ -3454,34 +3583,39 @@ msgstr "chybí podepsaná data\n"
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otevøít podepsaná data '%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonymní adresát; zkou¹ím tajný klíè %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymní adresát.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "staré kódování DEK není podporováno\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "¹ifrovací algoritmus %d%s je neznámý nebo je zneplatnìn\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "POZNÁMKA: v pøedvolbách nenalezen ¹ifrovací algoritmus %d\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "POZNÁMKA: platnost tajného klíèe %08lX skonèila %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "klíè %08lX: klíè byl revokován\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3508,12 +3642,16 @@ msgstr "úspì¹né odeslání na `%s' (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "chyba odeslání na `%s': (status=%u)\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "vyhledávám \"%s\" na HKP serveru %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nemohu prohledávat server klíèù: %s\n"
@@ -3572,7 +3710,14 @@ msgstr "POZNÁMKA: podpisovému klíèi %08lX skonèila platnost %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "pøedpokládám ¹patný podpis, proto¾e je nastaven neznámý kritický bit\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"VAROVÁNÍ: nemohu %%-expandovat URL politiky (pøíli¹ dlouhé). Pou¾ity "
+"neexpandované.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3580,40 +3725,46 @@ msgstr ""
 "VAROVÁNÍ: nemohu %%-expandovat URL politiky (pøíli¹ dlouhé). Pou¾ity "
 "neexpandované.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoøeného podpisu se nepodaøila: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis od: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVÁNÍ: soubor `%s' je prázdný\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "v módu --pgp2 mù¾ete pouze podepisovat s klíèi formátu PGP-2.x\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: nemohu vytvoøit: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "POZNÁMKA: v pøedvolbách nenalezen ¹ifrovací algoritmus %d\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 mù¾ete vytváøet jen èitelné podpisy s klíèi formátu PGP-2.x\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou¾ito ¹ifrování %s\n"
@@ -3841,27 +3992,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupní øádek %u je pøíli¹ dlouhý nebo na konci chybí znak LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klíè není oznaèen jako nedostateènì bezpeèný - nemohu jej pou¾ít s padìlaným "
 "RNG!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "pøeskoèen `%s': duplikován\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pøeskoèen `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "pøeskoèeno: tajný klíè je u¾ v databázi\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4057,16 +4208,23 @@ msgstr ""
 "proto¾e nejsou podporovány v¹emi programy a podpisy jimi vytvoøené\n"
 "jsou znaènì velké a pro ovìøení velmi pomalé."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Vlo¾te délku klíèe"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpovìzte \"ano\" nebo \"ne\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4078,19 +4236,19 @@ msgstr ""
 "správnou chybovou hlá¹ku - místo toho systém zkusí interpretovat\n"
 "zadanou hodnotu jako interval."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Vlo¾te jméno dr¾itele klíèe"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "prosím, vlo¾te e-mailovou adresu (nepovinné, ale velmi doporuèované)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Prosím, vlo¾te nepovinný komentáø"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4104,11 +4262,11 @@ msgstr ""
 "O  pro pokraèování generování klíèe.\n"
 "Q  pro ukonèení generování klíèe."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jestli¾e chcete generovat podklíè, odpovìzte \"ano\" (nebo jen \"a\")."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4181,12 +4339,12 @@ msgstr ""
 "\n"
 "Pokud nevíte, jaká je správná odpovìï, odpovìzte \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr ""
 "Pokud chcete podepsat V©ECHNY identifikátory u¾ivatelù, odpovìzte \"ano\""
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4195,11 +4353,11 @@ msgstr ""
 "\".\n"
 "V¹echny certifikáty budou také ztraceny!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpovìzte \"ano\", pokud chcete smazat podklíè"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4209,7 +4367,7 @@ msgstr ""
 "proto¾e mù¾e být dùle¾itý pøi vytváøení dùvìry klíèe nebo jiného klíèe\n"
 "ceritifikovaného tímto klíèem."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4221,13 +4379,13 @@ msgstr ""
 "byl pou¾it, proto¾e tento podpisovací klíè mù¾e vytvoøit dùvìru\n"
 "prostøednictvím jiného ji¾ certifikovaného klíèe."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatný. Je rozumné ho odstranit z Va¹eho souboru klíèù."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4240,7 +4398,7 @@ msgstr ""
 "pou¾ívat. Udìlejte to jenom v pøípadì, kdy je tento podpis klíèe\n"
 "jím samým z nìjakého dùvodu neplatný a kdy je k dipozici klíè jiný."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4250,25 +4408,25 @@ msgstr ""
 "na aktuální seznam pøedvoleb. Èasová razítka v¹ech dotèených podpisù\n"
 "klíèù jimi samotnými budou posunuty o jednu vteøinu dopøedu.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Prosím, vlo¾te heslo; toto je tajná vìta \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Prosím, zopakujte poslední heslo, abyste si byl(a) jistý(á), co jste napsal"
 "(a)."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadejte název souboru, ke kterému se podpis vztahuje"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Pokud si pøejete pøepsání souboru, odpovìzte \"ano\""
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4276,7 +4434,7 @@ msgstr ""
 "Prosím, vlo¾te nový název souboru. Pokud pouze stisknete RETURN, bude\n"
 "pou¾it implicitní soubor (který je ukázán v závorkách)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4304,7 +4462,7 @@ msgstr ""
 "      Toto pou¾ijte, pokud by se identifikátor u¾ivatele u¾ nemìl pou¾ívat;\n"
 "      normálnì se pou¾ívá k oznaèení neplatné e-mailové adresy.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4314,11 +4472,11 @@ msgstr ""
 "ceritifikátu. Prosím, struènì. \n"
 "Text konèí prázdným øádkem.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Pomoc není k dispozici"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc není dostupná pro '%s'"
@@ -4380,3 +4538,23 @@ msgstr "%lu klíèù zkontrolován (%lu podpisù)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor klíèù (keyring) vytvoøen\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|JMÉNO=HODNOTA|pou¾ít tento zápis dat"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "první znak jména musí být písmeno nebo podtr¾ítko\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "teèky ve jménì musí být obklopeny jinými znaky\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "VAROVÁNÍ: Tento klíè ji¾ obsahuje fotografický ID.\n"
+#~ "         Pøidání dal¹í fotografie mù¾e zmást nìkteré verze PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Mìli byste mít jen jeden fotografický ID na klíèi.\n"
diff --git a/po/da.po b/po/da.po
index 3129218f2..1ca03380f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -47,7 +47,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "afslut"
 
@@ -277,7 +277,7 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
@@ -342,7 +342,7 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -353,7 +353,7 @@ msgstr ""
 "Ikke nok tilfældige byte tilgængelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Kræver %d byte mere)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +361,170 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "kryptér data"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "kryptér kun med symmetriske cifre"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "afkryptér data (standard)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "vis nøgler og signaturer"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "tjek nøglesignaturer"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "vis nøgle og fingeraftryk"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "generér et nyt nøglepar"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgle fra den offentlige nøglering"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgle fra den hemmelige nøglering"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "signér en nøgle"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "signér eller redigér en nøgle"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "eksportér nøgler"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importér/fusionér nøgler"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "eksportér ejertillidsværdierne"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importér ejertillidsværdierne"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "reparér en ødelagt tillidsdatabase"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresumé"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,208 +534,204 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|kryptér for NAME"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "brug standard nøglen som standard modtager"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sæt kompresningsniveau N (0 = slået fra)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "vær mere stille"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "kørselsmodus: spørg aldrig"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste sprøgsmål"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste sprøgsmål"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "tilføj denne nøglering til nøgleringslisten"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "tilføj denne hemmeligenøglering til listen"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelignøgle"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne nøgletjener til at slå nøgler op"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|sæt terminal karaktersæt til NAME"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "læs indstillinger fra fil"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indlæs udvidelsesmodul FILE"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emulér modusen beskrevet i RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "sæt alle pakker, cifre og resumé flag til OpenPGP standard"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "sæt alle pakker, cifre og resumé flag til OpenPGP standard"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resuméalgoritme NAME for pasfrase"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresumé algoritme NAME"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAME=VALUE|brug denne notationsdata"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,16 +751,16 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
 # Skal alt dette oversættes eller er det flagene?
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +770,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afhænger af inddata\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,271 +778,279 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "læser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "ADVARSEL: '%s' er en tom fil\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:1492
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "den givne politik-URL er ugyldig\n"
-
-#: g10/g10.c:1496
+#: g10/g10.c:1613
 #, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "den givne politik-URL er ugyldig\n"
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "vis præferencer"
+
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "vis præferencer"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "vis præferencer"
+
+#: g10/g10.c:1667
 #, fuzzy
-msgid "invalid preferences\n"
+msgid "invalid personal compress preferences\n"
 msgstr "vis præferencer"
 
 # er det klogt at oversætte TrustDB?
-#: g10/g10.c:1613
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke åbne %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [nøglering]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke åbne `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"første bogstav af en notationsnavn skal være et bogstave eller en "
-"understregning\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
-msgstr ""
-
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
+#: g10/g10.c:2520
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "den givne politik-URL er ugyldig\n"
+
+#: g10/g10.c:2522
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "den givne politik-URL er ugyldig\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1142,11 +1146,12 @@ msgid "User ID is no longer valid"
 msgstr ""
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
-msgstr ""
+#, fuzzy
+msgid "reason for revocation: "
+msgstr "rev- forkert nøgletilbagekald\n"
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+msgid "revocation comment: "
 msgstr ""
 
 #. a string with valid answers
@@ -1329,145 +1334,155 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilhører ejeren.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig nøgle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Offentlig nøgle er slået fra.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlignøgle er slået fra\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "vis præferencer"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "skriver selvsignatur\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signér kun)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (kryptér kun)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (signér kun)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (kryptér kun)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (signér og kryptér)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1476,19 +1491,19 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken nøglestørrelse ønsker du? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
@@ -1500,38 +1515,38 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1541,7 +1556,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1551,42 +1566,42 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1596,44 +1611,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal være mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegnsættet.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1644,28 +1659,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1673,17 +1688,17 @@ msgstr ""
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1691,7 +1706,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1699,153 +1714,163 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA nøglepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af nøglering `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af nøglering `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr ""
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan ikke åbne: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodesætning: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "læser fra '%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1855,22 +1880,22 @@ msgstr ""
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -1950,177 +1975,182 @@ msgstr "hemmelige nøgler import: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige nøgler uændre: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr ""
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af nøglering `%s': %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af nøglering `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nøgle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nøgle %08lX: kan ikke lokalisere original nøgleblok: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nøgle %08lX: kan ikke læse original nøgleblok: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
-msgstr ""
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
+msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
-msgstr ""
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
+msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
-msgstr ""
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
+msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
-msgstr ""
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
+msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
-msgstr ""
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
+msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
-msgstr ""
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
+msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
-msgstr ""
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
+msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig nøglering\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
-msgstr ""
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
+msgstr "Generér en annullérbar certifikat"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -2129,1065 +2159,1132 @@ msgstr ""
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
-msgstr ""
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
+msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 dårlig signature\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d dårlige signaturer\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:404
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bemærk: Denne nøgle er forældet!\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "skriver selvsignatur\n"
+
+#: g10/keyedit.c:604
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+
+#: g10/keyedit.c:609
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig nøgle ikke tilgængelig"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne nøgle: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne gøre dette?"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "hjælp"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "vis denne hjælp"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "vis nøgler og bruger-id'er"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "nøgle"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "vælg sekundær nøgle N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "signér"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "signér nøglen"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsignér"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "nrsign"
 msgstr "signér"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrlsign"
 msgstr "signér"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "tilføj-bid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "slet bruger id"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "tilføj nøgle"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "tilføj sekundær nøgle"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "sletnøgle"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "slet sekundær nøgle"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "tilføj nøgle"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "tilføj sekundær nøgle"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "udløb"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "ændr udløbsdatoen"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig nøgle visning"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "præf"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "showpref"
 msgstr "vispræf"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "setpref"
 msgstr "præf"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "set preference list"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updpref"
 msgstr "præf"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "ændr kodesætningen"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "slåfra"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "slå nøgle fra"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "slåtil"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "slå nøgle til"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr ""
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Gem ændringer? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1740
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+msgid "This key may be revoked by %s key "
 msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undernøgle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert nøgletilbagekald\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Indtast nøglens størrelse"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundær nøgle med indeks %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "%s signatur fra: %s\n"
+
+#: g10/keylist.c:93
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+msgid "Critical signature notation: "
+msgstr ""
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Fingeraftryk:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "kryptér data"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr ""
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "DÅRLIG signatur fra \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -3204,31 +3301,46 @@ msgstr ""
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -3365,34 +3477,39 @@ msgstr ""
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "nøgle %08lX: nøgle er blevet annulleret!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, fuzzy, c-format
@@ -3419,12 +3536,16 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
@@ -3481,45 +3602,55 @@ msgstr ""
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -3744,26 +3875,26 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr ""
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig nøgle er allerede tilstede\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3925,16 +4056,23 @@ msgid ""
 "with them are quite large and very slow to verify."
 msgstr ""
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Indtast nøglens størrelse"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svar \"ja\" eller \"nej\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3942,19 +4080,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -3963,11 +4101,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4008,28 +4146,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4037,13 +4175,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4052,30 +4190,30 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4083,7 +4221,7 @@ msgstr ""
 "Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
 "forvalgte navn (som er vist i klammer) blive brugt."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4099,18 +4237,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Ingen hjælp tilgængelig"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hjælp tilgængelig for `%s'"
@@ -4173,6 +4311,15 @@ msgstr "vis nøgler og signaturer"
 msgid "%s: keyring created\n"
 msgstr ""
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAME=VALUE|brug denne notationsdata"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "første bogstav af en notationsnavn skal være et bogstave eller en "
+#~ "understregning\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
@@ -4232,10 +4379,6 @@ msgstr ""
 #~ msgid "Good certificate"
 #~ msgstr "Godt certifikat"
 
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (signér og kryptér)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? "
 
diff --git a/po/de.po b/po/de.po
index 1fcfb4668..b40ebec3c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-09 19:41+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -274,7 +274,7 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -340,7 +340,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +352,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[Dateien]|Dateien verschlüsseln"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[Dateien]|Dateien entschlüsseln"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "Signaturen der Schlüssel prüfen"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "Schlüssel nicht widerrufbar signieren"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "Schlüssel nur für diesen Rechner und nicht-widerrufbar signieren"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "unbeaufsichtigtes Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-Hülle befreien"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-Hülle einpacken"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,202 +526,198 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "v3 Signaturen nicht erzwingen"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "v4 Signaturen erzwingen"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "v4 Signaturen nicht erzwingen"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "Beim Verschlüsseln niemals ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "den GPG-Agent verwenden"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[Datei]|Statusinfo in Datei schreiben"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschlüsselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "alle Paket-, Verschlüsselungs- und\n"
 "Hashoptionen auf PGP 2.X-Verhalten einstellen"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl.verfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "Empfänger-ID verschlüsselter Pakete entfernen"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Kommandozeilentext für den Foto-Betrachter setzen"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAME=WERT|diese \"notation\"-Daten verwenden"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -730,7 +726,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -750,17 +746,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -770,7 +766,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten.\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -778,274 +774,283 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "WARNUNG: %s ist eine mißbilligte Option.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "Bitte benutzen Sie stattdessen \"--keyserver-options %s\".\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "Diese Botschaft könnte für PGP 2.x unbrauchbar sein\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren muß im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-check-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "ungültige Voreinstellungen\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "ungültige Voreinstellungen\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "ungültige Voreinstellungen\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "ungültige Voreinstellungen\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"Das erste Zeichen eines \"notation\"-Namens muß ein Buchstabe oder\n"
-"ein Unterstrich sein\n"
-
-#: g10/g10.c:2319
-msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben sein\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1142,11 +1147,13 @@ msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
 #. a string with valid answers
@@ -1348,22 +1355,22 @@ msgstr ""
 "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1371,122 +1378,132 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empfänger '%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "Voreinstellung %c%lu ist nicht gültig\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "Voreinstellung %c%lu ist doppelt\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "zu viele `%c' Voreinstellungen\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "Ungültiges Zeichen in den Voreinstellungen\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "Die Eigenbeglaubigung wird geschrieben\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (signieren/beglaubigen und verschlüsseln)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1499,19 +1516,19 @@ msgstr ""
 "              standard Schlüssellänge ist 1024 Bit\n"
 "      größte sinnvolle Schlüssellänge ist 2048 Bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 1024 ist die kleinste für RSA mögliche Schlüssellänge.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
 
@@ -1523,12 +1540,12 @@ msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Schüsselgröße zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1536,11 +1553,11 @@ msgstr ""
 "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1548,17 +1565,17 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden können.\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1574,7 +1591,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1590,30 +1607,30 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s verfällt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s verfällt am %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1621,11 +1638,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1641,44 +1658,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungültig\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1689,27 +1706,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1717,16 +1734,16 @@ msgstr ""
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1739,7 +1756,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1750,53 +1767,53 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Das DSA-Schlüsselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "Schlüssel ist als uneingeschränkt vertrauenswürdig gekennzeichnet.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1805,12 +1822,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1818,7 +1835,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1826,88 +1843,98 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht geöffnet werden: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur für RSA-Schlüssel mit maximal 2048 Bit "
 "verschlüsselt werden\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "Die IDEA-Verschlüsselung kann nicht mit allen Zielschlüsseln verwendet "
 "werden.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "Schlüssel `%s' nicht gefunden: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "Schlüssel %08lX: dies ist kein RFC2440-Schüssel - übersprungen\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "Schlüssel %08lX: PGP 2.x-artiger Schlüssel - übersprungen\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
@@ -1917,23 +1944,23 @@ msgstr "zu viele Einträge im pk-Cache - abgeschaltet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %08lX, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2015,184 +2042,189 @@ msgstr "           geheime Schlüssel importiert: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schlüssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel importiert\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "Schlüssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "Schlüssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "Schlüssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "Schlüssel %08lX: %d neue Unterschlüssel\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "Schlüssel %08lX: Nicht geändert\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schlüssel %08lX: Kein Unterschlüssel für die Schlüsselanbindung\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schlüssel %08lX: User-ID übergangen '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n"
@@ -2201,110 +2233,130 @@ msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "Schlüssel %08lX: Nicht exportfähige Unterschrift (Klasse %02x) - übergangen\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %08lX: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Warnung: Schlüssel %08lX ist u.U. widerrufen: hole Widerrufschlüssel %08lX\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Warnung: Schlüssel %08lX ist u.U. widerrufen: Widerrufschlüssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "Schlüssel %08lX: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht geprüft\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Die derzeitige Beglaubigung von \"%s\"\n"
+"ist nur für diesen Rechner gültig.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2313,40 +2365,40 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur für diesen Rechner gültig.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen für Schlüssel %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Dieser Schlüssel ist verfallen!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schlüssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2354,11 +2406,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies würde den Schlüssel für PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2368,27 +2420,27 @@ msgstr ""
 "wollen, wirklich der o.g. Person gehört?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es überhaupt nicht überprüft.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es flüchtig überprüft.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgfältig überprüft.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2396,7 +2448,32 @@ msgstr ""
 "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
 "Schlüssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Die Unterschrift wird als nicht exportfähig markiert werden.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Die Unterschrift wird als nicht exportfähig markiert werden.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2404,7 +2481,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2412,7 +2489,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2420,7 +2497,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2428,7 +2505,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schlüssel flüchtig überprüft.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2436,33 +2513,33 @@ msgstr ""
 "\n"
 "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2470,7 +2547,7 @@ msgstr ""
 "Geben Sie das neue Mantra für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2478,471 +2555,469 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Möchten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "Liste der Schlüssel"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "Zweitschlüssel N auswählen"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "Den Schlüssel signieren"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "Den Schlüssel nur für diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "Den Schlüssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "Einen Zweitschlüssel hinzufügen"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "Einen Zweitschlüssel entfernen"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "widerrufen"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "Einen Zweitschlüssel hinzufügen"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "Ändern des Verfallsdatums"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "geänderte Voreinstellungen"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "Das Mantra ändern"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschlüssel widerrufen"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schlüsselblocks `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich ändern? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Dieser Schlüssel könnte von %s key %s%s widerrufen worden sein\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  erstellt: %s verfällt: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschlüssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- gefälschter Schlüsselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"WARNUNG: Dieser Schlüssel besitzt bereits eine Foto-ID.\n"
-"         Ein hinzugefügte Foto-ID könnte einige Versionen von PGP "
-"verwirren.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Sie können nur eine Foto-ID für diesen Schlüssel haben.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2952,83 +3027,108 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen Schlüüsel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Wählen Sie die gewünschte Schlüssellänge"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3037,7 +3137,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3046,240 +3146,248 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 "Anzeigen einer %s Photo ID (%ld Byte) für Schlüssel %08lX (User-ID %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Beglaubigungsrichtlinie: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Beglaubigungs-\"Notation\": "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Schlüsselbund"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verfällt: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Fingerabdruck:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr " Schl.-Fingerabdruck ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften können nicht behandelt werden\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3296,31 +3404,46 @@ msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Warnung: Unsicheres Besitzverhältnis von %s \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warnung: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "Für weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "WARNUNG: %s ist eine mißbilligte Option.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNUNG: %s ist eine mißbilligte Option.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "Bitte benutzen Sie stattdessen \"--keyserver-options %s\".\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -3463,34 +3586,39 @@ msgstr "keine unterschriebene Daten\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "Ungenannter Empfänger; Versuch mit geheimen Schlüssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "Schlüssel %08lX: Schlüssel wurde widerrufen\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3517,12 +3645,16 @@ msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kann Schlüsselserver nicht durchsuchen: %s\n"
@@ -3586,7 +3718,14 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
+"\"unerweiterte\".\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3594,43 +3733,49 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln unterschrieben "
 "werden\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schlüssel machen\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
@@ -3863,27 +4008,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "übersprungen '%s': doppelt\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "übersprungen '%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4094,16 +4239,23 @@ msgstr ""
 "Außerdem sind damit ezeugte Unterschriften recht groß und ihre Überprüfung\n"
 "ist langsam."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Wählen Sie die gewünschte Schlüssellänge"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Geben Sie \"ja\" oder \"nein\" ein"
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4115,21 +4267,21 @@ msgstr ""
 "erhält dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n"
 "der Rechner den Wert als Intervall (von-bis) zu deuten."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n"
 "aber sehr empfehlenswert."
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4143,12 +4295,12 @@ msgstr ""
 "F  um mit der Schlüsselerzeugung fortzusetzen.\n"
 "B  um die Schlüsselerzeugung abbrechen."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4223,11 +4375,11 @@ msgstr ""
 "\n"
 "Wenn Sie nicht wissen, wie Sie antworten sollen, wählen Sie \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4235,12 +4387,12 @@ msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
 "Alle Zertifikate werden dann auch weg sein!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4252,7 +4404,7 @@ msgstr ""
 "Schlüssel\n"
 "herzustellen."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4265,7 +4417,7 @@ msgstr ""
 "sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
 "diese Beglaubigung den \"Trust\"-Weg kompletieren."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4273,7 +4425,7 @@ msgstr ""
 "Diese Beglaubigung ist ungültig. Es ist sinnvoll sie aus Ihrem\n"
 "Schlüsselbund zu entfernen."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4289,7 +4441,7 @@ msgstr ""
 "irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
 "ist."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4300,27 +4452,27 @@ msgstr ""
 "betroffenen\n"
 "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Um sicher zu gehen, daß Sie sich bei der Eingabe des Mantras nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "übereinstimmen, wird das Mantra akzeptiert."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehört"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4329,7 +4481,7 @@ msgstr ""
 "Eingabetaste betätigen, wird der (in Klammern angezeigte) Standarddateiname\n"
 "verwendet."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4357,7 +4509,7 @@ msgstr ""
 "      Um bekanntzugeben, daß die User-ID nicht mehr benutzt werden soll.\n"
 "      So weist man normalerweise auf eine ungültige E-Mailadresse hin.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4367,11 +4519,11 @@ msgstr ""
 "Sie diesen Widerruf herausgeben.  Der Text sollte möglichst knapp sein.\n"
 "Eine Leerzeile beendet die Eingabe.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
@@ -4434,6 +4586,31 @@ msgstr "%lu Schlüssel geprüft (%lu Beglaubigungen)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAME=WERT|diese \"notation\"-Daten verwenden"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "Das erste Zeichen eines \"notation\"-Namens muß ein Buchstabe oder\n"
+#~ "ein Unterstrich sein\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben "
+#~ "sein\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "WARNUNG: Dieser Schlüssel besitzt bereits eine Foto-ID.\n"
+#~ "         Ein hinzugefügte Foto-ID könnte einige Versionen von PGP "
+#~ "verwirren.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Sie können nur eine Foto-ID für diesen Schlüssel haben.\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Sind Sie sicher, daß Sie dies wiklich unterschreiben möchten?\n"
 
@@ -4709,9 +4886,6 @@ msgstr "%s: Schlüsselbund erstellt\n"
 #~ msgid "For info see http://www.gnupg.org"
 #~ msgstr "Weitere Infos: siehe http://www.gnupg.org"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (signieren/beglaubigen und verschlüsseln)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr ""
 #~ "Möchten Sie wirklich einen Unterschriften-/Verschlüsselungschlüssel "
@@ -4738,9 +4912,6 @@ msgstr "%s: Schlüsselbund erstellt\n"
 #~ msgid "invalid"
 #~ msgstr "ungültig"
 
-#~ msgid "revoked"
-#~ msgstr "widerrufen"
-
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "RSA-Schlüssel können in dieser Version nicht verwendet werden\n"
 
diff --git a/po/el.po b/po/el.po
index c3155828c..343bec10b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-29 13:24+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -45,7 +45,7 @@ msgstr "ü÷é"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "ôåñìáôéóìüò"
 
@@ -272,7 +272,7 @@ msgstr "... áõôü åßíáé bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "âñÞêáôå Ýíá bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n"
@@ -338,7 +338,7 @@ msgstr ""
 "ÌÇ ×ÑÇÓÉÌÏÐÏÉÇÓÅÔÅ ÄÅÄÏÌÅÍÁ ÐÏÕ Å×ÏÕÍ ÐÁÑÁ×ÈÅÉ ÁÐÏ ÁÕÔÏ ÔÏ ÐÑÏÃÑÁÌÌÁ!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +350,7 @@ msgstr ""
 "íá áðáó÷ïëåßôå ôï ëåéôïõñãéêü óýóôçìá ìÝ÷ñé áõôü íá óõãêåíôñþóåé\n"
 "ðåñéóóüôåñç åíôñïðßá! (×ñåéÜæïíôáé %d ðåñéóóüôåñá bytes)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +358,163 @@ msgstr ""
 "@ÅíôïëÝò:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò õðïãñáöÞò"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò ìç êñõðôïãñáöçìÝíçò õðïãñáöÞò"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "êñõðôïãñÜöçóç äåäïìÝíùí"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[áñ÷åßá]|êñõðôïãñÜöçóç áñ÷åßùí"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "êñõðôïãñÜöçóç ìå ÷ñÞóç ìüíï óõììåôñéêþí áëãïñßèìùí"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "áðïèÞêåõóç ìüíï"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "áðïêñõðôïãñÜöçóç äåäïìÝíùí (ðñïêáèïñéóìÝíï)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[áñ÷åßá]|áðïêñõðôïãñÜöçóç áñ÷åßùí"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "åðáëÞèåõóç ìéáò õðïãñáöÞò"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé õðïãñáöþí"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "Ýëåã÷ïò õðïãñáöÞò êëåéäéïý"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé áðïôõðùìÜôùí (fingerprints)"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "áðåéêüíéóç ôçò ëßóôáò ìõóôéêþí êëåéäéþí"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç äçìüóéá êëåéäïèÞêç"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç ìõóôéêÞ êëåéäïèÞêç"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý ìç-áíáêáëÝóéìá"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "õðïãñáöÞ Þ åðåîåñãáóßá åíüò êëåéäéïý"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "åîáãùãÞ êëåéäéþí"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "åîáãùãÞ êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "åéóáãùãÞ êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "áíáæÞôçóç êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "áíáíÝùóç üëùí ôùí êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "åéóáãùãÞ/óõã÷þíåõóç êëåéäéþí"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "áðåéêüíéóç ìüíï ôçò áêïëïõèßáò ðáêÝôùí"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "åîáãùãÞ ôùí ôéìþí åìðéóôïóýíçò"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "åéóáãùãÞ ôùí ôéìþí åìðéóôïóýíçò"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "áíáíÝùóç ôçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "áíáíÝùóç ôçò ðáñáìåëåéìÝíçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "äéüñèùóç ìéáò öèáñìÝíçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Áöáßñåóç-ÈùñÜêéóçò åíüò áñ÷åßïõ Þ stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "ÐñïóèÞêç-ÈùñÜêéóçò åíüò áñ÷åßïõ Þ stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|áëãüñ [áñ÷åßá]| áðåéêüíéóç ðåñéëÞøåùí ôùí ìçíõìÜôùí"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,199 +524,195 @@ msgstr ""
 "ÅðéëïãÝò:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|ÏÍÏÌÁ|êñõðôïãñÜöçóç ãéá ÏÍÏÌÁ"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç ôïõ ÏÍÏÌÁôïò ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "÷ñÞóç ôïõ ðñïêáèïñéóìÝíïõ êëåéäéïý ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "÷ñÞóç áõôÞò ôçò ôáõôüôçôáò (user id) ãéá õðïãñáöÞ Þ áðïêñõðôïãñÜöçóç"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|êáèïñéóìüò åðéðÝäïõ óõìðßåóçò N (0 áðåíåñãïðïéåß)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "÷ñÞóç êáíïíéêÞò êáôÜóôáóçò êåéìÝíïõ"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "÷ñÞóç ùò áñ÷åßïõ åîüäïõ"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "áíáëõôéêÜ"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "Þóõ÷ç Ýîïäïò"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "ìç ÷ñÞóç ôåñìáôéêïý"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "ü÷é åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "åîáíáãêáóìüò ÷ñÞóçò v4 õðïãñáöþí"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "ü÷é åîáíáãêáóìüò ÷ñÞóçò v4 õðïãñáöþí"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "÷ñÞóç ðÜíôïôå MDC ãéá êñõðôïãñÜöçóç"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "ðïôÝ ÷ñÞóç MDC ãéá êñõðôïãñÜöçóç"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "íá ìç ãßíåé êáììßá áëëáãÞ"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "÷ñÞóç ôïõ gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "êáôÜóôáóç batch: íá ìç ãßíïíôáé åñùôÞóåéò"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "áðÜíôçóç íáé óôéò ðåñéóóüôåñåò åñùôÞóåéò"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "áðÜíôçóç ü÷é óôéò ðåñéóóüôåñåò åñùôÞóåéò"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "ðñïóèÞêç áõôïý ôïõ êëåéäéïý óôç ëßóôá ôùí êëåéäïèçêþí"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "ðñïóèÞêç áõôÞò ôçò ìõóôéêÞò êëåéäïèÞêçò óôç ëßóôá"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "áðåéêüíéóç ôçò êëåéäïèÞêçò óôçí ïðïßá áíáöÝñåôå ôï êëåéäß"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç ÏÍÏÌÁôïò óáí ðñïêáèïñéóìÝíï ìõóôéêü êëåéäß"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ÄÉÁÊÏÌÉÓÔÇÓ|÷ñÞóç áõôïý ôïõ äéáêïìéóôÞ êëåéäéþí ãéá áíáæÞôçóç"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|ÏÍÏÌÁ|êáèïñéóìüò ôïõ óåô ÷áñáêôÞñùí ôåñìáôéêïý óå ÏÍÏÌÁ"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "áíÜãíùóç åðéëïãþí áðü áñ÷åßï"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[áñ÷åßï]|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï áñ÷åßï"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|áðüëõôç åìðéóôïóýíç óå áõôü ôï êëåéäß"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|ÁÑ×ÅÉÏ|öüñôùìá ôïõ áñèñþìáôïò åðÝêôáóçò ÁÑ×ÅÉÏ"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "åîïìïßùóç ôçò êáôÜóôáóçò ðïõ ðåñéãñÜöåôáé óôï RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "óõìðåñéöïñÜ üëùí ôùí åðéëïãþí ðáêÝôá,áëãüñéèìïé êáé ðåñßëçøç óå OPENPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "ïñéóìüò üëùí ôùí åðéëïãþí ðáêÝôá,áëãüñéèìïé,ðåñßëçøç óå PGP 2.x óõìðåñéöïñÜ"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|÷ñÞóç ôçò êáôÜóôáóçò öñÜóçò êëåéäß N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|ONOMA|÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò ìçíýìáôïò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ ðåñßëçøçò ìçíýìáôïò ÏÍÏÌÁ "
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|÷ñÞóç áëãïñßèìïõ óõìðßåóçò N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "äéáãñáöÞ ôïõ ðåäßïõ keyid ôùí êñõðôïãñáöçìÝíùí ðáêÝôùí"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Áðåéêüíéóç ôùí Photo ID"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Ìç áðåéêüíéóç ôùí Photo ID"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Ïñéóìüò ôçò ãñáììÞò åíôïëþí ãéá áðåéêüíéóç ôùí Photo ID"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|ÏÍÏÌÁ=ÔÉÌÇ|÷ñÞóç áõôÞò ôçò êáôÜóôáóçò óçìåßùóçò"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -724,7 +720,7 @@ msgstr ""
 "@\n"
 "(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -744,15 +740,15 @@ msgstr ""
 " --list-keys [ïíüìáôá]        áðåéêüíéóç êëåéäéþí\n"
 " --fingerprint [ïíüìáôá]      áðåéêüíéóç áðïôõðùìÜôùí (fingerprints)\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "ÁíáöÝñåôå ôá ðñïâëÞìáôá óôï <gnupg-bugs@gnu.org>\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -762,7 +758,7 @@ msgstr ""
 "õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n"
 "ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -770,269 +766,279 @@ msgstr ""
 "\n"
 "Õðïóôçñéæüìåíïé áëãüñéèìïé:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "÷ñÞóç: gpg [åðéëïãÝò] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "óõãêñïõüìåíåò åíôïëÝò\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ÓÇÌÅÉÙÓÇ:ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "áñ÷åßï åðéëïãþí `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: `%s' åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "÷ñçóéìïðïéÞóôå ôçí åðéëïãÞ \"--keyserver-options %s\" êáëýôåñá\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 "
 "êáôÜóôáóç\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "áõôü ôï ì'çíõìá ßóùò äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ìå PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ï áëãüñéèìïò óõìðßåóçò ðñÝðåé íá åßíáé ìåôáîý %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ìç Ýãêõñï default-check-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [åíôïëÝò]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "áäõíáìßá ðñüóâáóçò ôïõ %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "èùñÜêéóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ìç Ýãêõñïò áëãüñéèìïò  hash `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Ìðïñåßôå ôþñá íá åéóáãÜãåôå ôï ìÞíõìá óáò ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"ï ðñþôïò ÷áñáêôÞñáò ôïõ ïíüìáôïò óçìåßùóçò ðñÝðåé íá åßíáé ãñÜììá Þ "
-"underscore\n"
-
-#: g10/g10.c:2319
-msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï áëöáñéèìçôéêÜ, ôåëåßåò Þ "
 "underscores êáé ëÞãåé ìå '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "ïé ôåëåßåò óôï üíïìá óçìåßùóçò ðñÝðåé íá åßíáé ìåôáîý ÷áñáêôÞñùí\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1129,11 +1135,13 @@ msgid "User ID is no longer valid"
 msgstr "Ôï User ID äåí åßíáé ðëÝïí Ýãêõñï"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Áéôßá ãéá áíÜêëçóç:"
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Ó÷üëéï áíÜêëçóçò:"
 
 #. a string with valid answers
@@ -1330,21 +1338,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Äåí åßíáé âÝâáéï üôé ç õðïãñáöÞ áíÞêåé óôïí éäéïêôÞôç.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ðáñáëåßöèçêå: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ðáñáëåßöèçêå: äçìüóéï êëåéäß åßíáé Þäç ðáñüí\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Äåí ïñßóôçêå Ýíá user ID. (÷ñçóéìïðïéåßóôå ôï \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1352,122 +1360,132 @@ msgstr ""
 "\n"
 "ÐëçêôñïëïãÞóôå ôï user ID. ÔÝëïò ìå ìéá Üäåéá ãñáììÞ: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Äåí õðÜñ÷åé áõôü ôï user ID.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "ðáñáëåßöèçêå: äçìüóéï êëåéäß Ý÷åé Þäç ïñéóôåß óáí åî ïñéóìïý ðáñáëÞðôçò\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Ôï äçìüóéï êëåéäß Ý÷åé áðåíåñãïðïéçèåß.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "ðáñáëåßöèçêå: äçìüóéï êëåéäß Ý÷åé Þäç ïñéóôåß\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Üãíùóôïò ðñïêáèïñéóìÝíïò ðáñáëÞðôçò `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ðáñáëåßöèçêå: ôï äçìüóéï êëåéäß Ý÷åé áðåíåñãïðïéçèåß.\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "êáììßá Ýãêõñç äéåýèõíóç\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "ç ðñïåðéëïãÞ %c%lu äåí åßíáé Ýãêõñç\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "ç ðñïåðéëïãÞ %c%lu áíôéãñÜöôçêå\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "ðÜñá ðïëëÝò `%c' ðñïåðéëïãÝò\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "åããñáöÞ éäéï-õðïãñáöÞò\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "åããñáöÞ éäéï-õðïãñáöÞò\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "åããñáöÞ õðïãñáöÞò \"äÝóéìïõ\" êëåéäéïý\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ìç Ýãêõñï ìÝãåèïò êëåéäéïý, ÷ñÞóç %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "óôñïããõëïðïßçóç ôïõ ìÝãåèïò êëåéäéïý Ýùò %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA êáé ElGamal (ðñïêáèïñéóìÝíï)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ãéá õðïãñáöÞ ìüíï)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ãéá êñõðôïãñÜöçóç ìüíï)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (õðïãñáöÞ êáé êñõðôïãñÜöçóç)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ãéá õðïãñáöÞ ìüíï)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (õðïãñáöÞ êáé êñõðôïãñÜöçóç)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Ç åðéëïãÞ óáò; "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Ç ÷ñÞóç áõôïý ôïõ áëãüñéèìïõ áðïäïêéìÜæåôáé - óßãïõñá íá äçìéïõñãçèåß; "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ìç Ýãêõñç åðéëïãÞ.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1480,20 +1498,20 @@ msgstr ""
 "              ðñïêáèïñéóìÝíï ìÝãåèïò êëåéäéïý åßíáé 1024 bits\n"
 "    ìÝãéóôï ðñïôåéíüìåíï ìÝãåèïò êëåéäéïý åßíáé 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Ï DSA åðéôñÝðåé ìüíï ìÝãåèïò êëåéäéïý áðü 512 Ýùò 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 1024 åßíáé ç åëÜ÷éóôç ôéìÞ ãéá RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 768 åßíáé ç åëÜ÷éóôç åðéôñåðüìåíç "
@@ -1507,14 +1525,14 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìåãÜëï, %d åßíáé ç ìÝãéóôç ôéìÞ ðïõ "
 "åðéôñÝðåôáé.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1522,11 +1540,11 @@ msgstr ""
 "ÌåãÝèç êëåéäéþí ìåãáëýôåñá ôïõ 2048 äåí óõíéóôþíôáé ãéáôß\n"
 "ïé õðïëïãéóìïß åßíáé ÷ñïíïâüñïé!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Óßãïõñá èÝëåôå áõôü ôï ìÝãåèïò êëåéäéïý; "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1534,17 +1552,17 @@ msgstr ""
 "ÅíôÜîåé, áëëÜ íá Ý÷åôå õð'üøç üôé ç ïèüíç êáé ôï ðëçêôñïëüãéï åßíáé\n"
 "åðßóçò ðïëý ôñùôÜ óå åðéèÝóåéò!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ôï ìÝãåèïò êëåéäéïý ðïõ æçôÞèçêå åßíáé %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "óôñïããõëïðïéÞèçêå Ýùò ôá %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1560,7 +1578,7 @@ msgstr ""
 "      <n>m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n"
 "      <n>y = ôï êëåéäß ëÞãåé óå n Ýôç\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1576,30 +1594,30 @@ msgstr ""
 "      <n>m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n"
 "      <n>y = ôï êëåéäß ëÞãåé óå n Ýôç\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Ôï êëåéäß åßíáé Ýãêõñï ãéá; (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Ç õðïãñáöÞ Ýéíáé Ýãêõñç ãéá; (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "ìç Ýãêõñç ôéìÞ\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "ôï %s äåí ëÞãåé ðïôÝ\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "ôï %s ëÞãåé óôéò %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1607,11 +1625,11 @@ msgstr ""
 "Ôï óýóôçìá óáò äåí ìðïñåß íá áðåéêïíßóåé çìåñïìçíßåò ðÝñá ôïõ 2038.\n"
 "¼ìùò, èá ÷åéñßæïíôáé óùóôÜ Ýùò ôï 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Åßíáé áõôü óùóôü (y/n); "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1627,44 +1645,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Áëçèéíü ¼íïìá: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï üíïìá\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Ôï üíïìá äåí åðéôñÝðåôáé íá îåêéíÜ ìå áñéèìçôéêü øçößï\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ôï üíïìá ðñÝðåé íá Ý÷åé ôïõëÜ÷éóôïí 5 ÷áñáêôÞñåò\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Äéåýèõíóç Email: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Ìç Ýãêõñç äéåýèõíóç Email\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Ó÷üëéï: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï ó÷üëéï\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "×ñçóéìïðïéåßôå ôï `%s' óåô ÷áñáêôÞñùí.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1675,27 +1693,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ðáñáêáëþ ìçí ôïðïèåôåßôå ôçí äéåýèõíóç email óôï üíïìá Þ óôï ó÷üëéï\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (Q)ôåñìáôéóìüò; "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (O)åíôÜîåé/(Q)ôåñìáôéóìüò; "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Ðáñáêáëþ, äéïñèþóôå ðñþôá ôï óöÜëìá\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1703,16 +1721,16 @@ msgstr ""
 "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1724,7 +1742,7 @@ msgstr ""
 "üðïôå èÝëåôå, ìå ôçí åðéëïãÞ \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1736,53 +1754,53 @@ msgstr ""
 "ôïõò äßóêïõò) êáôá ôç äéÜñêåéá õðïëïãéóìïý ðñþôùí áñéèìþí. Áõôü äßíåé\n"
 "óôç ãåííÞôñéá ôõ÷áßùí áñéèìþí ìéá åõêáéñßá íá ìáæÝøåé áñêåôÞ åíôñïðßá.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Ôï æåýãïò êëåéäéþí DSA èá åßíáé 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Ç äçìéïõñãßá êëåéäéïý áíáâëÞèçêå.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "åããñáöÞ ôïõ äçìïóßïõ êëåéäéïý óôï `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "äå âñÝèçêå åããñÜøéìç äçìüóéá êëåéäïèÞêç: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "äå âñÝèçêå åããñÜøéìç ìõóôéêÞ êëåéäïèÞêç: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "áäõíáìßá åããñáöÞò äçìüóéáò êëåéäïèÞêçò `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "ôï äçìüóéï êáé ôï ìõóôéêü êëåéäß äçìéïõñãÞèçêáí êáé õðïãñÜöçêáí.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "óçìåßùóç êëåéäéïý óáí áðüëõôçò åìðéóôïóýíçò.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1792,12 +1810,12 @@ msgstr ""
 "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ \"--edit-key\" ãéá íá äçìéïõñãçèåß\n"
 "Ýíá äåõôåñåýïí êëåéäß ãéá áõôü ôï ëüãï.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1805,7 +1823,7 @@ msgstr ""
 "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n"
 "áðëþò ðñüâëçìá óôï ñïëüé)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1813,90 +1831,100 @@ msgstr ""
 "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôá óôï ìÝëëïí (÷ñïíïäßíç Þ\n"
 "áðëþò ðñüâëçìá óôï ñïëüé)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ÓÇÌÅÉÙÓÇ: ç äçìéïõñãßá õðïêëåéäéþí ãéá êëåéäéÜ v3 äåí åßíáé óýìöùíï\n"
 "ìå ôï OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Óßãïõñá íá äçìéïõñãçèåß; "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' Þäç óõìðéÝóôçêå\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: áäõíáìßá ðñüóâáóçò ôïõ: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Üäåéï áñ÷åßï\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "êñõðôïãñÜöçóç ìå êëåéäßá RSA áðü 2048 bit Þ ðéï ëßãï ìüíï óå êáôÜóôáóç --"
 "pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "áíÜãíùóç áðü `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "áäõíáìßá ÷ñÞóçò ôïõ êñõðôáëãüñéèìïõ IDEA ãéá üëá ôá êëåéäßá ìå ôá "
 "ïðïßáêñõðôïãñáöåßôå.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "ÓÇÌÅÉÙÓÇ: ï áëãüñéèìïò êñõðôïãñÜöçóçò %d äåí åßíáé óôéò åðéëïãÝò\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s êñõðôïãñáöÞèçêå ãéá: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "êëåéäß %08lX: äåí åßíáé Ýíá rfc2440 êëåéäß - ðáñáëåßöèçêå\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "êëåéäß %08lX: äåí åßíáé ðñïóôáôåõìÝíï - ðáñáëåßöèçêå\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "êëåéäß %08lX:  êëåéäß ôýðïõ PGP 2.x - ðáñáëåßöèçêå\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ýãéíå êáììßá åîáãùãÞ\n"
 
@@ -1906,22 +1934,22 @@ msgstr "ðÜñá ðïëëÝò êáôá÷ùñÞóåéò óôç pk cache - áðåíåñãïðïéÞèçêå\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User id äåí âñÝèçêå]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ìç Ýãêõñï êëåéäß %08lX Ýãéíå Ýãêõñï áðü ôï --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ÷ùñßò äçìüóéï - ðáñáëåßöèçêå\n"
@@ -2001,181 +2029,186 @@ msgstr "  åéóá÷èÝíôá ìõóôéêÜ êëåéäéÜ: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " áìåôÜâëçôá ìõóôéêÜ êëåéäéÜ: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "êëåéäß %08lX: ìç Ýãêõñç äÝóìåõóç õðïêëåéäéïý\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "êëåéäß %08lX: äåí õðÜñ÷åé áõôü ôï user ID\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "êëåéäß %08lX: äåêôü ìç éäéï-õðïãåãñáììÝíï user ID '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "êëåéäß %08lX: äåí Ý÷åé Ýãêõñá user ID\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "áõôü ìðïñåß íá óõíÝâåé áðü ìéá áðïýóá éäéïûðïãñáöÞ\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ðïõ äå âñÝèçêå: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "êëåéäß %08lX:  íÝï êëåéäß - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "äåí âñåèçêå åããñÜøéìç êëåéäïèÞêç: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "åããñáöÞ óôï  `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "áäõíáìßá åããñáöÞò ôçò êëåéäïèÞêçò `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "êëåéäß %08lX: äçìüóéï êëåéäß Ý÷åé åéóá÷èåß\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "êëåéäß %08lX: äåí ôáéñéÜæåé ìå ôï áíôßãñáöï ìáò\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "êëåéäß %08lX: áäõíáìßá åíôïðéóìïý ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "êëåéäß %08lX: áäõíáìßá áíÜãíùóçò ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "êëåéäß %08lX: 1 íÝï user ID\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "êëåéäß %08lX: %d íÝá user ID\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "êëåéäß %08lX: 1 íÝá õðïãñáöÞ\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "êëåéäß %08lX: %d íÝåò õðïãñáöÝò\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "êëåéäß %08lX: 1 íÝï õðïêëåéäß\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "êëåéäß %08lX: %d íÝá õðïêëåéäéÜ\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "êëåéäß %08lX: áìåôÜâëçôï\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "äåí õðÜñ÷åé ðñïêáèïñéóìÝíç êëåéäïèÞêç: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß åéóÞ÷èçêå\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "êëåéäß %08lX: Þäç óôç ìõóôéêÞ êëåéäïèÞêç\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "êëåéäß %08lX: äå âñÝèçêå ôï ìõóôéêü êëåéäß: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "êëåéäß %08lX: ü÷é äçìüóéï êëåéäß - áäõíáìßá åöáñìïãÞò ðéóôïðïéçôéêïý "
 "áíÜêëçóçò\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - áðüññéøç\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "êëåéäß %08lX: ðéóôïðïéçôéêü áíÜêëçóçò åéóÞ÷èçêå\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "êëåéäß %08lX: äåí õðÜñ÷åé user ID ãéá ôçí õðïãñáöÞ\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý óôï user id \"%"
 "s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñç éäéï-õðïãñáöÞ óôï user id \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôç äÝóìåõóç êëåéäéïý\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñç äÝóìåõóç õðïêëåéäéïý\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "êëåéäß %08lX: ðáñáëåßöèçêå user ID '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "êëåéäß %08lX: ðáñáëåßöèçêå õðïêëåéäß\n"
@@ -2184,109 +2217,128 @@ msgstr "êëåéäß %08lX: ðáñáëåßöèçêå õðïêëåéäß\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "êëåéäß %08lX: ìç åîáãüìåíç õðïãñáöÞ (êëÜóç %02x) - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "êëåéäß %08lX: ôï ðéóôïðïéçôéêü áíÜêëçóçò óå ëÜèïò óçìåßï - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "êëåéäß %08lX: åíôïðßóôçêå äéðëü user ID - åíþèçêáí\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Ðñïåéäïðïßçóç: êëåéäß %08lX ìðïñåß íá áíáêëçèåß: ëÞøç êëåéäéïý áíÜêëçóçò %"
 "08lX\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "êëåéäß %08lX: ðéóôïðïéçôéêü áíÜêëçóçò ðñïóôÝèçêå\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "êëåéäß %08lX: Üìåóç õðïãñáöÞ êëåéäéïý ðñïóôÝèçêå\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[áíÜêëçóç]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[éäéï-õðïãñáöÞ]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 êáêÞ õðïãñáöÞ\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d êáêÝò õðïãñáöÝò\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 õðïãñáöÞ äåí åëÝã÷èçêå ëüãù ÷áìÝíïõ êëåéäéïý\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d õðïãñáöÝò äåí åëÝã÷èçêáí ëüãù ÷áìÝíùí êëåéäéþí\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 õðïãñáöÞ äåí åëÝã÷èçêå ëüãï åíüò óöÜëìáôïò\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d õðïãñáöÝò äåí åëÝã÷èçêáí ëüãù óöáëìÜôùí\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID áíé÷íåýôçêå ÷ùñßò Ýãêõñç éäéï-õðïãñáöÞ\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID áíé÷íåýèçêáí ÷ùñßò Ýãêõñåò éäéï-õðïãñáöÝò\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Ôï user ID \"%s\" áíáêáëåßôå."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï õðïãñÜøåôå; (y/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  Áäõíáìßá õðïãñáöÞò.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Ç ðñïõðÜñ÷ïõóá õðïãñáöÞ óáò óôï \"%s\"\n"
+"åßíáé ìéá ôïðéêÞ õðïãñáöÞ.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "ÈÝëåôå íá ôç ðñïÜãåôå óå ìéá ðëÞñç åîáãþãéìç õðïãñáöÞ; (y/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2295,39 +2347,39 @@ msgstr ""
 "Ç ðñïõðÜñ÷ïõóá õðïãñáöÞ óáò óôï \"%s\"\n"
 "åßíáé ìéá ôïðéêÞ õðïãñáöÞ.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "ÈÝëåôå íá ôç ðñïÜãåôå óå ìéá ðëÞñç åîáãþãéìç õðïãñáöÞ; (y/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" Þäç õðïãñÜöèçêå áðü ôï êëåéäß %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" Þäç õðïãñÜöèçêå áðü ôï êëåéäß %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Ôßðïôá ãéá íá õðïãñáöåß ìå ôï êëåéäß  %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Áõôü ôï êëåéäß Ý÷åé ëÞîåé!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Áõôü ôï êëåéäß ðñüêåéôå íá ëÞîåé óôéò %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "ÈÝëåôå ç õðïãáöÞóáò íá ëÞîåé ôáõôü÷ñïíá;  (Y/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2335,11 +2387,11 @@ msgstr ""
 "Ìðïñåßôå íá ÷ñçóéìüðïéÞóåôå ìéá OpenPGP õðïãñáöÞ óå Ýíá PGP 2.x ìüíï óå "
 "êáôÜóôáóç --pgp2.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Áõôü èá êÜíåé ôï êëåéäß Ü÷ñçóôï ìå ôï PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2349,27 +2401,27 @@ msgstr ""
 "áíÞêåé ðñÜãìáôé óôï ðñïáíöåñèÝí Üôïìï; ÅÜí äåí îÝñåôå ôé íá áðáíôÞóåôå "
 "ðáôÞóôå\"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Äåí áðáíôþ.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Äåí Ý÷ù åëÝãîåé êáèüëïõ.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ¸÷ù êÜíåé ôïí óõíÞèç Ýëåã÷ï.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ¸÷ù êÜíåé åêôåôáìÝíï Ýëåã÷ï.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2377,7 +2429,33 @@ msgstr ""
 "Óßãïõñá èÝëåôå íá õðïãñÜøåôå áõôü ôï êëåéäß\n"
 "ìå ôï êëåéäß óáò: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "áõôü ìðïñåß íá óõíÝâåé áðü ìéá áðïýóá éäéïûðïãñáöÞ\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-åîáãþãéìç.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-áíáêáëÝóéìç.\n"
+"\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2385,7 +2463,7 @@ msgstr ""
 "\n"
 "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-åîáãþãéìç.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2394,7 +2472,7 @@ msgstr ""
 "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-áíáêáëÝóéìç.\n"
 "\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2402,7 +2480,7 @@ msgstr ""
 "\n"
 "Äåí Ý÷ù åëÝãîåé êáèüëïõ áõôü ôï êëåéäß.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2410,7 +2488,7 @@ msgstr ""
 "\n"
 "¸÷ù êÜíåé óõíçèéóìÝíï Ýëåã÷ï óå áõôü ôï êëåéäß.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2418,33 +2496,33 @@ msgstr ""
 "\n"
 "¸÷ù åëÝãîåé ðïëý ðñïóåêôéêÜ áõôü ôï êëåéäß.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Óßãïõñá íá õðïãñáöåß; "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ç õðïãñáöÞ áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Áõôü ôï êëåéäß äåí ðñïóôáôåýåôáé.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Ôï êëåéäß ðñïóôáôåýåôáé.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Áäýíáôç ç åðåîåñãáóßá áõôïý ôïõ êëåéäéïý:%s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2452,477 +2530,475 @@ msgstr ""
 "ÐëçêôñïëïãÞóôå ôçí íÝá öñÜóç êëåéäß ãéá áõôü ôï ìõóôéêü êëåéäß.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "Äåí èÝëåôå öñÜóç êëåéäß - áõôü åßíáé ìÜëëïí *êáêÞ* éäÝá!\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Óßãïõñá èÝëåôå íá êÜíåôå áõôü; "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "ìåôáêßíçóç õðïãñáöÞò êëåéäéïý óôç óùóôÞ èÝóç\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "áðïèÞêåõóç êáé Ýîïäïò"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "áðåéêüíéóç ôïõ fingerprint"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "áðåéêüíéóç ôùí êëåéäéþí êáé ôùí user ID"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "åðéëïãÞ user ID N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "åðéëïãÞ äåõôåñåýïíôïò êëåéäéïý N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "áðåéêüíéóç õðïãñáöþí"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "ðñïóèÞêç åíüò user ID"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "ðñïóèÞêç åíüò photo ID"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "äéáãñáöÞ åíüò user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "äéáãñáöÞ åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "äéáãñáöÞ õðïãñáöþí"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "ðñùôåýùí"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "óçìåßùóç ôïõ user ID óáí ðñùôåýùí"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "áðåéêüíéóç ðñïåðéëïãþí (åéäéêÝò)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "áðåéêüíéóç åðéëïãþí (áíáëõôéêÜ)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "áíáùåùìÝíåò åðéëïãÝò"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "áíÜêëçóç õðïãñáöþí"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "áíÜêëçóç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "áðåíåñãïðïéåß Ýíá êëåéäß"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "åíåñãïðïéåß Ýíá êëåéäß"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "áðåéêüíéóç photo ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "äåí ìðïñåß íá ãßíåé áõôü óå êáôÜóôáóç äÝóìçò (batchmode)\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "ÅíôïëÞ> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Áðáéôåßôáé ôï ìõóôéêü êëåéäß ãéá íá ãßíåé áõôü.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôçí åíôïëÞ \"toggle\" ðñþôá.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Ôï êëåéäß áíáêëÞèçêå."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå ôï ëéãüôåñï Ýíá user ID.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôï ôåëåõôáßï user ID!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí üëá ôá åðéëåãìÝíá user ID; "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí ôá åðéëåãìÝíá êëåéäéÜ; "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí ôá åðéëåãìÝíá êëåéäéÜ; "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Óßãïõñá èÝëåôå íá áíáíåùèïýí ïé ðñïåðéëïãÝò ãéá ôï åðéëåãìÝíï user ID; "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ìç Ýãêõñç åíôïëÞ  (äïêéìÜóôå \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (åõáßóèçôï)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  äçìéïõñãßá: %s ëÞîç: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " åìðéóôïóýíç: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! ôï êëåéäß áíáêëÞèçêå: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- âñÝèçêå ðáñáðïéçìÝíç áíÜêëçóç\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? ðñüâëçìá óôïí Ýëåã÷ï áíÜêëçóçò: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá Ýããõñç\n"
 "åêôüò êáé åÜí åðáíáêéíÞóåôå ôï ðñüãñáììá.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé Þäç ìéá photo ID.\n"
-"    Ç ðñïóèÞêç åíüò áêüìç photo ID ìðïñåß íá ìðåñäÝøåé êÜðïéåò åêäüóåéò "
-"PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Ìðïñåßôå íá Ý÷åôå ìüíï ìéá photo ID óå Ýíá êëåéäß.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2931,83 +3007,108 @@ msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n"
 "               ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "ÐëçêôñïëïãÞóôå ôï ìÝãåèïò ôïõ êëåéäéïý"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "êëåéäß %08lX: ìç Ýãêõñç éäéï-õðïãñáöÞ óôï user id \"%s\"\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3016,7 +3117,7 @@ msgstr ""
 "\"\n"
 "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3025,236 +3126,244 @@ msgstr ""
 "\"\n"
 "õðïãñÜöèçêå ôïðéêÜ ìå ôï êëåéäß óáò %08lX óôéò %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   áíáêëÞèçêå áðü %08lX óôéò %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   õðïãñÜöèçêå áðü %08lX óôéò %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (ìç-åîáãþãéìï)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "êáíÝíá ìõóôéêü êëåéäß\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Áðåéêüíéóç %s photo ID ìåãÝèïõò %ld ãéá ôï êëåéäß 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "ÐïëéôéêÞ õðïãñáöÞò: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "ÐïëéôéêÞ õðïãñáöÞò: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: âñÝèçêáí ìç Ýãêõñá äåäïìÝíá óçìåßùóçò\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Óçìåßùóç õðïãñáöÞò: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Óçìåßùóç õðïãñáöÞò: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "ìç áíáãíþóéìï"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "ÊëåéäïèÞêç"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ëÞãåé: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Fingerprint:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "             Áðïôýðùìá:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Áðïôýðùìá êëåéäéïý ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s êñõðôïãñáöçìÝíá äåäïìÝíá\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "êñõðôïãñáöçìÝíï ìå Üãíùóôï áëãüñéèìï %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "äçìüóéï êëåéäß åßíáé %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "êñõðôïãñáöçìÝíá äåäïìÝíá ìå äçìüóéï êëåéäß: êáëü DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "êñõðôïãñáöçìÝíï ìå %u-bit %s êëåéäß, ID %08lX, äçìéïõñãÞèçêå %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "êñõðôïãñáöçìÝíï ìå %s key, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "êñõðôïãñÜöçóç ìå äçìüóéï êëåéäß áðÝôõ÷å: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "õðüèåóç %s êñõðôïãñáöçìÝíùí äåäïìÝíùí\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "Êñõðôáëãüñéèìïò IDEA ìç äéáèÝóéìïò, áéóéüäïîç ðñïóðÜèåéá ÷ñÞóçò ôïõ\n"
 "%s áíôßèåôá\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "áðïêñõðôïãñÜöçóç OK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï êñõðôïãñáöçìÝíï ìÞíõìá Ý÷åé ðåéñá÷èåß!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ï áðïóôïëÝáò æÞôçóå \"ãéá-ôá-ìÜôéá-óáò-ìüíï\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "áñ÷éêü üíïìá áñ÷åßïõ='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "áíåîÜñôçôç áíÜêëçóç - ÷ñçóéìïðïéåßóôå \"gpg --import\" ãéá åöáñìïãÞ\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Óçìåßùóç: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "ÐïëéôéêÞ: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "êáôáóôïëÞ áíÜêëçóçò õðïãñáöÞò\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "áäõíáìßá ÷åéñéóìïý áõôþí ôùí ðïëëáðëþí õðïãñáöþí\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "ÕðïãñáöÞ %.*s ìå ÷ñÞóç ôïõ êëåéäéïý%s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "ÊÁÊÇ õðïãñáöÞ áðü \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "ËçãìÝíç õðïãñáöÞ áðü \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "ÊáëÞ õðïãñáöÞ áðü \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[áâÝâáéï]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                ãíùóôü óáí \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Áäõíáìßá åëÝã÷ïõ ôçò õðïãñáöÞò: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "äåí åßíáé áðïêïììÝíç õðïãñáöÞ\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "áíåîÜñôçôç õðïãñáöÞ êëÜóçò 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "õðïãñáöÞ ðáëéïý óôõë (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ìç Ýãêõñï ñéæéêü(root) ðáêÝôï áíé÷íåýôçêå óôï proc_tree()\n"
 
@@ -3273,33 +3382,48 @@ msgstr ""
 "ç ÷ñÞóç áõôïý ôïõ áëãüñéèìïõ êñõðôïãñÜöçóçò äåí óõíéóôÜôáé. ×ñçóéìïðïéÞóôå "
 "Ýíá ðéï óõíçèéóìÝíï!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Ðñïåéäïðïßçóç: ìç áóöáëÞò éäéïêôçóßá óôï %s \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ðñïåéäïðïßçóç: ìç áóöáëåßò Üäåéåò óôï %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "ôï âýóìá ôïõ êñõðôáëãüñéèìïõ IDEA äåí õðÜñ÷åé\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "äåßôå ôï http://www.gnupg.org/why-not-idea.html ãéá ðåñéóóüôåñåò "
 "ðëçñïöïñßåò\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: `%s' åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: `%s' åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "÷ñçóéìïðïéÞóôå ôçí åðéëïãÞ \"--keyserver-options %s\" êáëýôåñá\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "áäõíáìßá ÷åéñéóìïý ôïõ áëãüñéèìïõ äçìïóßïõ êëåéäéïý %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n"
@@ -3441,34 +3565,39 @@ msgstr "äåí õðÜñ÷ïõí õðïãåãñáììÝíá äåäïìÝíá\n"
 msgid "can't open signed data `%s'\n"
 msgstr "áäõíáìßá ðñüóâáóçò õðïãåãñáììÝíùí äåäïìÝíùí `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "áíþíõìïò ðáñáëÞðôçò· äïêéìÞ ìõóôéêïý êëåéäéïý %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "åíôÜîåé, åßìáóôå ï áíþíõìïò ðáñáëÞðôçò.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "ðáëáéÜ êùäéêïðïßçóç ôïõ DEK äåí õðïóôçñßæåôáé\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "ï áëãüñéèìïò êñõðôïãñÜöçóçò %d%s åßíáé Üãíùóôïò Þ áðåíåñãïðïéçìÝíïò\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ï áëãüñéèìïò êñõðôïãñÜöçóçò %d äåí åßíáé óôéò åðéëïãÝò\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ôï ìõóôéêü êëåéäß %08lX Ýëçîå óôéò %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "êëåéäß %08lX: ôï êëåéäß Ý÷åé áíáêëçèåß!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3495,12 +3624,16 @@ msgstr "åðéôõ÷ßá ôçò áðïóôïëÞò óôï `%s' (êáôÜóôáóç=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "áðïôõ÷ßá óôçí áðïóôïëÞ ðñïò ôï `%s': êáôÜóôáóç=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "áäõíáìßá áíáæÞôçóçò äéáêïìéóôÞ: %s\n"
@@ -3559,7 +3692,14 @@ msgstr "ÓÇÌÅÉÙÓÇ: ôï êëåéäß õðïãñáöÞò %08lX Ýëçîå óôéò %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "õðüèåóç êáêÞò õðïãñáöÞò ëüãù Üãíùóôïõ êñßóéìïõ bit\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá óôç %%-áíÜðôõîç ôïõ url ðïëéôéêÞò (ðïëõ ìåãÜëï).\n"
+"               ×ñÞóç ìç áíåðôõãìÝíïõ.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3567,41 +3707,47 @@ msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá óôç %%-áíÜðôõîç ôïõ url ðïëéôéêÞò (ðïëõ ìåãÜëï).\n"
 "               ×ñÞóç ìç áíåðôõãìÝíïõ.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "áðÝôõ÷å ï Ýëåã÷ïò ôçò õðïãñáöÞò ðïõ äçìéïõñãÞèçêå: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s õðïãñáöÞ áðü: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: `%s' åßíáé Ýíá Üäåéï áñ÷åßï\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "ìðïñåßôå íá õðïãñÜøåôå ìå êëåéäéÜ ôýðïõ PGP 2.x ìüíï óå --pgp2 êáôÜóôáóç\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "ÓÇÌÅÉÙÓÇ: ï áëãüñéèìïò êñõðôïãñÜöçóçò %d äåí åßíáé óôéò åðéëïãÝò\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "õðïãñáöÞ:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "ìðïñåßôå íá õðïãñÜøåôå êáèáñÜ ìå êëåéäéÜ ôýðïõ PGP 2.x óå êáôÜóôáóç --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s êñõðôïãñÜöçóç èá ÷ñçóéìïðïéçèåß\n"
@@ -3831,27 +3977,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "ãñáììÞ åéóüäïõ %u åßíáé ðïëý ìåãÜëç Þ ôçò ëåßðåé ôï LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ôï êëåéäß äåí Ý÷åé óçìåéùèåß óáí áíáóöáëÝò - äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ìå "
 "øåýôéêç RNG!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "ðáñáëåßöèçêå `%s': áíôéãñÜöôçêå\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ðáñáëåßöèçêå `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4056,16 +4202,23 @@ msgstr ""
 "åðåéäÞ äåí õðïóôçñßæïíôáé áðü üëá ôá ðñïãñÜììáôá êáé ïé õðïãñáöÝò ðïõ\n"
 "Ý÷ïõí äçìéïõñãçèåß áðü áõôÜ åßíáé ìåãÜëåò êáé ðïëý áñãÝò óôçí åðáëÞèåõóç."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "ÐëçêôñïëïãÞóôå ôï ìÝãåèïò ôïõ êëåéäéïý"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "ÁðáíôÞóôå \"yes\"(íáé) Þ \"no\"(ü÷é)"
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4077,19 +4230,19 @@ msgstr ""
 "äåí èá ëÜâåôå ìéá êáëÞ áðÜíôçóç óöÜëìáôïò - áíôßèåôá ôï óýóôçìá\n"
 "ðñïóðáèåß íá åñìçíåýóåé ôçí ôéìÞ óáí äéÜóôçìá."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "ÐëçêôñïëïãÞóôå ôï üíïìá ôïõ êëåéäïêñÜôïñá"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "ðëçêôñïëïãÞóôå ðñïáéñåôéêÜ ìéá äéåýèõíóç email (óõíéóôÜôáé)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Ðáñáêáëþ ðñïáéñåôéêÜ ðëçêôñïëïãÞóôå Ýíá ó÷üëéï"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4103,13 +4256,13 @@ msgstr ""
 "O  ãéá óõíÝ÷åéá ôçò äçìéïõñãßáò êëåéäéïý.\n"
 "Q  ãéá íá ôåñìáôßóåôå ôç äçìéïõñãßá êëåéäéïý."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "ÁðáíôÞóôå \"yes\" (Þ áðëÜ \"y\") åÜí åßíáé åíôÜîåé íá äçìéïõñãçèåß ôï "
 "õðïêëåéäß."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4181,11 +4334,11 @@ msgstr ""
 "\n"
 "ÅÜí äåí îÝñåôå ðïéÜ åßíáé ç óùóôÞ áðÜíôçóç, äþóôå \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "ÁðáíôÞóôå \"yes\" åÜí èÝëåôå íá õðïãñÜøåôå ÏËÁ ôá user ID"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4193,11 +4346,11 @@ msgstr ""
 "ÁðáíôÞóôå \"yes\" åÜí ðñáãìáôéêÜ èÝëåôå íá äéáãñáöåß áõôü\n"
 "ôï user ID.  ¼ëá ôá ðéóôïðïéçôéêÜ èá ÷áèïýí ôüôå!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "ÁðáíôÞóôå \"yes\" åÜí åßíáé åíôÜîåé íá äéáãñáöåß ôï õðïêëåéäß"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4208,7 +4361,7 @@ msgstr ""
 "êáèéÝñùóç ìéá óýíäåóçò åìðéóôïóýíçò óôï êëåéäß Þ óå Ýíá Üëëï êëåéäß\n"
 "ðéóôïðïéçìÝíï áðü áõôü."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4220,7 +4373,7 @@ msgstr ""
 "÷ñçóéìïðïéÞèçêå ãéáôß áõôü ôï êëåéäß õðïãñáöÞò ìðïñåß íá êáèéåñþóåé\n"
 "ìéá óýíäåóç åìðéóôïóýíçò ìÝóù åíüò Üëëïõ Þäç ðéóôïðïéçìÝíïõ êëåéäéïý."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4228,7 +4381,7 @@ msgstr ""
 "Ç õðïãñáöÞ äåí åßíáé Ýãêõñç.  Åßíáé óõíåôü íá äéáãñáöåß áðü ôç\n"
 "êëåéäïèÞêç óáò."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4242,7 +4395,7 @@ msgstr ""
 "ôï êëåéäß ðéá.  Ïðüôå íá óõíå÷ßóåôå ìüíï åÜí áõôÞ ç éäéï-õðïãñáöÞ ãéá\n"
 "êÜðïéï ëüãï äåí åßíáé Ýãêõñç Þ õðÜñ÷åé ìéá äåýôåñç."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4252,23 +4405,23 @@ msgstr ""
 "óôçí ðñïõðÜñ÷ïõóá ëßóôá ðñïåðéëïãþí.  Ç çìåñïìçíßá üëùí ôùí åðçñåáóìÝíùí\n"
 "éäéï-õðïãñáöþí èá áõîçèåß êáôÜ 1 äåõôåñüëåðôï.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß· áõôÞ åßíáé ìéá ìõóôéêÞ ðñüôáóç \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ðáñáêáëþ åðáíáëÜâåôå ôç ôåëåõôáßá öñÜóç êëåéäß, ãéá óéãïõñéÜ."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Äþóôå ôï üíïìá ôïõ áñ÷åßïõ óôï ïðïßï åöáñìüæåôáé ç õðïãñáöÞ"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "ÁðáíôÞóôå \"yes\" åÜí åßíáé åíôÜîåé íá åðéêáëõöèåß ôï áñ÷åßï"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4276,7 +4429,7 @@ msgstr ""
 "Ðáñáêáëþ åéóÜãåôå Ýíá íÝï üíïìá áñ÷åßïõ. ÅÜí áðëÜ ðáôÞóåôå RETURN\n"
 "ôï åî'ïñéóìïý áñ÷åßï (áðåéêïíßæåôáé óôéò áãêýëåò) èá ÷ñçóéìïðïéçèåß."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4304,7 +4457,7 @@ msgstr ""
 "      ×ñçóéìïðïéåßóôå áõôü ãéá íá äçëþóåôå üôé ôï user ID äåí ðñÝðåé\n"
 "      íá ÷ñçóéìïðïéåßôáé ðéá. Ãéá íá ïñßóåôå Üêõñç ìéá äéåýèõíóç email.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4315,11 +4468,11 @@ msgstr ""
 "Ðáñáêáëþ êñáôÞóôå áõôü ôï êåßìåíï óõíïðôéêü. Ìéá Üäåéá ãñáììÞ\n"
 "ëÞãåé ôï êåßìåíï.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Äåí õðÜñ÷åé äéáèÝóéìç âïÞèåéá"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Äåí õðÜñ÷åé äéáèÝóéìç âïÞèåéá ãéá `%s'"
@@ -4381,3 +4534,26 @@ msgstr "%lu êëåéäéÜ Ý÷ïõí åëåã÷èåß (%lu õðïãñáöÝò)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: êëåéäïèÞêç äçìéïõñãÞèçêå\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|ÏÍÏÌÁ=ÔÉÌÇ|÷ñÞóç áõôÞò ôçò êáôÜóôáóçò óçìåßùóçò"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "ï ðñþôïò ÷áñáêôÞñáò ôïõ ïíüìáôïò óçìåßùóçò ðñÝðåé íá åßíáé ãñÜììá Þ "
+#~ "underscore\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "ïé ôåëåßåò óôï üíïìá óçìåßùóçò ðñÝðåé íá åßíáé ìåôáîý ÷áñáêôÞñùí\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé Þäç ìéá photo ID.\n"
+#~ "    Ç ðñïóèÞêç åíüò áêüìç photo ID ìðïñåß íá ìðåñäÝøåé êÜðïéåò åêäüóåéò "
+#~ "PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Ìðïñåßôå íá Ý÷åôå ìüíï ìéá photo ID óå Ýíá êëåéäß.\n"
diff --git a/po/eo.po b/po/eo.po
index c36a2b73a..d69bef383 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -45,7 +45,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "fini"
 
@@ -272,7 +272,7 @@ msgstr "... æi tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -337,7 +337,7 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE ÆI TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +348,7 @@ msgstr ""
 "Nesufiæe da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +356,163 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "æifri datenojn"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[dosieroj]|æifri dosierojn"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "æifri nur kun simetria æifro"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "malæifri datenojn (implicita elekto)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[dosieroj]|malæifri dosierojn"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "listigi þlosilojn"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "listigi þlosilojn kaj subskribojn"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "kontroli þlosilsubskribojn"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "listigi þlosilojn kaj fingroþpurojn"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "listigi sekretajn þlosilojn"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "krei novan þlosilparon"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "forigi þlosilojn de la publika þlosilaro"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "forigi þlosilojn de la sekreta þlosilaro"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "subskribi þlosilon"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "subskribi þlosilon loke"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "subskribi þlosilon nerevokeble"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "subskribi þlosilon loke kaj nerevokeble"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "subskribi aý redakti þlosilon"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "eksporti þlosilojn"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "eksporti þlosilojn al þlosilservilo"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importi þlosilojn de þlosilservilo"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "seræi þlosilojn æe þlosilservilo"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "aktualigi æiujn þlosilojn de þlosilservilo"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importi/kunfandi þlosilojn"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "senintervena aktualigo de fido-datenaro"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "ripari fuþitan fido-datenaron"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesaøo-kompendiojn"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,196 +522,192 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|æifri por NOMO"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan þlosilon kiel implicitan ricevonton"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi æi tiun uzantidentigilon por subskribi aý malæifri"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "uzi tekstan reøimon"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "ne devigi v3-subskribojn"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "devigi v4-subskribojn"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "ne devigi v4-þlosilsubskribojn"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "æiam uzi sigelon (MDC) por æifrado"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "neniam uzi MDC por æifrado"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "fari neniajn þanøojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "uzi gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "neinteraga reøimo: neniam demandi"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" æe la plej multaj demandoj"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" æe la plej multaj demandoj"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni æi tiun þlosilaron al la listo de þlosilaroj"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "aldoni æi tiun sekretan þlosilaron al la listo"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "montri, en kiu þlosilaro estas listigita þlosilo"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan þlosilon"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi æi tiun þlosilservilon por seræi þlosilojn"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[dosiero]|skribi statusinformojn al dosiero"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi æi tiun þlosilon absolute"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la reøimon priskribitan en RFC 1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "þalti æiujn paket-, æifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "þalti æiujn paket-, æifrad- kaj kompendi-opciojn al PGP-2.x-konduto"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-reøimon N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi æifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi æifrad-metodon NOMO"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la þlosilidentigilon de æifritaj paketoj"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Montri Foto-Identigilojn"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Ne montri Foto-Identigilojn"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Agordi komandlinion por montri Foto-Identigilojn"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOMO=VALORO|uzi æi tiun notacian datenon"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -719,7 +715,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -739,15 +735,15 @@ msgstr ""
 " --list-keys [nomoj]        montri þlosilojn\n"
 " --fingerprint [nomoj]      montri fingroþpurojn\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -757,7 +753,7 @@ msgstr ""
 "subskribi, kontroli, æifri aý malæifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -765,263 +761,275 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "ne povis analizi URI de þlosilservilo\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVERTO: '%s' estas malplena dosiero\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj æifri kun --pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "æi tiu mesaøo povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita æifrad-metodo ne validas\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "la donita gvidlinia URL por atestado ne validas\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "nevalidaj preferoj\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "nevalidaj preferoj\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "nevalidaj preferoj\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesaøon ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "la unua signo de notacia nomo devas esti litero aý substreko\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "la donita gvidlinia URL por atestado ne validas\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1118,11 +1126,13 @@ msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
 #. a string with valid answers
@@ -1316,21 +1326,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika þlosilo jam æeestas\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1338,121 +1348,131 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika þlosilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Publika þlosilo estas malþaltita.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika þlosilo jam agordita\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika þlosilo estas malþaltita\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "prefero %c%lu ne estas valida\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "nevalida signo en signoæeno\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "skribas mem-subskribon\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "skribas þlosilbindan subskribon\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "þlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "þlosilgrando rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur æifri)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur æifri)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (subskribi kaj æifri)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Uzado de æi tiu algoritmo estas malrekomendata - æu tamen krei? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1465,19 +1485,19 @@ msgstr ""
 "               implicita þlosilgrando estas 1024 bitoj\n"
 " plej granda rekomendata þlosilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun þlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "þlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
@@ -1489,12 +1509,12 @@ msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "þlosilgrando tro granda; %d estas plej granda permesata valoro.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1502,11 +1522,11 @@ msgstr ""
 "Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "æar la komputado daýras TRE longe!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1514,17 +1534,17 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita þlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1540,7 +1560,7 @@ msgstr ""
 "      <n>m = þlosilo eksvalidiøos post n monatoj\n"
 "      <n>y = þlosilo eksvalidiøos post n jaroj\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1556,30 +1576,30 @@ msgstr ""
 "      <n>m = þlosilo eksvalidiøos post n monatoj\n"
 "      <n>y = þlosilo eksvalidiøos post n jaroj\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Þlosilo validu ...? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Þlosilo validu por ...? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s neniam eksvalidiøos\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s eksvalidiøos je %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1587,11 +1607,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, øi estos øuste traktata øis 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Æu tio estas øusta (j/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1606,44 +1626,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciøi per cifero\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaý 5 signojn\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1654,27 +1674,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon aý la komenton\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (F)ini? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (B)one/(F)ini? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1682,16 +1702,16 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis øuste ripetita; provu denove"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1703,7 +1723,7 @@ msgstr ""
 "uzante æi tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1715,53 +1735,53 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n"
 "akiri sufiæe da entropio.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-þlosilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Kreado de þlosiloj nuligita.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika þlosilaro trovita: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta þlosilaro trovita: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika þlosilaro '%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "þlosilo markita kiel absolute fidata.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1769,12 +1789,12 @@ msgstr ""
 "Notu, ke æi tiu þlosilo ne estas uzebla por æifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan þlosilon por tiu celo.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de þlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1782,7 +1802,7 @@ msgstr ""
 "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1790,84 +1810,94 @@ msgstr ""
 "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei subþlosilojn por v3-þlosiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Æu vere krei? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por æi tiu komando\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ne povas malfermi: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas æifri nur per RSA-þlosiloj de maksimume 2048 bitoj kun --pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la æifron IDEA por æiuj þlosiloj, al kiuj vi æifras.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-æifrita por: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "þlosilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de þlosilbloko: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "þlosilo %08lX: ne estas RFC-2440-þlosilo - ignorita\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "þlosilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "þlosilo %08lX: PGP-2.x-stila þlosilo - ignorita\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1877,21 +1907,21 @@ msgstr "tro da registroj en pk-staplo - malþaltas\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n"
@@ -1971,178 +2001,183 @@ msgstr "sekretaj þlosiloj importitaj: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj þlosiloj neþanøitaj: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "þlosilo %08lX: nevalida subþlosila bindado\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "þlosilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "þlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "þlosilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti kaýzata de mankanta mem-subskribo\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "þlosilo %08lX: publika þlosilo ne trovita: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "þlosilo %08lX: nova þlosilo - ignorita\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla þlosilaro trovita: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de þlosilaro '%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "þlosilo %08lX: publika þlosilo importita\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "þlosilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "þlosilo %08lX: ne povas trovi originalan þlosilblokon: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "þlosilo %08lX: ne povas legi originalan þlosilblokon: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "þlosilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "þlosilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "þlosilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "þlosilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "þlosilo %08lX: 1 nova subþlosilo\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "þlosilo %08lX: %d novaj subþlosiloj\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "þlosilo %08lX: ne þanøita\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta þlosilaro: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "þlosilo %08lX: sekreta þlosilo importita\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "þlosilo %08lX: jam en sekreta þlosilaro\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "þlosilo %08lX: sekreta þlosilo ne trovita: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "þlosilo %08lX: publika þlosilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "þlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "þlosilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "þlosilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "þlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "þlosilo %08lX: nevalida subþlosila bindado\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "þlosilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "þlosilo %08lX: ignoris subþlosilon\n"
@@ -2151,107 +2186,132 @@ msgstr "þlosilo %08lX: ignoris subþlosilon\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "þlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "þlosilo %08lX: revokatestilo en maløusta loko - ignorita\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "þlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "þlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "þlosilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "þlosilo %08lX: rekta þlosilsubskribo aldonita\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de þlosilo\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de þlosiloj\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n"
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Via aktuala subskribo sur \"%s\"\n"
+"estas loka subskribo.\n"
+"\n"
+"Æu vi volas igi øin plena eksportebla subskribo?\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Via aktuala subskribo sur \"%s\"\n"
+"estas loka subskribo.\n"
+"\n"
+"Æu vi volas igi øin plena eksportebla subskribo?\n"
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2262,7 +2322,7 @@ msgstr ""
 "\n"
 "Æu vi volas igi øin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2271,48 +2331,48 @@ msgstr ""
 "\n"
 "Æu vi volas igi øin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" jam estis %ssubskribita per þlosilo %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" jam estis %ssubskribita per þlosilo %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per þlosilo %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Æi tiu þlosilo eksvalidiøis!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Æu vi volas, ke via subskribo eksvalidiøu je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "æi tiu mesaøo povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2321,27 +2381,27 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la þlosilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2349,7 +2409,32 @@ msgstr ""
 "Æu vi estas tute certa, ke vi volas subskribi æi tiun þlosilon\n"
 "per via þlosilo: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "tio povas esti kaýzata de mankanta mem-subskribo\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"La subskribo estos markita kiel neeksportebla.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"La subskribo estos markita kiel nerevokebla.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2357,7 +2442,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2365,7 +2450,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2373,7 +2458,7 @@ msgstr ""
 "\n"
 "Mi tute ne kontrolis æi tiun þlosilon.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2381,7 +2466,7 @@ msgstr ""
 "\n"
 "Mi malzorge kontrolis æi tiun þlosilon.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2389,33 +2474,33 @@ msgstr ""
 "\n"
 "Mi tre zorge kontrolis æi tiun þlosilon.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Æu vere subskribi? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Æi tiu þlosilo ne estas protektita.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Þlosilo estas protektita.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti æi tiun þlosilon: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2423,7 +2508,7 @@ msgstr ""
 "Donu la novan pasfrazon por æi tiu sekreta þlosilo.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2431,469 +2516,466 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio verþajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Æu vi vere volas fari tion? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "movas þlosilsubskribon al la øusta loko\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "forlasi æi tiun menuon"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "montri æi tiun helpon"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "listigi þlosilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "þlosilo"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "elekti flankan þlosilon N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "subskribi la þlosilon"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "subskribi la þlosilon loke"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsub"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "subskribi la þlosilon nerevokeble"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsub"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la þlosilon loke kaj nerevokeble"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "alfoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "forviþi uzantidentigilon"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "forfoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "aldoni flankan þlosilon"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "forviþi flankan þlosilon"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "revokita"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "aldoni flankan þlosilon"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "forviþi subskribojn"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "þanøi la daton de eksvalidiøo"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "æefa"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "marku uzantidentigilon kiel æefan"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta aý publika listo iri al la alia"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "monpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "agpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "aktpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "aktualigitaj preferoj"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "þanøi la pasfrazon"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "þanøi la posedantofidon"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revoki flankan þlosilon"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "malþalti þlosilon"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "þalti þlosilon"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "monfoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga reøimo\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Sekreta þlosilo estas havebla.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan þlosilon por fari tion.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Þlosilo estas revokita.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Æu vere subskribi æiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la reøimo %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Æu vere forigi æi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almenaý unu þlosilon.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Æu vi vere volas forviþi la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Æu vi vere volas forviþi æi tiun þlosilon? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Æu vi vere volas revoki æi tiun þlosilon? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Æu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Æu vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Æu skribi þanøojn? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Æu fini sen skribi þanøojn? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Æi tiu þlosilo estas revokebla per %s þlosilo %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidiøos: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Æi tiu þlosilo estas malþaltita"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subþlosilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
-"AVERTO: Æi tiu þlosilo jam havas foto-identigilon.\n"
-"        Aldono de alia foto-identigilo eble konfuzos iujn versiojn de PGP.\n"
 
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Eblas havi nur unu foto-identigilon sur þlosilo.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2902,83 +2984,109 @@ msgstr ""
 "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n"
 "        kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forviþis %d subskribon.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forviþis %d subskribojn.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviþita.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Donu la þlosilgrandon"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de la æefa þlosilo.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas þanøi la daton de eksvalidiøo de v3-þlosilo\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "þlosilo %08lX: nevalida mem-subskribo\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka þlosilo kun indekso %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -2987,7 +3095,7 @@ msgstr ""
 "\"\n"
 "subskribita per via þlosilo %08lX je %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -2996,237 +3104,245 @@ msgstr ""
 "\"\n"
 "subskribita per via þlosilo %08lX je %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Æu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "mankas sekreta þlosilo\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Subskribo-gvidlinioj: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Subskribo-notacio: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Þlosilaro"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidiøos: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Fingrospuro:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Þlosilo-fingrospuro ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-æifritaj datenoj\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "æifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika þlosilo estas %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikþlosile æifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "æifrita per %u-bita %s-þlosilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "æifrita per %s-þlosilo, %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikþlosila malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s æifritajn datenojn\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Æifro IDEA ne disponata, optimisme provas uzi %s anstataýe\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "malæifrado sukcesis\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: æifrita mesaøo estis manipulita!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki øin\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malþaltita\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti æi tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, þlosilo %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Eksvalidiøinta subskribo de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -3243,32 +3359,47 @@ msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona¼o por la æifro IDEA en æeestas\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publikþlosilan metodon %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
@@ -3409,34 +3540,39 @@ msgstr "mankas subskribitaj datenoj\n"
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "nenomita ricevonto; provas per sekreta þlosilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "æifrad-metodo %d%s estas nekonata aý malþaltita\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta þlosilo %08lX eksvalidiøis je %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "þlosilo %08lX: þlosilo estas revokita!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3463,12 +3599,16 @@ msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "ne povas seræi æe þlosilservilo: %s\n"
@@ -3526,7 +3666,14 @@ msgstr "NOTO: subskribo-þlosilo %08lX eksvalidiøis je %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
+"kompletigo.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3534,40 +3681,46 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s æifrado estos aplikata\n"
@@ -3795,27 +3948,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, aý mankas linifino\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "þlosilo ne estas markita kiel malsekura - ne povas uzi øin kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta þlosilo jam æeestas\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4010,16 +4163,23 @@ msgstr ""
 "rekomendataj, æar ili ne estas komprenataj de æiuj programoj, kaj\n"
 "subskriboj kreitaj per ili etas iom grandaj kaj malrapide kontroleblaj."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Donu la þlosilgrandon"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Respondu per \"jes\" aý \"ne\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4031,19 +4191,19 @@ msgstr ""
 "bonan eraromesaøon; anstataýe la sistemo provas interpreti\n"
 "la donitan valoron kiel gamon."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Donu la nomon de la þlosilposedanto"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Bonvolu doni nedevigan komenton"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4057,11 +4217,11 @@ msgstr ""
 "B  por daýrigi kun la þlosilkreado.\n"
 "F  por interrompi la þlosilkreadon kaj fini."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Respondu per \"jes\" (aý nur \"j\"), se la subþlosilo estu kreita."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4131,11 +4291,11 @@ msgstr ""
 "\n"
 "Se vi ne scias la øustan respondon, respondu per \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Respondu per \"jes\", se vi volas subskribi æiujn uzantidentigilojn"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4143,11 +4303,11 @@ msgstr ""
 "Respondu per \"jes\", se vi vere volas forviþi la uzantidentigilon.\n"
 "Tiam ankaý æiuj atestiloj perdiøos!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Respondu per \"jes\", se la subþlosilo estu forviþita"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4157,7 +4317,7 @@ msgstr ""
 "æi tiun subskribon, æar eble øi estos grava por establi fido-ligon\n"
 "al la þlosilo aý al alia þlosilo atestita per æi tiu þlosilo."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4169,7 +4329,7 @@ msgstr ""
 "þlosilo estis uzita, æar la subskribanta þlosilo eble establos\n"
 "fido-ligon tra alia jam atestita þlosilo."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4177,7 +4337,7 @@ msgstr ""
 "La subskribo ne estas valida. Estas prudente forigi øin de\n"
 "via þlosilaro."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4191,7 +4351,7 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -4202,24 +4362,24 @@ msgstr ""
 "al la aktuala listo de preferoj. La dato de æiuj trafitaj\n"
 "mem-subskriboj estos antaýenigitaj je unu sekundo.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi tajpis."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donu la nomon de la dosiero, al kiu la subskribo aplikiøas"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4227,7 +4387,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4255,7 +4415,7 @@ msgstr ""
 "      Uzu æi tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
 "      normale oni uzas æi tion por marki retadreson kiel nevalidan.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4265,11 +4425,11 @@ msgstr ""
 "æi tiun revokatestilon. Bonvolu fari æi tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
@@ -4332,6 +4492,27 @@ msgstr "%lu þlosiloj kontrolitaj (%lu subskriboj)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: þlosilaro kreita\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOMO=VALORO|uzi æi tiun notacian datenon"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "la unua signo de notacia nomo devas esti litero aý substreko\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "AVERTO: Æi tiu þlosilo jam havas foto-identigilon.\n"
+#~ "        Aldono de alia foto-identigilo eble konfuzos iujn versiojn de "
+#~ "PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Eblas havi nur unu foto-identigilon sur þlosilo.\n"
+
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Æu vi vere bezonas tiom grandan þlosilgrandon? "
 
@@ -4567,9 +4748,6 @@ msgstr "%s: þlosilaro kreita\n"
 #~ msgid "For info see http://www.gnupg.org"
 #~ msgstr "Por informoj vidu http://www.gnupg.org"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (subskribi kaj æifri)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Æu vi vere volas krei subskriban kaj æifran þlosilon? "
 
@@ -4603,8 +4781,5 @@ msgstr "%s: þlosilaro kreita\n"
 #~ msgid "invalid"
 #~ msgstr "nevalida"
 
-#~ msgid "revoked"
-#~ msgstr "revokita"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "mankas sekreta þlosilo por malæifrado\n"
diff --git a/po/es.po b/po/es.po
index 5d45b834e..2a942a68f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-22 21:27+0200\n"
 "Last-Translator: Jaime Suárez <jjsuarez@iname.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -49,7 +49,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "salir"
 
@@ -303,7 +303,7 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -374,7 +374,7 @@ msgstr ""
 "¡NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -390,7 +390,7 @@ msgstr ""
 # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -398,170 +398,170 @@ msgstr ""
 "@Órdenes:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "sólo almacenar"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "elimina la clave del anillo privado"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "lista sólo la secuencia de paquetes"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza dañada"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o de la entrada estándar"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o a la entrada estándar"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -571,90 +571,90 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresión N (0 no comprime)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
 # usa
 # Vale.
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "usa el agente gpg"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -664,122 +664,118 @@ msgstr "proceso por lotes: nunca preguntar"
 # Además una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "sí" en casi todas las
 # preguntas no me acaba de gustar.
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "añade este anillo a la lista de anillos"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "añade este anillo secreto a la lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en este descriptor de fichero"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|DF|escribe información de estado en este descriptor de fichero"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|confía plenamente en esta clave"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga módulo de extensiones FICHERO"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseña N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contraseñas"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contraseñas"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresión N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOMBRE=VALOR|usa estos datos de notación"
-
 # ordenes -> órdenes
 # página man -> página de manual
 # Vale. ¿del manual mejor?
 # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -787,7 +783,7 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -807,15 +803,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -825,7 +821,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -833,236 +829,245 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres válido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "ATENCIÓN `%s' es un fichero vacío\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: g10/g10.c:1492
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "URL de política inválida\n"
-
-#: g10/g10.c:1496
+#: g10/g10.c:1613
 #, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "URL de política inválida\n"
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresión debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1651
 #, fuzzy
-msgid "invalid preferences\n"
+msgid "invalid default preferences\n"
 msgstr "muestra preferencias"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "muestra preferencias"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "muestra preferencias"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "muestra preferencias"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicialización de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [órdenes]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución inválido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1070,37 +1075,39 @@ msgstr "[nombre_fichero]"
 # En español no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario déjalo siempre.
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "El primer carácter de una notación debe ser una letra o un subrayado\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "un nombre de notación debe tener sólo letras, dígitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "los puntos en una notación deben estar rodeados por otros caracteres\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación no debe usar ningún caracter de control\n"
 
+#: g10/g10.c:2520
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "URL de política inválida\n"
+
+#: g10/g10.c:2522
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "URL de política inválida\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1197,11 +1204,13 @@ msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es válido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Razón para la revocación: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Comentario a la revocación: "
 
 #. a string with valid answers
@@ -1403,145 +1412,155 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave pública ya presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave pública ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Clave pública deshabilitada.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: omitida: clave pública ya presente\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave pública deshabilitada\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "Demasiadas preferencias"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escribiendo autofirma\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firmar y cifrar)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (firmar y cifrar)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "El uso de este algoritmo está desaconsejado - ¿crear de todas formas?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1554,19 +1573,19 @@ msgstr ""
 "        el tamaño por defecto es 1024 bits\n"
 " el tamaño máximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "¿De qué tamaño quiere la clave (1024)? "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA sólo permite tamaños desde 512 a 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamaño de clave insuficiente; 1024 es el mínimo permitido para RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 
@@ -1578,12 +1597,12 @@ msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamaño excesivo; %d es el máximo valor permitido.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1591,11 +1610,11 @@ msgstr ""
 "No se recomiendan claves de más de 2048 bits porque\n"
 "¡el tiempo de cálculo es REALMENTE largo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1603,17 +1622,17 @@ msgstr ""
 "De acuerdo, ¡pero tenga en cuenta que las radiaciones de su monitor y\n"
 "teclado también son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1629,7 +1648,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1646,31 +1665,31 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1678,11 +1697,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "¿Es correcto (s/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1698,44 +1717,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1746,29 +1765,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la dirección de correo-e en el nombre realo en el "
 "comentario\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (S)alir? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1776,17 +1795,17 @@ msgstr ""
 "Necesita una contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1798,7 +1817,7 @@ msgstr ""
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1811,54 +1830,54 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave pública en `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "clave %08lX: clave pública no encontrada: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no puede bloquearse el anillo secreto: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1866,12 +1885,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
 "la orden \"--edit-key\" para crear una clave secundaria con este propósito.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1879,7 +1898,7 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1887,84 +1906,94 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el estándar OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "¿Crear de verdad? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no se puede abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contraseña: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCIÓN: fichero vacío\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
@@ -1974,21 +2003,21 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave pública - omitida\n"
@@ -2068,179 +2097,184 @@ msgstr " claves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "clave %08lX: unión de subclave inválida\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario válidos\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave pública no encontrada: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no puede escribirse el anillo: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "clave %08lX: clave pública importada\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificador de usuario\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no puede bloquearse el anillo secreto: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave pública - imposible emplear el\n"
 "certificado de revocación\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocación inválido: %s - rechazado\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocación importado\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "clave %08lX: algoritmo de clave pública no disponible\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "clave %08lX: autofirma inválida\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave pública no disponible\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX: unión de subclave inválida\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
@@ -2249,184 +2283,200 @@ msgstr "clave %08lX: subclave omitida\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "clave %08lX: certificado de revocación en lugar equivocado - omitido\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocación no valido: %s - omitido\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocación añadido\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma válida\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma válida\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "La clave está protegida.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:404
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: ¡Esta clave ha caducado!\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave no está protegida.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2434,7 +2484,32 @@ msgstr ""
 "¿Está realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "esto puede ser debido a la ausencia de autofirma\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"La firma se marcará como no exportable.\n"
+"\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"La firma se marcará como no exportable.\n"
+"\n"
+
+#: g10/keyedit.c:616
 #, fuzzy
 msgid ""
 "\n"
@@ -2443,7 +2518,7 @@ msgstr ""
 "La firma se marcará como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 #, fuzzy
 msgid ""
 "\n"
@@ -2452,51 +2527,51 @@ msgstr ""
 "La firma se marcará como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Esta clave no está protegida.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no están disponibles.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "La clave está protegida.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2504,7 +2579,7 @@ msgstr ""
 "Introduzca la nueva contraseña para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2512,564 +2587,589 @@ msgstr ""
 "No ha especificado contraseña. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "¿Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "sale de este menú"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "graba"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "ayuda"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "hdac"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "idu"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "clave"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "comprueba"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "firma"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "nrsign"
 msgstr "firma"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrlsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "añaidu"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "añade un identificador de usuario"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 #, fuzzy
 msgid "add a photo ID"
 msgstr "añade un identificador de usuario"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "borridu"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "añacla"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "añade una clave secundaria"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "borrcla"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "añacla"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "añade una clave secundaria"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "borrfir"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "cambia"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y públicas"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "verpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "set preference list"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updated preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "contr"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "cambia la contraseña"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "conf"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revfir"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revcla"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "descla"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "habcla"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "La clave está protegida.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "¿Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario para firmar\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "¡No puede borrar el último identificador de usuario!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "¿Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "¿Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "¿De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "¿De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "¿De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "¿De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "¿Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "¿Crear los certificados de revocación realmente? (s/N)"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "¿Grabar cambios? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "¿Salir sin grabar? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualización de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1740
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+msgid "This key may be revoked by %s key "
 msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! ¡esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev-  se encontró una revocación falsificada\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema comprobando la revocación: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "¿Seguro que quiere una clave de este tamaño? "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "¿Seguro que quiere una clave de este tamaño? "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introduzca la longitud de la clave"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selección de las claves secretas.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "clave %08lX: autofirma inválida\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ningún identificador de usuario con el índice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el índice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3078,7 +3178,7 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3087,241 +3187,249 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave (s/N)?"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "firma %s de: %s\n"
+
+#: g10/keylist.c:93
 #, fuzzy
 msgid "Signature policy: "
 msgstr "firma %s de: %s\n"
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación inválidos\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notación: "
+
+#: g10/keylist.c:129
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Notación: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca el %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Huella dactilar:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "         Huella dactilar:"
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas múltiples\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz inválido detectado en proc_tree()\n"
 
@@ -3340,31 +3448,46 @@ msgstr ""
 "ese algoritmo de cifrado está desacreditado;¡por favor use uno más "
 "estándar!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "ATENCIÓN `%s' es un fichero vacío\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATENCIÓN `%s' es un fichero vacío\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave pública %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
@@ -3506,34 +3629,39 @@ msgstr "no hay datos firmados\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatario anónimo, probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificación de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "clave %08lX: ¡esta clave ha sido revocada!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, fuzzy, c-format
@@ -3560,12 +3688,16 @@ msgstr "envió correcto a `%s` (estado=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "falló el envio a `%s': status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "no puede obtenerse la clave en el servidor: %s\n"
@@ -3623,45 +3755,55 @@ msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit crítico desconocido\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCIÓN `%s' es un fichero vacío\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descifrado fallido: %s\n"
@@ -3893,25 +4035,25 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "la línea %u es demasiado larga o no tiene avance de línea (LF)\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' omitido: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4100,16 +4242,23 @@ msgstr ""
 "ya que no todos los programas pueden utilizarlas y las firmas creadas\n"
 "con ellas son bastante grandes y lentas de verificar."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sí\" o \"no\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4121,21 +4270,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentará interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del dueño de la clave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Introduzca una dirección de correo electrónico (opcional pero muy\n"
 "recomendable)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4149,11 +4298,11 @@ msgstr ""
 "O  para continuar con la generación de clave.\n"
 "S  para interrumpir la generación de clave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sí\" (o sólo \"s\") para generar la subclave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4194,11 +4343,11 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Responda \"sí\" si quiere firmar TODOS los IDs de usuario"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4206,11 +4355,11 @@ msgstr ""
 "Responda \"sí\" si realmente quiere borrar este ID de usuario.\n"
 "¡También se perderán todos los certificados!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sí\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4220,7 +4369,7 @@ msgstr ""
 "borrar esta firma ya que puede ser importante para establecer una conexión\n"
 "de confianza con la clave o con otra clave certificada por ésta."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4232,13 +4381,13 @@ msgstr ""
 "se usó, ya que dicha clave podría establecer una conexión de confianza\n"
 "a través de otra clave certificada."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Esta firma no es válida. Tiene sentido borrarla de su anillo."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4251,33 +4400,33 @@ msgstr ""
 "volver a usar esta clave. Así que bórrela tan sólo si esta autofirma no\n"
 "es válida por alguna razón y hay otra disponible."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor introduzca la contraseña"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la última contraseña para asegurarse de lo que tecleó."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduzca el nombre del fichero al que corresponde la firma"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sí\" para sobreescribir el fichero"
 
 # Sugerencia: ENTER -> INTRO.
 # Aceptada.
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4285,7 +4434,7 @@ msgstr ""
 "Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usará el fichero\n"
 "por omisión (mostrado entre corchetes)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4314,7 +4463,7 @@ msgstr ""
 "      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
 "      dirección de correo-e como inválida.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4324,11 +4473,11 @@ msgstr ""
 "este certificado de revocación. Por favor, que el texto sea breve.\n"
 "Una línea vacía pone fin al texto.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
@@ -4391,6 +4540,18 @@ msgstr "lista claves y firmas"
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOMBRE=VALOR|usa estos datos de notación"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "El primer carácter de una notación debe ser una letra o un subrayado\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "los puntos en una notación deben estar rodeados por otros caracteres\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "¿Seguro que quiere una clave de este tamaño? "
@@ -4468,9 +4629,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: error comprobando la clave: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
 
diff --git a/po/et.po b/po/et.po
index ee1577aed..4b9e9f140 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-22 12:07+0200\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "välju"
 
@@ -272,7 +272,7 @@ msgstr "... see on viga (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
@@ -337,7 +337,7 @@ msgstr ""
 "ÄRGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +348,7 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid töid,\n"
 "et anda masinal võimalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +356,163 @@ msgstr ""
 "@Käsud:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "krüpteeri andmed"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[failid]|krüpteeri failid"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "krüpteerimine kasutades ainult sümmeetrilist ¨ifrit"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "ainult salvesta"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "dekrüpteeri andmed (vaikimisi)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[failid]|dekrüpteeri failid"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "näita võtmeid"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "näita võtmeid ja allkirju"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "näita võtmeid ja sõrmejälgi"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "allkirjasta võti mitte-tühistatavana"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "allkirjasta võti lokaalselt ja mitte-tühistatavana"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "näita ainult pakettide järjendeid"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse väärtused"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "impordi usalduse väärtused"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "hooldusvaba usalduse andmebaasi uuendamine"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail või standardsisend lahti"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail või standardsisend"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|trüki teatelühendid"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,196 +522,192 @@ msgstr ""
 "Võtmed:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi võtit"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "kasuta väljundfailina"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "ära kasuta terminali"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "ära kasuta v3 allkirju"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "kasuta v4 võtme allkirju"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "ära kasuta v3 võtme allkirju"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "krüptimisel kasuta alati MDC"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "krüptimisel ära kasuta kunagi MDC"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "ära tee mingeid muutusi"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "kasuta gpg-agenti"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste võtmete hoidla nimekirja"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda võtmeserverit"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "loe võtmed failist"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[fail]|kirjuta olekuinfo faili"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|VÕTMEID|usalda seda võtit täielikult"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta kõikides tegevustes OpenPGP võtmeid"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "kasuta kõikide pakettide, ¨iffrite ja lühendi seadeid PGP 2.x moodis"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega lühendialgoritmi NIMI"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega ¨ifri algoritmi NIMI"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta ¨ifri algoritmi NIMI"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "ära lisa krüptimisel võtme id"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Esita foto IDd"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Sea käsurida foto ID vaatamiseks"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NIMI=VÄÄRTUS|kasuta neid noteerimise andmeid"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -719,7 +715,7 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -739,15 +735,15 @@ msgstr ""
 " --list-keys [nimed]        näita võtmeid\n"
 " --fingerprint [nimed]      näita sõrmejälgi\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -757,7 +753,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -765,265 +761,276 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "võtmete fail `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "HOIATUS: võtit %s ei soovitata kasutada.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "antud allkirja poliisi URL on vigane\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "antud sertifikaadi poliisi URL on vigane\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi kontrolli mood; peab olema 0, 1, 2 või 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "vigased eelistused\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [käsud]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei õnnestu avada: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane teatelühendi algoritm `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "esimene sümbol noteerimise nimes peab olema täht või alakriips\n"
-
-#: g10/g10.c:2319
-msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "noteerimise nimes võivad olla ainult tähed, numbrid, punktid ja alakriipsud\n"
 "ning lõpus peab olema '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"punktid noteerimise nimes peavad olema ümbritsetud teiste sümbolitega\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "antud sertifikaadi poliisi URL on vigane\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "antud allkirja poliisi URL on vigane\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1119,11 +1126,13 @@ msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Tühistamise põhjus: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Tühistamise kommentaar: "
 
 #. a string with valid answers
@@ -1316,21 +1325,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1338,120 +1347,130 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  Lõpetage tühja reaga: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Avalik võti on blokeeritud.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "eelistus %c%lu ei ole lubatud\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "kirjutan iseenda allkirja\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (allkirjastamiseks ja krüptimiseks)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (allkirjastamiseks ja krüptimiseks)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1464,19 +1483,19 @@ msgstr ""
 "            vaikimisi võtmepikkus on 1024 bitti\n"
 "    suurim soovitatav võtmepikkus on 2048 bitti\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n"
 
@@ -1488,12 +1507,12 @@ msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "võtmepikkus on liiga suur; suurim lubatud väärtus on %d.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1501,11 +1520,11 @@ msgstr ""
 "Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n"
 "arvutused võtavad VÄGA palju aega!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Olete kindel, et soovite sellist võtmepikkust? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1513,17 +1532,17 @@ msgstr ""
 "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
 "võimalikud ründeobjektid!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud võtmepikkus on %u bitti\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1539,7 +1558,7 @@ msgstr ""
 "      <n>m = võti aegub n kuuga\n"
 "      <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1555,30 +1574,30 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1586,11 +1605,11 @@ msgstr ""
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1605,44 +1624,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei või alata numbriga\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1653,27 +1672,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1681,16 +1700,16 @@ msgstr ""
 "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1702,7 +1721,7 @@ msgstr ""
 "kasutades seda programmi võtmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1714,53 +1733,53 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku võtme faili `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "võti on märgitud abslouutselt usaldatuks.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1769,102 +1788,112 @@ msgstr ""
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "MÄRKUS: v3 võtmetele alamvõtmete loomine ei ole OpenPGP ühilduv\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Loon tõesti? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ei õnnestu avada: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: HOIATUS: tühi fail\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "RSA võtmeid pikkusega kuni 2048 bitti saab krüpteerida ainult --pgp2 moodis\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kõikide krüpteeritavate võtmetega ei saa IDEA ¨iffrit kasutada.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "MÄRKUS: ¨ifri algoritm %d puudub eelistustes\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krüptitud kasutajale: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "võti %08lX: ei ole rfc2440 võti - jätsin vahele\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1874,23 +1903,23 @@ msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n"
@@ -1970,179 +1999,184 @@ msgstr " salajasi võtmeid imporditud: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi võtmeid: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "võti %08lX: vigane alamvõtme seos\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "võti %08lX: uus võti - jätsin vahele\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "võti %08lX: avalik võti on imporditud\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "võti %08lX: 1 uus kasutaja ID\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "võti %08lX: %d uut kasutaja IDd\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "võti %08lX: 1 uus allkiri\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "võti %08lX: %d uut allkirja\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "võti %08lX: 1 uus alamvõti\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "võti %08lX: %d uut alamvõtit\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "võti %08lX: ei muudetud\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "võti %08lX: salajane võti on imporditud\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "võti %08lX: salajast võtit ei leitud: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "võti %08lX: tühistamise sertifikaat imporditud\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "võti %08lX: vigane alamvõtme seos\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "võti %08lX: jätsin vahele kasutaja ID '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "võti %08lX: jätsin alamvõtme vahele\n"
@@ -2151,108 +2185,128 @@ msgstr "võti %08lX: jätsin alamvõtme vahele\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Hoiatus: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Hoiatus: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "võti %08lX: tühistamise sertifikaat lisatud\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[tühistamine]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri jäi testimata, kuna võti puudub\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja jäi testimata, kuna võtmed puuduvad\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri jäi vea tõttu kontrollimata\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja jäi vigade tõttu kontrollimata\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin ühe kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Teie praegune allkiri \"%s\"\n"
+"on lokaalne allkiri.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2261,50 +2315,50 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "See võti on aegunud!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See võti aegub %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x võtmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab võtme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2314,27 +2368,27 @@ msgstr ""
 "kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole üldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud väga hoolikalt.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2342,7 +2396,32 @@ msgstr ""
 "Olete tõesti kindel, et soovite seda võtit oma\n"
 "võtmega allkirjastada: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Allkiri märgitakse mitte-eksporditavaks.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2350,7 +2429,7 @@ msgstr ""
 "\n"
 "Allkiri märgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2358,7 +2437,7 @@ msgstr ""
 "\n"
 "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2366,7 +2445,7 @@ msgstr ""
 "\n"
 "Ma ei ole seda võtit üldse kontrollinud.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2374,7 +2453,7 @@ msgstr ""
 "\n"
 "Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2382,33 +2461,33 @@ msgstr ""
 "\n"
 "Ma olen kontrollinud seda võtit väga hoolikalt.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "See võti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Võti on kaitstud.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda võtit ei õnnestu toimetada: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2416,7 +2495,7 @@ msgstr ""
 "Sisestage sellele salajasele võtmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2424,470 +2503,468 @@ msgstr ""
 "Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Kas te tõesti soovite seda teha? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "tõstan võtme allkirja õigesse kohta\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "salvesta ja välju"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "näita võtit ja kasutaja IDd"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "vali sekundaarne võti N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "näita allkirju"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "allkirjasta võti"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "lisa foto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "lisa sekundaarne võti"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne võti"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "lisa sekundaarne võti"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primaarne"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "märgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "lülita"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "lülita salajaste või avalike võtmete loendi vahel"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "näita eelistusi (ekspert)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "näita eelistusi (detailsena)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "tühista allkirjad"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "tühista sekundaarne võti"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "blokeeri võti"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "luba võti"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "näita foto ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Käsklus> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Kas te tõesti soovite seda võtit kustutada? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Kas tõesti uuendan seaded? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Selle võtme võib olla tühistanud %s võti %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamvõti on tühistatud: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud võltsitud tühistamine\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Tuleb tähele panna, et kuni te pole programmi uuesti käivitanud,ei pruugi "
 "näidatud võtme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"HOIATUS: Sellel võtmel on juba foto ID.\n"
-"         Järgmise foto ID lisamine võib tekitada segadusi mõne PGP\n"
-"         versiooni kasutamisel.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Võtmel võib olla ainult üks foto ID.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2896,83 +2973,108 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n"
 "         PGP versioone seda võtit tagasi lükkama.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Sisestage võtmepikkus"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige ülimalt üks sekundaarne võti.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne võti numbriga %d puudub\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -2981,7 +3083,7 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -2990,234 +3092,242 @@ msgstr ""
 "\"\n"
 "lokaalselt allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Allkirja poliitika: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Allkirja noteerimine: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Võtmehoidla"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Sõrmejälg:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "               Sõrmejälg:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Võtme sõrmejälg ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krüpteeritud andmed\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s krüpteeritud andmeid\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA ¨iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Noteering: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Poliis: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -3235,31 +3345,46 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "see ¨ifri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA ¨ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "HOIATUS: võtit %s ei soovitata kasutada.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "HOIATUS: võtit %s ei soovitata kasutada.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
@@ -3400,34 +3525,39 @@ msgstr "allkirjastatud andmeid pole\n"
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anonüümne teate saaja.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "¨ifri algoritm %d%s on tundmatu või blokeeritud\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "MÄRKUS: ¨ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "võti %08lX: võti on tühistatud!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3454,12 +3584,16 @@ msgstr "teate saatmine serverile `%s' õnnestus (olek=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "võtmeserverist ei saa otsida: %s\n"
@@ -3516,7 +3650,14 @@ msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti tõttu vigast allkirja\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
+"kompaktset.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3524,40 +3665,46 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s allkiri kasutajalt: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on tühi fail\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "PGP 2.x stiilis võtmetega saab allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "MÄRKUS: ¨ifri algoritm %d puudub eelistustes\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis võtmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s krüpteerimist\n"
@@ -3785,26 +3932,26 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk või seavahetus puudub\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' jätsin vahele: duplikaat\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3996,16 +4143,23 @@ msgstr ""
 "kasutamine soovitatav, kuna mitte kõik programmid ei toeta neid\n"
 "ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Sisestage võtmepikkus"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" või \"ei\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4017,19 +4171,19 @@ msgstr ""
 "saa korrektset veateadet, kuna süsteem üritab antud väärtust\n"
 "tõlgendada vahemikuna."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Sisestage võtmehoidja nimi"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga väga soovitav"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Te võite nüüd sisestada kommentaari"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4043,11 +4197,11 @@ msgstr ""
 "O  et jätkata võtme loomist.\n"
 "V  et lõpetada võtme loomine."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastake \"jah\" (või \"j\"), kui võib alustada alamvõtme loomisega."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4118,11 +4272,11 @@ msgstr ""
 "\n"
 "Kui te ei tea õiget vastust, vastake \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Kui te soovite allkirjastada KÕIK kasutaja IDd, vastake \"jah\""
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4130,11 +4284,11 @@ msgstr ""
 "Kui te tõesti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamvõtme võib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4144,7 +4298,7 @@ msgstr ""
 "kuna see allkiri võib olla vajalik, et kirjeldada antud võtme või\n"
 "antud võtmega sertifitseeritud teise võtme usaldatavust."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4156,13 +4310,13 @@ msgstr ""
 "kasutab, sest see võti võib moodustada usaldussuhte läbi mõne juba\n"
 "sertifitseeritud võtme."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Allkiri ei ole kehtiv. Oleks mõistlik see võtmehoidlast kustutada."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4176,7 +4330,7 @@ msgstr ""
 "vaid siis, kui see allkiri ei ole miskipärast kehtiv ja on\n"
 "olemas ka teine allkiri, mis kasutajat võtmega seob."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4186,23 +4340,23 @@ msgstr ""
 "vastavaks hetkel määratud seadetele. Kõikide asjasse puutuvate\n"
 "ise loodud allkirjade ajatempleid suurendatakse ühe sekundi võrra.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili võib üle kirjutada"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4210,7 +4364,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4239,7 +4393,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt märkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4249,11 +4403,11 @@ msgstr ""
 "soovite seda tühistamise sertifikaati esitada. Palun kirjutage\n"
 "lühidalt. Tühi rida lõpetab teksti.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
@@ -4315,3 +4469,25 @@ msgstr "kontrollitud %lu võtit (%lu allkirja)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: võtmehoidla on loodud\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NIMI=VÄÄRTUS|kasuta neid noteerimise andmeid"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "esimene sümbol noteerimise nimes peab olema täht või alakriips\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "punktid noteerimise nimes peavad olema ümbritsetud teiste sümbolitega\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "HOIATUS: Sellel võtmel on juba foto ID.\n"
+#~ "         Järgmise foto ID lisamine võib tekitada segadusi mõne PGP\n"
+#~ "         versiooni kasutamisel.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Võtmel võib olla ainult üks foto ID.\n"
diff --git a/po/fr.po b/po/fr.po
index cd8d89c75..7a38a39ba 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-03-28 23:43+01:00\n"
 "Last-Translator: Gaël Quéri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -52,7 +52,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "quitter"
 
@@ -279,7 +279,7 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouvé un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -347,7 +347,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONNÉES GÉNÉRÉES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -358,7 +358,7 @@ msgstr ""
 "Il n'y a pas assez d'octets aléatoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -366,163 +366,163 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "[fichier]|chiffrer les fichiers"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[fichiers]|déchiffrer les fichiers"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "lister les clés"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "lister les clés et les signatures"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "vérifier les signatures des clés"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "lister les clés et les empreintes"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "lister les clés secrètes"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clés"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "enlever les clés du porte-clés public"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "enlever les clés du porte-clés secret"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "signer une clé"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "signer une clé localement"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "signer une clé irrévocablement"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "signer une clé localement et irrévocablement"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clé"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exporter les clés"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exporter les clés vers un serveur de clés"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importer les clés d'un serveur de clés"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "chercher les clés avec un serveur de clés"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clés depuis un serveur"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importer/fusionner les clés"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "mise à jour inattendue de la base de confiance"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "réparer une base de confiance corrompue"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure à un fichier ou à stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,203 +532,199 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "créer une sortie ascii avec armure"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme récipient par défaut"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "utiliser la clé par déf. comme récipient"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou déchiffrer"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "ne pas forcer les signatures en v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "forcer les signatures en v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "ne pas forcer les signatures en v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr ""
 "ne jamais utiliser de sceau pour le\n"
 "chiffrement"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "utiliser gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "répondre oui à la plupart des questions"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "répondre non à la plupart des questions"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clés à la liste"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clés secret à la liste"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "indiquer où est une clé listée"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clé secrète par défaut"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HÔTE|utiliser ce serveur pour chercher des clés"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractères NOM"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[fichier]|écrire les informations d'état vers ce fichier"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCLÉ|donner une confiance ultime à cette clé"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode décrit dans la RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement défini par OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "utiliser le comportement de PGP 2.x\n"
 "pour toutes les options de paquets,\n"
 "de hachage et de chiffrement"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffrés"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Montrer les photos d'identité"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Ne pas montrer les photos d'identité"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Choisir la ligne de commande servant à\n"
 "afficher les photos d'identité"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOM=VALEUR|utiliser ces données de notation"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -736,7 +732,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste complète des commandes et options)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,17 +752,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les clés\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies à <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +772,7 @@ msgstr ""
 "signer, vérifier, chiffrer ou déchiffrer\n"
 "l'opération par défaut dépend des données entrées\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,273 +780,281 @@ msgstr ""
 "\n"
 "Algorithmes supportés:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par défaut `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caractères valide\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "impossible d'interpréter l'URI du serveur de clés\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature détachée ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en même temps en mode --pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activé.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "ce message ne sera pas forcément utilisable par PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "l'URL de politique de signature donnée est invalide\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL de politique de certification donnée est invalide\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» doit être supérieur à 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» doit être supérieur à 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "«max-cert-depth» doit être compris entre 1 et 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level invalide; ce doit être 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "préférences invalides\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "préférences invalides\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "préférences invalides\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "préférences invalides\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a échoué: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a échoué: %s \n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"le premier caractère du nom d'une notation doit être un lettre ou un trait\n"
-"de soulignement\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "le nom d'une notation ne doit comporter que des lettres, des chiffres,\n"
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "égal\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"les points dans le nom d'une notation doivent être entourés d'autes "
-"caractères\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "l'URL de politique de certification donnée est invalide\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "l'URL de politique de signature donnée est invalide\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1147,11 +1151,13 @@ msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Cause de révocation: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Commentaire de révocation: "
 
 #. a string with valid answers
@@ -1346,24 +1352,24 @@ msgstr ""
 "            Il n'est pas sûr que la signature appartient à son "
 "propriétaire.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignoré: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignoré: clé publique déjà présente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas spécifié de nom d'utilisateur. (vous pouvez\n"
 "utiliser «-r»)\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1371,125 +1377,136 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignoré: la clé publique est déjà le récipient par défaut\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "La clé publique est désactivée.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "ignoré: clé publique déjà activée\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "récipient par défaut `%s' inconnu\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignoré: la clé publique est désactivée\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la préférence %c%lu n'est pas valide\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "préférence %c%lu dupliquée\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "trop de préférences `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Caractère invalide dans la chaîne\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "écriture de l'auto-signature\n"
+
+# g10/keygen.c:123 ???
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "écriture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de liaison\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par défaut)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (signature et chiffrement)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "L'utilisation de cet algorithme est déconseillé - faut-il quand-même\n"
 "créer la clé ?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1502,19 +1519,19 @@ msgstr ""
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
@@ -1526,12 +1543,12 @@ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1539,11 +1556,11 @@ msgstr ""
 "Les tailles supérieures à 2048 ne sont pas conseillées car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sûr de vouloir cette taille ? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1551,17 +1568,17 @@ msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre écran et de votre\n"
 "clavier sont aussi très vulnérables aux attaques !\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1577,7 +1594,7 @@ msgstr ""
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n années\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1593,30 +1610,30 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n années\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1624,11 +1641,11 @@ msgstr ""
 "Votre système ne sait pas afficher les dates au-delà de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'à 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1644,44 +1661,44 @@ msgstr ""
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nom réel: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caractère invalide dans le nom\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caractères de long\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Caractère invalide dans le commentaire\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères '%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1692,28 +1709,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom réel ou dans le commentaire\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1721,16 +1738,16 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas été correctement répété ; recommencez."
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1742,7 +1759,7 @@ msgstr ""
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1754,55 +1771,55 @@ msgstr ""
 "pendant la génération de nombres premiers; cela donne au générateur de\n"
 "nombres aléatoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "écriture de la clé publique vers `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "écriture de la clé secrète vers `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-clés public n'a été trouvé avec des droits d'écriture : %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-clés secret n'a été trouvé avec des droits d'écriture : %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'écriture du porte-clés public `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'écriture du porte-clés secret `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "les clés publique et secrète ont été créées et signées.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "clé marquée comme ayant une confiance ultime.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1811,13 +1828,13 @@ msgstr ""
 "utiliser la commande «--edit-key» pour générer une clé secondaire à\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La génération de clé a échoué: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1825,7 +1842,7 @@ msgstr ""
 "la clé a été créée %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1833,89 +1850,101 @@ msgstr ""
 "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "problème d'horloge\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: créer des sous-clés pour des clés v3 n'est pas conforme à OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' déjà compressé\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossible d'ouvrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la création du mot de passe: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des clés de moins de 2048 bits\n"
 "en mode --pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les clés vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTE: l'algorithme de chiffrement %d n'a pas été trouvé dans les "
+"préférences\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffré pour: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "clé '%s' introuvable: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de clé : %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clé %08lX: ce n'est pas une clé rfc2440 - ignorée\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clé %08lX: non protégée - ignorée\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clé %08lX: clé de style PGP 2.x - ignorée\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a été exporté\n"
 
@@ -1925,23 +1954,23 @@ msgstr "trop d'entrées dans le cache pk - désactivé\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "La clé invalide %08lX a été rendu valide par --always-trust\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la clé secondaire %08lX à la place de la clé\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clé %08lX: clé secrète sans clé publique - non prise en compte\n"
@@ -2021,179 +2050,184 @@ msgstr "       clés secrètes importées: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "      clés secrètes inchangées: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "clé %08lX: liaison avec la sous-clé invalide\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clé %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "clé %08lX: utilisateur non signé par lui-même accepté: '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clé %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clé %08lX: clé publique pas trouvée: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clé %08lX: nouvelle clé - ignorée\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-clé n'a été trouvé avec des droits d'écriture : %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "écriture de `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'écriture du porte-clés `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "clé %08lX: clé publique importée\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clé %08lX: ne ressemble pas à notre copie\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clé %08lX: impossible de trouver le bloc de clés original: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clé %08lX: impossible de lire le bloc de clés original: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "clé %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "clé %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "clé %08lX: une nouvelle signature\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "clé %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "clé %08lX: une nouvelle sous-clé\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "clé %08lX: %d nouvelles sous-clés\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "clé %08lX: n'a pas changé\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-clés par défaut: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clé %08lX: clé secrète importée\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clé %08lX: déjà dans le porte-clés secret\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clé %08lX: clé secrète pas trouvée: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clé %08lX: pas de clé publique - le certificat de révocation ne peut\n"
 "être appliqué\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clé %08lX: certificat de révocation invalide: %s - rejeté\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "clé %08lX: certificat de révocation importé\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clé %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "clé %08lX: algorithme de clé publique non supporté\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "clé %08lX: auto-signature invalide\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clé %08lX: pas de sous-clé pour relier la clé\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clé %08lX: algorithme de clé publique non supporté\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clé %08lX: liaison avec la sous-clé invalide\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clé %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clé %08lX: sous-clé non prise en compte\n"
@@ -2202,107 +2236,132 @@ msgstr "clé %08lX: sous-clé non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clé %08lX: signature non exportable (classe %02x) - ignorée\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "clé %08lX: certificat de révocation au mauvais endroit - ignorée\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clé %08lX: certificat de révocation invalide: %s - ignorée\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clé %08lX: nom d'utilisateur en double fusionné\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "clé %08lX: certificat de révocation ajouté\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "clé %08lX: ajout de la signature de clé directe\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[révocation]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non vérifiée à cause d'une clé manquante\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non vérifiées à cause de clés manquantes\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non vérifiée à cause d'une erreur\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non vérifiées à cause d'erreurs\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide détecté\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide détecté\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est révoqué.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Votre signature actuelle sur \"%s\"\n"
+"est locale.\n"
+"\n"
+"Voulez vous la rendre complètement exportable ?\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Votre signature actuelle sur \"%s\"\n"
+"est locale.\n"
+"\n"
+"Voulez vous la rendre complètement exportable ?\n"
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2313,7 +2372,7 @@ msgstr ""
 "\n"
 "Voulez vous la rendre complètement exportable ?\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2322,36 +2381,36 @@ msgstr ""
 "\n"
 "Voulez vous la rendre complètement exportable ?\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" a déjà été %ssigné par la clé %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" a déjà été %ssigné par la clé %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien à signer avec la clé %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Cette clé a expiré !"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette clé va expirer le %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en même temps ? (o/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
@@ -2360,12 +2419,12 @@ msgstr ""
 "il n'est possible de signer avec des clés de style PGP 2.x uniquement\n"
 "en mode --pgp2\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "ce message ne sera pas forcément utilisable par PGP 2.x\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2375,27 +2434,27 @@ msgstr ""
 "appartient réellement à la personne sus-nommée ? Si vous ne savez\n"
 "quoi répondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne répondrai pas.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas vérifié du tout.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu vérifié.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai vérifié très soigneusement.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2403,7 +2462,32 @@ msgstr ""
 "Etes-vous vraiment sûr(e) que vous voulez signer cette clé\n"
 "avec la vôtre: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "cela peut provenir d'une auto-signature manquante\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"La signature sera marquée comme non-exportable.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"La signature sera marquée comme non-révocable.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2411,7 +2495,7 @@ msgstr ""
 "\n"
 "La signature sera marquée comme non-exportable.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2419,7 +2503,7 @@ msgstr ""
 "\n"
 "La signature sera marquée comme non-révocable.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2427,7 +2511,7 @@ msgstr ""
 "\n"
 "Je n'ai pas du tout vérifié cette clé.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2435,7 +2519,7 @@ msgstr ""
 "\n"
 "J'ai un peu vérifié cette clé.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2443,39 +2527,39 @@ msgstr ""
 "\n"
 "J'ai vérifié cette clé avec grand soin.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Signer réellement ? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a échoué: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Cette clé n'est pas protégée.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secrètes de la clé principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "La clé est protégée.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'éditer cette clé: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette clé secrète.\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2484,471 +2568,467 @@ msgstr ""
 "*mauvaise* idée\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une clé à l'endroit correct\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "lister la clé et les noms d'utilisateurs"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "sélectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "clé"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "sélectionner la clé secondaire N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "vérifier"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "signer la clé"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "signer la clé localement"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsigner"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "signer la clé de façon non-révocable"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsigner"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "signer la clé de façon locale et non-révocable"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "déboguer"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "aj.photo"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identité"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "suppr.photo"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "aj.clé"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "ajouter une clé secondaire"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "suppr.clé"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "enlever une clé secondaire"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "aj.clé"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "ajouter une clé secondaire"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "principale"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des clés secrètes aux clés privées et inversement"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "préf"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "lister les préférences (expert)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "montr.préf"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "lister les préférences (bavard)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "mettre.préf"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "donner la liste de préférences"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "préf.màj"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "préférences mises à jour"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "révoquer les signatures"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revclé"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "révoquer une clé secondaire"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "désactiver"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "désactiver une clé"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "activer une clé"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "montr.photo"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "montrer la photo d'identité"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erreur pendant la lecture du bloc de clé secrète `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "La clé secrète est disponible.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la clé secrète pour faire cela.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande «toggle» d'abord.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "La clé est révoquée.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: Sélectionner les utilisateurs à signer\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez sélectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever réellement tous les utilisateurs sélectionnés ? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Enlever réellement cet utilisateur ? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sélectionner au moins une clé.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette clé ? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment révoquer cette clé ? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Enlever réellement les préférences des utilisateurs sélectionnés ? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Faut-il vraiment mettre à jour les préférences ? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise à jour a échoué: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise à jour de la clé secrète a échoué: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "La clé n'a pas changé donc la mise à jour est inutile.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez «help»)\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Cette clé peut être révoquée par la clé %s %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  créée: %s expire: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Cette clé a été désactivée"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la sous-clé a été révoquée: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- une révocation truquée a été trouvée\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problème de vérification de la révocation: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
-"ATTENTION: Cette clé possède déjà une photo d'identité.\n"
-"           Ajouter une autre photo d'identité peut poser des\n"
-"           problèmes avec certaines versions de PGP.\n"
 
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Vous ne pouvez avoir qu'une seule photo d'identité par clé.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2958,84 +3038,110 @@ msgstr ""
 "d'identité peut empêcher certaines versions de PGP d'accepter\n"
 "cette clé\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identité à une clé du style PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprimée.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprimées\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Entrez la taille de la clé"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sélections des clés secrètes.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clé secondaire.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clé principale.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une clé v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clés secret\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez sélectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "clé %08lX: auto-signature invalide\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clé secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "nom d'utilisateur: «"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3044,7 +3150,7 @@ msgstr ""
 "»\n"
 "signé avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3053,239 +3159,247 @@ msgstr ""
 "»\n"
 "signé avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette clé va expirer le %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Générer un certificat de révocation pour cette signature ? (o/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez signé ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signé par %08lX à %s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   révoqué par %08lX à %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signé par %08lX à %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "pas de clé secrète\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Politique de signature: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des données de notation invalides ont été détectées\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notation de signature: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Porte-clés"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Empreinte:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "              Empreinte :"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr " Empreinte de la clé ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "données chiffrées par clé publique: bonne clé de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffré avec une clé de %u bits %s, ID %08lX, créée le %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement par clé publique a échoué: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des données chiffrées avec %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-être\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'expéditeur a demandé «pour vos yeux seulement»\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une clé %s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Signature expirée de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
@@ -3304,32 +3418,47 @@ msgstr ""
 "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Attention: propriétaire de %s \"%s\" peu sûr\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Attention: permissions de %s \"%s\" peu sûres\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas présent\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme à clé publique %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d possède un bit critique\n"
@@ -3476,36 +3605,41 @@ msgstr "pas de données signées\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les données signées `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme; essai de la clé secrète %08lX...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le récipient anonyme.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la clé de chiffrement (DEK) n'est pas supporté\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou désactivé\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTE: l'algorithme de chiffrement %d n'a pas été trouvé dans les "
 "préférences\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la clé secrète %08lX a expiré le %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "clé %08lX: la clé a été révoquée !\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3532,12 +3666,16 @@ msgstr "l'envoi à `%s' s'est déroulé avec succès (résultat=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi à `%s' a échoué: le résultat est %u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "recherche de \"%s\" du serveur HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossible de chercher une clé dans le serveur : %s\n"
@@ -3596,7 +3734,14 @@ msgstr ""
 "la signature est supposée être fausse car un bit critique est\n"
 "inconnu\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVERTISSEMENT: impossible de faire une expansion à base de %% de l'url\n"
+"de politique (trop grande). Utilisation de la version non expansée.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3604,43 +3749,51 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion à base de %% de l'url\n"
 "de politique (trop grande). Utilisation de la version non expansée.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de vérifier la signature créée: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de signer avec des clés de style PGP 2.x uniquement\n"
 "en mode --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de créer %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTE: l'algorithme de chiffrement %d n'a pas été trouvé dans les "
+"préférences\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des clés\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilisé\n"
@@ -3875,27 +4028,27 @@ msgstr ""
 "la ligne d'entrée %u est trop longue ou il manque un caractère de saut\n"
 "de ligne\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clé n'est pas marquée comme non-sûre; on ne peut pas l'utiliser avec le\n"
 "pseudo-générateur de nombres aléatiores !\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' a été ignoré: dupliqué\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a été ignoré: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "ignoré: clé secrète déjà présente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4095,16 +4248,23 @@ msgstr ""
 "conseillées car tous les programmes ne les supportent pas et les\n"
 "signatures créées avec elles sont plutôt longues et très lentes à vérifier."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la clé"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Répondez «oui» ou «non»"
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4116,19 +4276,19 @@ msgstr ""
 "mauvais - le système essaierait d'interpréter la valeur donnée comme un\n"
 "intervalle."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propriétaire de la clé"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommandée"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4142,11 +4302,11 @@ msgstr ""
 "O pour continuer à générer la clé.\n"
 "Q pour arrêter de générer de clé."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Répondez «oui» (ou simplement «o») pour générer la sous-clé"
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4213,11 +4373,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle réponse est la bonne, répondez \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Répondez «oui» si vous voulez signer TOUS les noms d'utilisateurs"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4225,11 +4385,11 @@ msgstr ""
 "Répondez «oui» si vous voulez vraiment supprimer ce nom\n"
 "d'utilisateur. Tous les certificats seront alors perdus en même temps !"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Répondez «oui» s'il faut vraiment supprimer la sous-clé"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4240,7 +4400,7 @@ msgstr ""
 "établir une connection de confiance vers la clé ou une autre clé certifiée\n"
 "par celle-là."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4252,7 +4412,7 @@ msgstr ""
 "vous soyez sûr de quelle clé a été utilisée car cette clé de signature\n"
 "peut établir une connection de confiance vers une autre clé déjà certifiée."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4260,7 +4420,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-clés."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4274,7 +4434,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -4285,24 +4445,24 @@ msgstr ""
 "ceux qui sont sélectionnés) vers la liste actuelle. La date de toutes\n"
 "les auto-signatures seront avancées d'une seconde.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Entrez le mot de passe ; c'est une phrase secrète \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Répétez le dernier mot de passe pour être sûr de ce que vous avez tapé."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Répondez «oui» s'il faut vraiment réécrire le fichier"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4310,7 +4470,7 @@ msgstr ""
 "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTRÉE le\n"
 "fichier par défaut (indiqué entre crochets) sera utilisé."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4339,7 +4499,7 @@ msgstr ""
 "      utilisé. Cela sert généralement à indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4349,11 +4509,11 @@ msgstr ""
 "avez émis ce certificat de révocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide délimite la fin du texte.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
@@ -4417,6 +4577,32 @@ msgstr "%lu clés vérifiées (%lu signatures)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porte-clés créé\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOM=VALEUR|utiliser ces données de notation"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "le premier caractère du nom d'une notation doit être un lettre ou un "
+#~ "trait\n"
+#~ "de soulignement\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "les points dans le nom d'une notation doivent être entourés d'autes "
+#~ "caractères\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "ATTENTION: Cette clé possède déjà une photo d'identité.\n"
+#~ "           Ajouter une autre photo d'identité peut poser des\n"
+#~ "           problèmes avec certaines versions de PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Vous ne pouvez avoir qu'une seule photo d'identité par clé.\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Êtes-vous sûr de vouloir le signer ?\n"
 
diff --git a/po/gl.po b/po/gl.po
index dfa05c70e..b85508fb6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2001-07-11 18:17+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@iname.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -45,7 +45,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "abandonar"
 
@@ -273,7 +273,7 @@ msgstr "... isto é un erro (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -339,7 +339,7 @@ msgstr ""
 "¡NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +351,7 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "máis entropía (Precísanse %d bytes máis)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -359,170 +359,170 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "só armacenar"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "borrar unha chave do chaveiro público"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "borrar unha chave do chaveiro secreto"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "listar só a secuencia de paquetes"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exporta-los valores de confianza no propietario"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "amañar unha base de datos de confianza corrompida"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Quita-la armadura a un ficheiro ou á entrada estándar"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Pór armadura a un ficheiro ou á entrada estándar"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,206 +532,202 @@ msgstr ""
 "Opcións:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "usar coma ficheiro de saída"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "emprega-lo gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto á lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "le-las opcións dun ficheiro"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|DF|escribi-la información de estado a este DF"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCHAVE|confiar absolutamente nesta chave"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emula-lo modo descrito no RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "axustar tódalas opcións de paquetes, cifrado e resumo ao comportamento "
 "OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "axustar tódalas opcións de paquetes, cifrado e resumo ao comportamento "
 "OpenPGP"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresión N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOME=VALOR|usar estes datos de notación"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -739,7 +735,7 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -759,17 +755,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducción a <proxecto@trasno.net>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -779,7 +775,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -787,272 +783,281 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opcións] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opcións `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVISO: `%s' é un ficheiro baleiro\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s non é para uso normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: g10/g10.c:1492
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "o URL de normativa dado non é válido\n"
-
-#: g10/g10.c:1496
+#: g10/g10.c:1613
 #, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "o URL de normativa dado non é válido\n"
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compresión debe estar entre %d e %d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1651
 #, fuzzy
-msgid "invalid preferences\n"
+msgid "invalid default preferences\n"
 msgstr "amosar preferencias"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "amosar preferencias"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "amosar preferencias"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "amosar preferencias"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"o primeiro carácter dun nome de notación debe ser unha letra ou guión baixo\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "un nome de notación só debe ter letras, díxitos, puntos ou guións baixos e "
 "rematar con '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"os puntos dun nome de notación deben estar rodeados por outros caracteres\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación non pode empregar ningún carácter de control\n"
 
+#: g10/g10.c:2520
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "o URL de normativa dado non é válido\n"
+
+#: g10/g10.c:2522
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "o URL de normativa dado non é válido\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1149,11 +1154,13 @@ msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non é válido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Motivo para a revocación: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Comentario de revocación: "
 
 #. a string with valid answers
@@ -1356,146 +1363,156 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non é seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave pública xa está presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave pública xa está estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desactivada.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: omitido: a chave pública xa está presente\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "non hai enderezos válidos\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "omítese `%s': duplicada\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "amosar preferencias"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escribindo a propia sinatura\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (asinar e cifrar)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (asinar e cifrar)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "¿A súa selección? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Este algoritmo está obsoleto - ¿crear de tódolos xeitos? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1508,19 +1525,19 @@ msgstr ""
 "        tamaño de chave por defecto: 1024 bits\n"
 " tamaño de chave máximo recomendado: 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA só admite tamaños entre 512 e 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "chave pequena de máis; 1024 é o menor valor admitido para RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "chave pequena de máis; 768 é o menor valor admitido\n"
 
@@ -1532,12 +1549,12 @@ msgstr "chave pequena de máis; 768 é o menor valor admitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "chave grande de máis; %d é o maior tamaño admitido.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1545,11 +1562,11 @@ msgstr ""
 "¡As chaves maiores de 2048 bits non se aconsellan porque\n"
 "os cálculos levan MOITO tempo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Está seguro de que quere este tamaño de chave? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1557,17 +1574,17 @@ msgstr ""
 "De acordo, ¡pero teña en conta que a radiación do monitor e o teclado tamén "
 "son vulnerables a ataques!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamaño de chave requerido son %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1583,7 +1600,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1600,31 +1617,31 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor non válido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "A chave non caduca nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave caduca o %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1632,11 +1649,11 @@ msgstr ""
 "O seu sistema non pode amosar datas máis aló do 2038.\n"
 "Aínda así, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "¿Isto é correcto? (s/n) "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1652,44 +1669,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun díxito\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Carácter non válido no comentario\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1700,28 +1717,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non poña o enderezo de correo no nome real ou no comentario\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1729,17 +1746,17 @@ msgstr ""
 "Necesita un contrasinal para protexe-la súa chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo.\n"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1751,7 +1768,7 @@ msgstr ""
 "momento, empregando este programa coa opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1763,54 +1780,54 @@ msgstr ""
 "mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
 "números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeración de chaves.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave pública en `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave pública non atopada: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "creáronse e asináronse as chaves pública e secreta.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1819,12 +1836,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1832,7 +1849,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1840,84 +1857,94 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creación de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "¿Crear realmente? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves procesadas\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: non se pode abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro baleiro\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "non se atopou o usuario '%s': %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: non é unha chave rfc2440 - omitida\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: non está protexida - omitida\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
@@ -1927,21 +1954,21 @@ msgstr "demasiadas entradas na caché de chaves públicas - desactivada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave pública - ignorada\n"
@@ -2021,185 +2048,190 @@ msgstr "chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceptouse o ID de usuario sin sinatura propia '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario válidos\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha sinatura propia que falta\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave pública non atopada: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: 1 novo ID de usuario\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuario\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova sinatura\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas sinaturas\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova sub-chave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas sub-chaves\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: sin cambios\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro público por defecto\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave pública - non se pode aplica-lo\n"
 "certificado de revocación\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocación incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revocación importado\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: sinatura propia incorrecta\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para o enlace da chave\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: pasado por alto o ID de usuario '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: pasada por alto a sub-chave\n"
@@ -2208,188 +2240,204 @@ msgstr "chave %08lX: pasada por alto a sub-chave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - pasada por alto\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "chave %08lX: certificado de revocación no lugar erróneo - pasada\n"
 "por alto\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "chave %08lX: certificado de revocación incorrecto:\n"
 "%s - pasado por alto\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mezclado\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revocación engadido\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: %d novas sinaturas\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[sinatura propia]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 sinatura errónea\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas erróneas\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin sinatura propia válida\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin sinatura propia válida\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave está protexida.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Está seguro de que quere este tamaño de chave? "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:404
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Xa foi asinado pola chave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Xa foi asinado pola chave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: ¡Esta chave xa caducou!\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave non está protexida.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2397,7 +2445,32 @@ msgstr ""
 "¿Esta seguro de que quere asinar esta chave\n"
 "coa súa chave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "isto pode ser causado por unha sinatura propia que falta\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"A sinatura será marcada como non exportable.\n"
+"\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"A sinatura será marcada como non exportable.\n"
+"\n"
+
+#: g10/keyedit.c:616
 #, fuzzy
 msgid ""
 "\n"
@@ -2406,7 +2479,7 @@ msgstr ""
 "A sinatura será marcada como non exportable.\n"
 "\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 #, fuzzy
 msgid ""
 "\n"
@@ -2415,51 +2488,51 @@ msgstr ""
 "A sinatura será marcada como non exportable.\n"
 "\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Esta chave non está protexida.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "A chave está protexida.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2467,7 +2540,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2475,564 +2548,589 @@ msgstr ""
 "Non desexa un contrainal - ¡o que é unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "¿Seguro que quere facer esto? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave ó seu sitio\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "gardar"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "gardar e saír"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "axuda"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "listar"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "verificar"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "asinar"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "sinatura-la chave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "f"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "sinatura-la chave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "nrsign"
 msgstr "asinar"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "sinatura-la chave localmente"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "sinatura-la chave localmente"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "depurar"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 #, fuzzy
 msgid "add a photo ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "engadir unha chave secundaria"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves públicas e secretas"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "set preference list"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updated preferences"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "A chave secreta está disponible.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Cómpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave está protexida.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "¿Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "¿Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (y/N)"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "¿Garda-los cambios? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1740
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+msgid "This key may be revoked by %s key "
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "Creouse %s%c %4u%c/%08lX : %s caduca: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! revocouse a subchave: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- atopouse unha revocación falsa\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "¿Está seguro de que quere este tamaño de chave? "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "¿Está seguro de que quere este tamaño de chave? "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (y/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (y/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (y/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta sinatura propia? (y/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introduza o tamaño da chave"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as seleccións das chaves secretas.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "chave %08lX: sinatura propia incorrecta\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con índice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3041,7 +3139,7 @@ msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3050,241 +3148,249 @@ msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Firmou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "asinado por %08lX no %s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "asinado por %08lX no %s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (y/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Sinatura %s de: %s\n"
+
+#: g10/keylist.c:93
 #, fuzzy
 msgid "Signature policy: "
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atopáronse datos de notación non válidos\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notación: "
+
+#: g10/keylist.c:129
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Notación: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Pegada dactilar:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "         Pegada dactilar:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "         Pegada dactilar:"
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Normativa: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas múltiples\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Sinatura feita por %.*s usando %s de ID de chave %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "               aka \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz incorrecto detectado en proc_tree()\n"
 
@@ -3303,31 +3409,46 @@ msgstr ""
 "este algoritmo de cifrado está obsoleto; por favor, empregue un máis "
 "estándar!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVISO: `%s' é un ficheiro baleiro\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: `%s' é un ficheiro baleiro\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
@@ -3469,34 +3590,39 @@ msgstr "non hai datos asinados\n"
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "receptor anónimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Ok, nós somo-lo receptor anónimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificación vella do DEK non está soportada\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d é descoñecido ou está desactivado\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "chave %08lX: ¡esta chave está revocada!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, fuzzy, c-format
@@ -3523,12 +3649,16 @@ msgstr "éxito ao enviar a `%s' (estado=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fallo ao enviar a `%s': estado=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "non se pode obte-la chave do servidor de chaves: %s\n"
@@ -3588,45 +3718,55 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta debido a un bit crítico descoñecido\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é un ficheiro baleiro\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "o descifrado fallou: %s\n"
@@ -3860,27 +4000,27 @@ msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a liña de entrada %u é longa de máis ou fáltalle a marca de fin de liña\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non está marcada coma insegura - non se pode empregar co xerador de "
 "números aleatorios falso\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "omítese `%s': duplicada\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4071,16 +4211,23 @@ msgstr ""
 "porque non están soportadas por tódolos programas, e as sinaturas\n"
 "creadas con elas son moi grandes e lentas de comprobar."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Introduza o tamaño da chave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4092,19 +4239,19 @@ msgstr ""
 "boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-lo\n"
 "valor proporcionado coma se fora un intervalo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4118,11 +4265,11 @@ msgstr ""
 "O  para continuar coa xeración da chave.\n"
 "S  para saír da xeración da chave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Conteste \"si\" (ou só \"s\") se é correcto xerar esta subchave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4163,11 +4310,11 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Conteste \"si\" se quere asinar TÓDOLOS IDs de usuario"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4175,11 +4322,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "¡Tamén se han perder tódolos certificados!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se é correcto borrar esta subchave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4189,7 +4336,7 @@ msgstr ""
 "sinatura porque pode ser importante para estabrecer unha conexión de\n"
 "confianza na chave ou noutra chave certificada por esta chave."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4201,13 +4348,13 @@ msgstr ""
 "se empregou porque esta chave de sinatura podería estabrecer unha\n"
 "conexión de confianza mediante outra chave xa certificada."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A sinatura non é correcta. Ten sentido borrala do chaveiro."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4221,34 +4368,34 @@ msgstr ""
 "só se esta auto-sinatura non é correcta por algun motivo e hai\n"
 "unha segunda á súa disposición."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 "  Blurb, blurb ..."
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor, repita o último contrasinal, para estar seguro do que tecleou."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se é correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4256,7 +4403,7 @@ msgstr ""
 "Por favor, introduza un novo nome de ficheiro. Se só preme ENTER, hase\n"
 "emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4284,7 +4431,7 @@ msgstr ""
 "     Emprégueo para indicar que o ID de usuario xa non se debería empregar;\n"
 "     adoita empregarse para marcar un enderezo de correo non válido.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4294,11 +4441,11 @@ msgstr ""
 "certificado de revocación. Por favor, manteña este texto breve.\n"
 "Unha liña en branco remata o texto.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Non hai axuda dispoñible"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispoñible para `%s'"
@@ -4361,6 +4508,20 @@ msgstr "ve-la lista de chaves e sinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOME=VALOR|usar estes datos de notación"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "o primeiro carácter dun nome de notación debe ser unha letra ou guión "
+#~ "baixo\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "os puntos dun nome de notación deben estar rodeados por outros "
+#~ "caracteres\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "¿Está seguro de que quere este tamaño de chave? "
@@ -4437,9 +4598,6 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: erro ao verifica-la chave: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (asinar e cifrar)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "¿Seguro que quere crear unha chave para asinar e cifrar? "
 
diff --git a/po/id.po b/po/id.po
index 7d789aa23..1e155b785 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUPG 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-20 21:26GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -47,7 +47,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "keluar"
 
@@ -274,7 +274,7 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -339,7 +339,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +350,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +358,163 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[files]|enkripsi file"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekripsi file"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "tandai kunci tidak dapat di-revoke"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "perbarui database trust secara otomatis"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,196 +524,192 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "jangan paksa signature v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "paksa signature kunci v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "jangan paksa signature kunci v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "jangan gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[file]|tulis status info ke file"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAME=VALUE|gunakan notasi data ini"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +717,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,15 +737,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +755,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,269 +763,281 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset exec-path ke %s\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "PERINGATAN: `%s' adalah option terdepresiasi\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "silakan gunakan \"--keyserver-options %s\"\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "preferensi tidak valid\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "preferensi tidak valid\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferensi tidak valid\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "preferensi tidak valid\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "URL signature kebijakan yang diberikan tidak valid\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1126,11 +1134,13 @@ msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
 #. a string with valid answers
@@ -1324,21 +1334,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1346,120 +1356,130 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "preferensi %c%lu tidak valid\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "menulis self signature\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1472,20 +1492,20 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
@@ -1497,12 +1517,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1510,11 +1530,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1522,17 +1542,17 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1548,7 +1568,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1564,30 +1584,30 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1595,11 +1615,11 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1614,44 +1634,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1661,27 +1681,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1689,16 +1709,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1711,7 +1731,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1723,53 +1743,53 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1778,106 +1798,116 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat membuka: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
 "pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1887,21 +1917,21 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -1981,179 +2011,184 @@ msgstr "  kunci rahasia diimpor: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "kunci %08lX: subkey binding tidak valid\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -2162,109 +2197,128 @@ msgstr "kunci %08lX: melewati subkey\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Peringatan: kunci %08lX mungkin dibatalkan: ambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX mungkin dibatalkan: kunci pembatalan %08lX tidak "
 "ada.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID User \"%s\" dibatalkan."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Anda tetap ingin menandatanganinya? (y/n) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  Tidak dapat menandatangani.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Signature anda saat ini pada \"%s\"\n"
+"adalah signature.lokal \n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2273,39 +2327,39 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (Y/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2313,11 +2367,11 @@ msgstr ""
 "Anda tidak boleh membuat tanda tangan OpenPGP pada kunci bergaya PGP 2.x "
 "saat dalam mode --pgp2\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak bermanfaat dalam PGP 2.x\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2327,27 +2381,27 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2355,7 +2409,32 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Signature akan ditandai sebagai tidak dapat diekspor.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2363,7 +2442,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2371,7 +2450,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2379,7 +2458,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2387,7 +2466,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2395,33 +2474,33 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2429,7 +2508,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2437,469 +2516,468 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "hapus ID user"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "tambah kunci sekunder"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Kunci ini mungkin dibatalkan oleh %s kunci %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Perhatikan bahwa validitas kunci yang ditunjukkan tidak perlu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
-"         Menambahkan photo ID lain dapat membingungkan beberapa versi PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Anda tetap ingin menambahkannya? (y/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Anda hanya boleh memiliki satu photo ID untuk satu kunci. \n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2909,83 +2987,108 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Anda tetap ingin menambahkannya? (y/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Masukkan ukuran kunci"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -2994,7 +3097,7 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3003,234 +3106,242 @@ msgstr ""
 "\"\n"
 "ditandai secara lokal dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk signature ini? (y/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Menampilkan ID foto %s ukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Kebijakan signature: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notasi signature: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Keyring"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Fingerprint:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -3248,33 +3359,48 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih "
 "lanjut\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "PERINGATAN: `%s' adalah option terdepresiasi\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "PERINGATAN: `%s' adalah option terdepresiasi\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "silakan gunakan \"--keyserver-options %s\"\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -3415,34 +3541,39 @@ msgstr "tidak ada data tertandai\n"
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "kunci %08lX: kunci telah dibatalkan!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3469,12 +3600,16 @@ msgstr "success sending to `%s' (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "failed sending to `%s': status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "tidak dapat mencari keyserver: %s\n"
@@ -3530,7 +3665,14 @@ msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
+"Menggunakan yang tidak expand.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3538,42 +3680,48 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -3800,27 +3948,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4015,16 +4163,23 @@ msgstr ""
 "karena belum didukung oleh seluruh program dan signature yang dibuat\n"
 "oleh mereka cukup besar dan sangat lambat untuk diverifikasi."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4036,19 +4191,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4062,11 +4217,11 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4144,11 +4299,11 @@ msgstr ""
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4156,11 +4311,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4170,7 +4325,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4182,7 +4337,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4190,7 +4345,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4204,7 +4359,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4214,24 +4369,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4239,7 +4394,7 @@ msgstr ""
 "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
 "file baku (yang diapit tanda kurung) akan dipakai."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4269,7 +4424,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4279,11 +4434,11 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -4345,3 +4500,24 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAME=VALUE|gunakan notasi data ini"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
+#~ "         Menambahkan photo ID lain dapat membingungkan beberapa versi "
+#~ "PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Anda hanya boleh memiliki satu photo ID untuk satu kunci. \n"
diff --git a/po/it.po b/po/it.po
index 60264b7d7..ed42091af 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-21 21:54+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -273,7 +273,7 @@ msgstr "... questo è un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -340,7 +340,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +352,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[file]|cifra i file"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[file]|decifra i file"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "firma una chiave irrevocabilmente"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "firma una chiave localmente e irrevocabilmente"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "aggiornamento non presidiato del database delle fiducia"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,198 +526,194 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "non forza l'uso di firme v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "forza l'uso di firme v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "non forza l'uso di firme v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "non usa mai un MDC per cifrare"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "assumi \"sì\" per quasi tutte le domande"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[file]|scrivi le informazioni di stato nel file"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "imposta tutte le opzioni di pacchetto, cifrario e digest per PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Mostra le fotografie"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Non mostra le fotografie"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Imposta la riga di comando per vedere le fotografie"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOME=VALORE|usa questi dati per una nota"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -725,7 +721,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -745,15 +741,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -763,7 +759,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -771,267 +767,277 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non è un set di caratteri valido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "ATTENZIONE: %s è una opzione deprecata.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "usa al suo posto \"--keyserver-options %s\"\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalità --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalità --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "questo messaggio può non essere utilizzabile da PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "l'URL della politica di firma indicato non è valido\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL della politica di certificazione indicato non è valido\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "preferenze non valide\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "preferenze non valide\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferenze non valide\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "preferenze non valide\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"il primo carattere del nome di una nota deve essere una lettera o un\n"
-"underscore\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "l'URL della politica di certificazione indicato non è valido\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "l'URL della politica di firma indicato non è valido\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1128,11 +1134,13 @@ msgid "User ID is no longer valid"
 msgstr "L'user ID non è più valido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Ragione della revoca: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Commento alla revoca: "
 
 #. a string with valid answers
@@ -1326,21 +1334,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non è sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica già presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1348,120 +1356,130 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica già impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica è disabilitata.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "saltato: chiave pubblica già impostata\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la preferenza %c%lu non è valida\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "la preferenza %c%lu è doppia\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "scrittura della autofirma\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (firma e cifra)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'uso di questo algoritmo è deprecato - la creo comunque? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1474,19 +1492,19 @@ msgstr ""
 "          la dimensione predefinita è 1024 bit\n"
 "  la dimensione massima consigliata è 2048 bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave è troppo corta; 1024 è il minimo valore permesso per RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 
@@ -1498,12 +1516,12 @@ msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1511,11 +1529,11 @@ msgstr ""
 "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1523,17 +1541,17 @@ msgstr ""
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1549,7 +1567,7 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1565,30 +1583,30 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s scadrà il %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1596,11 +1614,11 @@ msgstr ""
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "È giusto (s/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1616,44 +1634,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1664,27 +1682,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1692,16 +1710,16 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1713,7 +1731,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1725,53 +1743,53 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrà 1024 bit.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1780,12 +1798,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1793,7 +1811,7 @@ msgstr ""
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1801,88 +1819,99 @@ msgstr ""
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di sottochiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' è già compresso\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "in modalità --pgp2 puoi cifrare solo per chiavi RSA non più lunghe di 2048 "
 "bit\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
@@ -1892,21 +1921,21 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -1986,180 +2015,185 @@ msgstr "chiavi segrete importate: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo può essere causato da una autofirma mancante\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: già nel portachiavi segreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -2168,110 +2202,129 @@ msgstr "chiave %08lX: saltata la subchiave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Attenzione: la chiave %08lX può essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Attenzione: la chiave %08lX può essere stata revocata: la chiave di revoca\n"
 "%08lX non è presente.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" è stato revocato."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"La tua firma attuale su \"%s\"\n"
+"è una firma locale.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2280,39 +2333,39 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "è una firma locale.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" era già stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Questa chiave è scaduta!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadrà il %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2320,11 +2373,11 @@ msgstr ""
 "In modalità -pgp2 non è possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2334,27 +2387,27 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2362,7 +2415,32 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "questo può essere causato da una autofirma mancante\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"La firma sarà marcata come non esportabile.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"La firma sarà marcata come irrevocabile.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2370,7 +2448,7 @@ msgstr ""
 "\n"
 "La firma sarà marcata come non esportabile.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2378,7 +2456,7 @@ msgstr ""
 "\n"
 "La firma sarà marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2386,7 +2464,7 @@ msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2394,7 +2472,7 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2402,33 +2480,33 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave molto superficialmente.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non è protetta.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "La chiave è protetta.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2436,7 +2514,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2444,469 +2522,468 @@ msgstr ""
 "Non vuoi una passphrase - questa è probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "firma la chiave irrevocabilmente"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente e irrevocabilmente"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "aggiungi una chiave secondaria"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "preferenze aggiornate"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non è permesso in modalità %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Questa chiave può essere revocata dalla chiave %s %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave è stata revocata: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Nota che la validità della firma indicata non sarà necessariamente corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"ATTENZIONE: Questa chiave ha già un ID fotografico.\n"
-"            Aggiungerne un altro può confondere alcune versioni di PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "È possibile avere un solo ID fotografico su ogni chiave.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2916,84 +2993,109 @@ msgstr ""
 "            può causare il rifiuto della chiave da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Inserisci le dimensioni della chiave"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3003,7 +3105,7 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3013,235 +3115,243 @@ msgstr ""
 "firmata localmente con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Politica di firma: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Annotazione della firma: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Portachiavi"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Impronta digitale:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica è %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -3258,33 +3368,48 @@ msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Attenzione: proprietario \"%s\" di %s insicuro\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Attenzione: permessi \"%s\" di %s insicuri\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non è presente\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
 "html\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "ATTENZIONE: %s è una opzione deprecata.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATTENZIONE: %s è una opzione deprecata.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "usa al suo posto \"--keyserver-options %s\"\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -3426,35 +3551,40 @@ msgstr "non ci sono dati firmati\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non è gestita\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s è sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "chiave %08lX: la chiave è stata revocata!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3481,12 +3611,16 @@ msgstr "inviata con successo a `%s' (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "invio a `%s' fallito: status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossibile cercare sul keyserver: %s\n"
@@ -3547,7 +3681,14 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata "
+"inespansa.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3555,40 +3696,47 @@ msgstr ""
 "ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' è un file vuoto\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "In modalità -pgp2 puoi firmare solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalità -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sarà usato il cifrario %s\n"
@@ -3816,27 +3964,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non è indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica già presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4037,16 +4185,23 @@ msgstr ""
 "sono gestite da tutti i programmi e le firme create sono grandi e lunghe da\n"
 "verificare."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4058,19 +4213,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4084,11 +4239,11 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4167,11 +4322,11 @@ msgstr ""
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4179,11 +4334,11 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4194,7 +4349,7 @@ msgstr ""
 "questa firma perchè può essere importante per stabilire una connessione di\n"
 "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4208,13 +4363,13 @@ msgstr ""
 "usata perchè questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave già certificata."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "La firma non è valida. Ha senso rimuoverla dal tuo portachiavi."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4229,7 +4384,7 @@ msgstr ""
 "non\n"
 "è valida per qualche ragione e ne è disponibile un'altra."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4240,23 +4395,23 @@ msgstr ""
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sarà aumentato di un secondo.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cioè una frase segreta \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Inserisci il nome del file a cui si riferisce la firma."
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4264,7 +4419,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sarà usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4293,7 +4448,7 @@ msgstr ""
 "      Usa questo per affermare che l'user ID non dovrebbe più essere usato;\n"
 "      solitamente è usato per indicare un indirizzo di email non valido.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4303,11 +4458,11 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Non è disponibile un aiuto"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non è disponibile un aiuto per `%s'"
@@ -4370,6 +4525,28 @@ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOME=VALORE|usa questi dati per una nota"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "il primo carattere del nome di una nota deve essere una lettera o un\n"
+#~ "underscore\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "ATTENZIONE: Questa chiave ha già un ID fotografico.\n"
+#~ "            Aggiungerne un altro può confondere alcune versioni di PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "È possibile avere un solo ID fotografico su ogni chiave.\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Sei ancora sicuro di volerla firmare?\n"
 
@@ -4444,9 +4621,6 @@ msgstr "%s: portachiavi creato\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (firma e cifra)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
 
diff --git a/po/ja.po b/po/ja.po
index 35bf6bdfc..170d0c94f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-19 11:22+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-20 23:43+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -32,27 +32,27 @@ msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n"
 
-#: util/miscutil.c:297 util/miscutil.c:327
+#: util/miscutil.c:296 util/miscutil.c:331
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:298 util/miscutil.c:330
+#: util/miscutil.c:297 util/miscutil.c:334
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:299 util/miscutil.c:328
+#: util/miscutil.c:298 util/miscutil.c:332
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:300 util/miscutil.c:331
+#: util/miscutil.c:299 util/miscutil.c:335
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:810 util/miscutil.c:329
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:332
+#: util/miscutil.c:336
 msgid "qQ"
 msgstr "qQ"
 
@@ -275,7 +275,7 @@ msgstr "... ¥Ð¥°¤Ç¤¹ (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó: %s\n"
@@ -340,7 +340,7 @@ msgstr ""
 "¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +351,7 @@ msgstr ""
 "½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£OS¤¬¤â¤Ã¤ÈÍ𻨤µ¤ò¼ý½¸\n"
 "¤Ç¤­¤ë¤è¤¦¡¢²¿¤«¤·¤Æ¤¯¤À¤µ¤¤! (¤¢¤È%d¥Ð¥¤¥È¤¤¤ê¤Þ¤¹)\n"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -359,165 +359,165 @@ msgstr ""
 "@¥³¥Þ¥ó¥É:\n"
 " "
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "ʬΥ½ð̾¤òºîÀ®"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤ò°Å¹æ²½"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "°Å¹æ²½¤Ë¤ÏÂоΰŹæË¡¤Î¤ß¤ò»ÈÍÑ"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "store only"
 msgstr "Êݸ¤Î¤ß"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "¥Ç¡¼¥¿¤òÉü¹æ (´ûÄê)"
 
-#: g10/g10.c:291
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤òÉü¹æ"
 
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "¸°¤È½ð̾¤Î°ìÍ÷"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "¸°¤Î½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "¸°¤È»ØÌæ¤Î°ìÍ÷"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "ÈëÌ©¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "¿·¤·¤¤¸°ÂФòÀ¸À®"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "¸ø³«¸°Îؤ«¤é¸°·²¤òºï½ü"
 
-#: g10/g10.c:303
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "ÈëÌ©¸°Îؤ«¤é¸°·²¤òºï½ü"
 
-#: g10/g10.c:304
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "¸°¤Ë½ð̾"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/g10.c:306
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ë½ð̾"
 
-#: g10/g10.c:307
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/g10.c:308
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "¸°¤Ø¤Î½ð̾¤äÊÔ½¸"
 
-#: g10/g10.c:309
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤òÀ¸À®"
 
-#: g10/g10.c:310
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:311
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:312
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à"
 
-#: g10/g10.c:314
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸°¤ò¸¡º÷¤¹¤ë"
 
-#: g10/g10.c:316
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÁ´Éô¹¹¿·¤¹¤ë"
 
-#: g10/g10.c:320
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "¸°¤ÎÆɹþ¤ß/Ê»¹ç"
 
-#: g10/g10.c:322
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "¥Ñ¥±¥Ã¥ÈÎó¤Î¤ß¤Î°ìÍ÷"
 
-#: g10/g10.c:324
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:326
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿ÃͤòÆɤ߹þ¤à"
 
-#: g10/g10.c:328
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
 
-#: g10/g10.c:330
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "¼êÅö¤Æ¤·¤Æ¤Ê¤¤¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
 
-#: g10/g10.c:331
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "²õ¤ì¤¿¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò½¤Éü"
 
-#: g10/g10.c:332
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n"
 "ÊñÁõ½üµî"
 
-#: g10/g10.c:334
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½"
 
-#: g10/g10.c:336
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ"
 
-#: g10/g10.c:340
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -527,238 +527,234 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó:\n"
 " "
 
-#: g10/g10.c:342
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®"
 
-#: g10/g10.c:344
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽"
 
-#: g10/g10.c:347
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾Á°|´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤Æ\n"
 "¡Ö̾Á°¡×¤ò»ÈÍÑ"
 
-#: g10/g10.c:349
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "´ûÄê¤Î¼õ¿®¼Ô¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ"
 
-#: g10/g10.c:355
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n"
 "¤ò»ÈÍÑ"
 
-#: g10/g10.c:356
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n"
 "(0¤ÏÈó°µ½Ì)"
 
-#: g10/g10.c:358
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ"
 
-#: g10/g10.c:365
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: g10/g10.c:366
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "¾éĹ"
 
-#: g10/g10.c:367
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "¤ä¤äÀŤ«"
 
-#: g10/g10.c:368
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "üËö¤òÉÔ»ÈÍÑ"
 
-#: g10/g10.c:369
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "¶¯À©Åª¤Ëv3½ð̾"
 
-#: g10/g10.c:370
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "v3½ð̾¤ò¶¯À©¤·¤Ê¤¤"
 
-#: g10/g10.c:371
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "¶¯À©Åª¤Ëv4½ð̾"
 
-#: g10/g10.c:372
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "v4½ð̾¤ò¶¯À©¤·¤Ê¤¤"
 
-#: g10/g10.c:373
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤ËMDC¤ò»ÈÍÑ"
 
-#: g10/g10.c:375
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "°Å¹æ²½¤Ë¤ÏÀäÂФËMDC¤ò»ÈÍѤ·¤Ê¤¤"
 
-#: g10/g10.c:377
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "̵Êѹ¹"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:379
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "gpg¥¨¡¼¥¸¥§¥ó¥È¤ò»ÈÍÑ"
 
-#: g10/g10.c:382
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É: ³Îǧ¾Êά"
 
-#: g10/g10.c:383
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr ""
 "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïyes\n"
 "¤È¤ß¤Ê¤¹"
 
-#: g10/g10.c:384
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr ""
 "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïno\n"
 "¤È¤ß¤Ê¤¹"
 
-#: g10/g10.c:385
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ"
 
-#: g10/g10.c:386
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "°ìÍ÷¤Ë¤³¤ÎÈëÌ©¸°ÎؤòÄɲÃ"
 
-#: g10/g10.c:387
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "°ìÍ÷¤Î¸°¤¬¤¢¤ë¸°Îؤòɽ¼¨"
 
-#: g10/g10.c:388
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾Á°|´ûÄê¤ÎÈëÌ©¸°¤È¤·¤Æ\n"
 "¡Ö̾Á°¡×¤ò»ÈÍÑ"
 
-#: g10/g10.c:389
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|¥Û¥¹¥È|¸°¤Î¸¡º÷¤Ë¤³¤Î¸°¥µ¡¼¥Ð¡¼¤ò»ÈÍÑ"
 
-#: g10/g10.c:391
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|üËö¤Îcharset¤ò¡ÖCHARSET̾¡×\n"
 "¤ËÀßÄê"
 
-#: g10/g10.c:392
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤ò\n"
 "Æɤ߹þ¤à"
 
-#: g10/g10.c:396
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n"
 "½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr ""
 "|¥Õ¥¡¥¤¥ë|¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤ò¥Õ¥¡¥¤¥ë¤Ë\n"
 "½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:404
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|¸°ID|¤³¤Î¸°¤òµæ¶ËŪ¤Ë¿®ÍѤ¹¤ë"
 
-#: g10/g10.c:405
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|¥Õ¥¡¥¤¥ë|³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤ò\n"
 "Æɤ߹þ¤à"
 
-#: g10/g10.c:406
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤ò\n"
 "»ÈÍÑ"
 
-#: g10/g10.c:407
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç\n"
 "¥ó¤òÁ´¤ÆOpenPGP¤Î¿¶Éñ¤ËÀßÄê"
 
-#: g10/g10.c:408
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤ÈÍ×Ìó¤Î¥ª¥×¥·¥ç\n"
 "¥ó¤òÁ´¤ÆPGP 2.x¤Î¿¶Éñ¤ËÀßÄê"
 
-#: g10/g10.c:412
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¡¦¥â¡¼¥ÉN¤ò»ÈÍÑ"
 
-#: g10/g10.c:414
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î¥á¥Ã\n"
 "¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:416
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î°Å¹æ\n"
 "¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾Á°|¡Ö̾Á°¡×¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ò\n"
 "»ÈÍÑ"
 
-#: g10/g10.c:419
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾Á°|¡Ö̾Á°¡×¤Î¥á¥Ã¥»¡¼¥¸Í×Ìó\n"
 "¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:420
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾Á°|¡Ö̾Á°¡×¤Î°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ò\n"
 "»ÈÍÑ"
 
-#: g10/g10.c:421
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸°ID¥Õ¥£¡¼¥ë¥É\n"
 "¤òÁ÷½Ð"
 
-#: g10/g10.c:422
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨"
 
-#: g10/g10.c:423
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨¤·¤Ê¤¤"
 
-#: g10/g10.c:424
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "¥Õ¥©¥ÈID¤ò±ÜÍ÷¤¹¤ë¥³¥Þ¥ó¥É¹Ô\n"
 "¤òÀßÄê"
 
-#: g10/g10.c:425
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|̾Á°=ÃÍ|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤ò»ÈÍÑ"
-
-#: g10/g10.c:428
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -767,7 +763,7 @@ msgstr ""
 "(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n"
 "¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -787,15 +783,15 @@ msgstr ""
 " --list-keys [̾Á°]         ¸°¤òɽ¼¨\n"
 " --fingerprint [̾Á°]       »ØÌæ¤òɽ¼¨\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/g10.c:571
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
 
-#: g10/g10.c:574
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -805,7 +801,7 @@ msgstr ""
 "½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¤äÉü¹æ\n"
 "´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
 
-#: g10/g10.c:585
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -813,263 +809,275 @@ msgstr ""
 "\n"
 "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à:\n"
 
-#: g10/g10.c:659
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] "
 
-#: g10/g10.c:716
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "¥³¥Þ¥ó¥É¤Î¾×ÆÍ\n"
 
-#: g10/g10.c:891
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s'¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:895
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s': %s\n"
 
-#: g10/g10.c:902
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s¤ÏÀµ¤·¤¤Ê¸»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1202
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURI¤ò²òÀÏÉÔǽ\n"
 
-#: g10/g10.c:1216
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n"
 
-#: g10/g10.c:1239 g10/g10.c:1255
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "·Ù¹ð: %s¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
-
-#: g10/g10.c:1241 g10/g10.c:1258
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "\"--keyserver-options %s\"¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
-
-#: g10/g10.c:1329
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n"
 
-#: g10/g10.c:1340 g10/g10.c:1351
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Ãí°Õ: ÉáÄÌ%s¤ÏÍѤ¤¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:1342 g10/g10.c:1362
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:1345
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n"
 
-#: g10/g10.c:1371
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1377
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1383
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/g10.c:1396
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤ÏIDEA°Å¹æ¤¬Í׵ᤵ¤ì¤Þ¤¹ \n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏPGP 2.x¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1451 g10/g10.c:1463
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1457 g10/g10.c:1469
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1473
-msgid "the given signature policy URL is invalid\n"
-msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
-
-#: g10/g10.c:1477
-msgid "the given certification policy URL is invalid\n"
-msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï%d..%d¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1482
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1486
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1489
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n"
 
-#: g10/g10.c:1493
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1497
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "̵¸ú¤Êdefault-check-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1500
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
+
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
 msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
 
-#: g10/g10.c:1594
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1614
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1621
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1629
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1646
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1673
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1700
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1711
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1727
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1735
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1743
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]"
 
-#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: g10/g10.c:1814
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]"
 
-#: g10/g10.c:1897
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1905
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1992
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à`%s'¤Ç¤¹\n"
 
-#: g10/g10.c:2078
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤ ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2294
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "Ãí¼á̾¤ÎÀèƬ¤Ïʸ»ú¤«¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
-
-#: g10/g10.c:2300
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢¤Î¤ß¤òÍѤ¤¡¢\n"
 "'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2306
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
-
-#: g10/g10.c:2314
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1166,11 +1174,13 @@ msgid "User ID is no longer valid"
 msgstr "¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "ÇË´þÍýͳ: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "ŬÍÑ: "
 
 #. a string with valid answers
@@ -1360,140 +1370,152 @@ msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò»ØÄꤷ¤Æ¤¤¤Þ¤»¤ó (¡Ö-r¡×¤òÍѤ¤¤Þ¤·¤ç¤¦) ¡£\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
-msgstr "\n¥æ¡¼¥¶¡¼ID¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»: "
+msgstr ""
+"\n"
+"¥æ¡¼¥¶¡¼ID¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤ÆÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹¡£\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤ÏÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "´ûÄê¤Î¼õ¿®¼Ô`%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "Áª¹¥%c%lu¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "Áª¹¥%c%lu¤Î½ÅÊ£\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "¿¤¹¤®¤ë`%c'Áª¹¥\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵¸ú¤Ê¸°¥µ¥¤¥º¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "¸°¥µ¥¤¥º¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA¤ÈElGamal (´ûÄê)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keyedit.c:508 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (½ð̾¤È°Å¹æ²½)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "¤É¤ì¤Ë¤·¤Þ¤¹¤«? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹ - ¤½¤ì¤Ç¤âºî¤ê¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:521 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1506,19 +1528,19 @@ msgstr ""
 "             ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n"
 "         ºÇÂç¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n"
 
@@ -1530,12 +1552,12 @@ msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1543,11 +1565,11 @@ msgstr ""
 "2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
 "¿ä¾©¤·¤Þ¤»¤ó!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤¤¤¤¤Ç¤¹¤«? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1555,17 +1577,17 @@ msgstr ""
 "¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢\n"
 "¹¶·â¤Ë¤¿¤¤¤·¤ÆÀȼå¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1581,7 +1603,7 @@ msgstr ""
 "      <n>m = Í­¸ú´ü¸Â n ¤«·î´Ö\n"
 "      <n>y = Í­¸ú´ü¸Â n ǯ´Ö\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1597,30 +1619,30 @@ msgstr ""
 "      <n>m = Í­¸ú´ü¸Â n ¤«·î´Ö\n"
 "      <n>y = Í­¸ú´ü¸Â n ǯ´Ö\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "½ð̾¤ÎÍ­¸ú´ü´Ö¤Ï? (0)"
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "̵¸ú¤ÊÃÍ\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s¤Ï̵´ü¸Â¤Ç¤¹\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s¤Ï%s¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1628,11 +1650,11 @@ msgstr ""
 "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n"
 "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1648,44 +1670,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "ËÜ̾: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "¥³¥á¥ó¥È: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç`%s'¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1696,27 +1718,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1724,16 +1746,16 @@ msgstr ""
 "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keyedit.c:696 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1745,7 +1767,7 @@ msgstr ""
 "¤Î¡Ö--edit-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1756,53 +1778,53 @@ msgstr ""
 "¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n"
 "Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸ø³«¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "½ñ¹þ¤ß²Äǽ¤ÊÈëÌ©¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "¸ø³«¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ÈëÌ©¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºî¤ê¡¢½ð̾¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤È¤·¤Æµ­Ï¿¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1810,101 +1832,111 @@ msgstr ""
 "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n"
 "¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keygen.c:2021 g10/keygen.c:2127
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Ãí°Õ: v3¸°¤ÎÉû¸°¤ÎºîÀ®¤Ï¡¢OpenPGP¤ËŬ¹ç¤·¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:2103
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s'¤Ï´û¤Ë°µ½ÌºÑ¤ß¤Ç¤¹\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ³«¤±¤Þ¤»¤ó: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ·Ù¹ð: ¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï2048¥Ó¥Ã¥È°Ê²¼¤ÎRSA¸°¤Ç°Å¹æ²½¤·¤«¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "°Å¹æ²½¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤ÏÁ´ÉôIDEA°Å¹æ¤ò»È¤¨¤Þ¤»¤ó¡£\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "¸°`%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "¸°¥Ö¥í¥Ã¥¯¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "¸° %08lX: rfc2440¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "¸° %08lX: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "¸° %08lX: PGP 2.x·Á¼°¤Î¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:254
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "·Ù¹ð: ²¿¤â½ñ¤­½Ð¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
@@ -1914,21 +1946,21 @@ msgstr "pk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2271
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%08lX¤Ç¤¹\n"
 
-#: g10/getkey.c:1988
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n"
 
-#: g10/getkey.c:2035
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹¡£¥¹¥­¥Ã¥×\n"
@@ -2008,177 +2040,183 @@ msgstr "       ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n"
 
-#: g10/import.c:438 g10/import.c:654
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "¸°%08lX: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "¸°%08lX: ¿®ÍѤǤ­¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n"
 
-#: g10/import.c:475 g10/import.c:723
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:480
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "¸° %08lX: ¿·¤·¤¤¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:490
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'¤Ø¤Î½ñ½Ð¤·\n"
 
-#: g10/import.c:498 g10/import.c:569 g10/import.c:674 g10/import.c:783
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/import.c:503
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
-#: g10/import.c:522
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n"
 
-#: g10/import.c:540 g10/import.c:740
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:547 g10/import.c:746
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:574
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n"
 
-#: g10/import.c:577
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n"
 
-#: g10/import.c:580
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò1¸Ä\n"
 
-#: g10/import.c:583
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò%d¸Ä\n"
 
-#: g10/import.c:586
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò1¸Ä\n"
 
-#: g10/import.c:589
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò%d¸Ä\n"
 
-#: g10/import.c:599
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "¸°%08lX: Êѹ¹¤Ê¤·\n"
 
-#: g10/import.c:668
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "´ûÄê¤ÎÈëÌ©¸°Îؤ¬¤¢¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:679
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "¸°%08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
 #. we can't merge secret keys
-#: g10/import.c:683
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "¸°%08lX: ´û¤ËÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n"
 
-#: g10/import.c:688
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "¸°%08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:717
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/import.c:757
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈÝ\n"
 
-#: g10/import.c:788
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
-#: g10/import.c:823
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "¸°%08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:836
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id \"%s\" ¤Î¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n"
+msgstr ""
+"¸°%08lX: ¥æ¡¼¥¶¡¼id \"%s\" ¤Î¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n"
 
-#: g10/import.c:838
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id \"%s\" ¤Î¼«¸Ê½ð̾¤¬Ìµ¸ú¤Ç¤¹\n"
 
-#: g10/import.c:855
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:865
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "¸°%08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n"
 
-#: g10/import.c:866
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n"
 
-#: g10/import.c:896
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶¡¼ID '"
 
-#: g10/import.c:919
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n"
@@ -2187,106 +2225,125 @@ msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:942
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "¸°%08lX: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02x) - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:951
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:968
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:1069
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "¸°%08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n"
 
-#: g10/import.c:1128
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "·Ù¹ð: ¸°%08lX¤ÏÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ÇË´þ¸°%08lX¤Î°ú¤­½Ð¤·\n"
 
-#: g10/import.c:1142
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "·Ù¹ð: ¸°%08lX¤ÏÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ÇË´þ¸°%08lX¤ÏÉԺߡ£\n"
 
-#: g10/import.c:1198
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n"
 
-#: g10/import.c:1228
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "¸°%08lX: ľÀܸ°½ð̾¤òÄɲÃ\n"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[ÇË´þ]"
 
-#: g10/keyedit.c:141
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[¼«¸Ê½ð̾]"
 
-#: g10/keyedit.c:212
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "̵¸ú¤Ê½ð̾1¸Ä\n"
 
-#: g10/keyedit.c:214
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵¸ú¤Ê½ð̾%d¸Ä\n"
 
-#: g10/keyedit.c:216
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "¸°¤¬¤Ê¤¤¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:218
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "¸°¤¬¤Ê¤¤¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "¥¨¥é¡¼¤Î¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "¥¨¥é¡¼¤Î¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä¸¡½Ð\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä¸¡½Ð\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "¥æ¡¼¥¶¡¼ID \"%s\" ¤ÏÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  ½ð̾ÉÔǽ¡£\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" ¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n"
+"ÆâÉô½ð̾¤Ç¤¹¡£\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "½ñ½Ð¤·²Äǽ¤Ê½ð̾¤Ë³Ê¾å¤²¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:362
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2295,49 +2352,50 @@ msgstr ""
 "\"%s\" ¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n"
 "ÆâÉô½ð̾¤Ç¤¹¡£\n"
 
-#: g10/keyedit.c:366
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "½ñ½Ð¤·²Äǽ¤Ê½ð̾¤Ë³Ê¾å¤²¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:386
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦ÆâÉô½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keyedit.c:403
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "¸°%08lX¤Ç½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:418
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "¤³¤Î¸°¤Ï%s¤Ç´ü¸Â¤¬ÀÚ¤ì¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:440
-msgid "Do you want your signature to expire at the same time? (y/N) "
+#: g10/keyedit.c:498
+#, fuzzy
+msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ»þ¤Ë½ð̾¤â´ü¸ÂÀÚ¤ì¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:469
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x¸°¤ÇOpenPGP½ð̾¤¬¤Ç¤­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:471
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "¤³¤Î¸°¤ÏPGP 2.x¤Ç»ÈÍѤǤ­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:492
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2346,89 +2404,124 @@ msgstr ""
 "½ð̾¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤¬¼ÂºÝ¤Ë¾åµ­¤Î̾Á°¤Î¿Í¤Î¤â¤Î¤«¤É¤¦¤«¡¢¤É¤ÎÄøÅÙ\n"
 "Ãí°Õ¤·¤Æ¸¡¾Ú¤·¤Þ¤·¤¿¤«? Åú¤¬¤ï¤«¤é¤Ê¤±¤ì¤Ð\"0\"¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:496
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Åú¤¨¤Þ¤»¤ó¡£%s\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Á´Á³¡¢³Îǧ¤·¤Æ¤¤¤Þ¤»¤ó¡£%s\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) °ì±þ¡¢³Îǧ¤·¤Þ¤·¤¿¡£%s\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ¤«¤Ê¤êÃí°Õ¤·¤Æ³Îǧ¤·¤Þ¤·¤¿¡£%s\n"
 
-#: g10/keyedit.c:527
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«: \""
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"½ð̾¤ÏÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
-msgstr "\n½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
+msgstr ""
+"\n"
+"½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
-msgstr "\n½ð̾¤ÏÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
+msgstr ""
+"\n"
+"½ð̾¤ÏÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
-msgstr "\n¤³¤Î¸°¤ÏÁ´Á³¡¢³Îǧ¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgstr ""
+"\n"
+"¤³¤Î¸°¤ÏÁ´Á³¡¢³Îǧ¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
-msgstr "\n¤³¤Î¸°¤Ï°ì±þ¡¢³Îǧ¤·¤Þ¤·¤¿¡£\n"
+msgstr ""
+"\n"
+"¤³¤Î¸°¤Ï°ì±þ¡¢³Îǧ¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
-msgstr "\n¤³¤Î¸°¤Ï¡¢¤«¤Ê¤êÃí°Õ¤·¤Æ³Îǧ¤·¤Þ¤·¤¿¡£\n"
+msgstr ""
+"\n"
+"¤³¤Î¸°¤Ï¡¢¤«¤Ê¤êÃí°Õ¤·¤Æ³Îǧ¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:657
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:661
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "¤³¤Î¸°¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/keyedit.c:687
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2436,7 +2529,7 @@ msgstr ""
 "¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2445,469 +2538,468 @@ msgstr ""
 "¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 "\n"
 
-#: g10/keyedit.c:704
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "Êݸ¤·¤Æ½ªÎ»"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "¤³¤Î¥Ø¥ë¥×¤ò¸«¤ë"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "»ØÌæ¤ò¸«¤ë"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "Éû¸°N¤ÎÁªÂò"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "½ð̾¤Î°ìÍ÷"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "¸°¤Ø½ð̾"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "¥Õ¥©¥ÈID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:832
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "Éû¸°¤ÎÄɲÃ"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "Éû¸°¤Îºï½ü"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "Éû¸°¤ÎÄɲÃ"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "½ð̾¤Îºï½ü"
 
-#: g10/keyedit.c:836
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:836
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹"
 
-#: g10/keyedit.c:837
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:837
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¼ç¤Ë¤¹¤ë"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "Áª¹¥¤Î°ìÍ÷ (¥¨¥­¥¹¥Ñ¡¼¥È)"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "Áª¹¥¤Î°ìÍ÷ (¾éĹ)"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "½ð̾¤ÎÇË´þ"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "Éû¸°¤ÎÇË´þ"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨"
 
-#: g10/delkey.c:112 g10/keyedit.c:871
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "¥³¥Þ¥ó¥É> "
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "¤Þ¤º¡Ötoggle¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "¸°¤ÏÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: g10/keyedit.c:1061
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1062
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:1087
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1107 g10/keyedit.c:1128
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1109
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1113
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1151 g10/keyedit.c:1173
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "¤³¤Î¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1298
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤Ï¤¤¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1323
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Öhelp¡×¤ò»²¾È)\n"
 
-#: g10/keyedit.c:1480
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "¤³¤Î¸°¤Ï%s¸°%s%s¤Ë¤è¤Ã¤ÆÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (¥Ç¥ê¥±¡¼¥È)"
 
-#: g10/keyedit.c:1488 g10/keyedit.c:1514
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ºîÀ®: %s ´ü¸Â: %s"
 
-#: g10/keyedit.c:1497
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1501
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/keyedit.c:1530
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹: %s\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤ÎÇË´þ¤òȯ¸«\n"
 
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? ÇË´þ³Îǧ¾ã³²: %s\n"
 
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n"
 "¤È¤¤¤¦¤³¤È¤òǰƬ¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1651
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"·Ù¹ð: ¤³¤Î¸°¤Ë¤Ï¤â¤¦¥Õ¥©¥ÈID¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"      °ã¤¦¥Õ¥©¥ÈID¤òÄɲ乤ë¤È¡¢°ìÉô¤ÎÈǤÎPGP¤Ïº®Í𤹤뤫¤â¤·¤ì¤Þ¤»¤ó¡£\n"
-
-#: g10/keyedit.c:1655 g10/keyedit.c:1682
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) "
-
-#: g10/keyedit.c:1663
-msgid "You may only have one photo ID on a key.\n"
-msgstr "1Ëܤθ°¤Ë¤Ï¥Õ¥©¥ÈID¤ò¤Ò¤È¤ÄÉÕ¤±¤é¤ì¤ë¤À¤±¤Ç¤¹¡£\n"
-
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2916,83 +3008,108 @@ msgstr ""
 "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n"
 "      ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1688
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1851
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1926
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1990
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2072
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:2260
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id \"%s\" ¤Î¼«¸Ê½ð̾¤¬Ìµ¸ú¤Ç¤¹\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2306
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2420
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "¥æ¡¼¥¶¡¼ID: \""
 
-#: g10/keyedit.c:2425
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3001,7 +3118,7 @@ msgstr ""
 "\"\n"
 "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3010,234 +3127,242 @@ msgstr ""
 "\"\n"
 "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤ËÆâÉôŪ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2433
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n"
 
-#: g10/keyedit.c:2437
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¤½¤ì¤Ç¤âÇË´þ¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:2441
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n"
 
-#: g10/keyedit.c:2481
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2489
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX¤Ç%s¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2509
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
 
-#: g10/keyedit.c:2519
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX¤Ç%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2521
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (½ñ½Ð¤·ÉÔ²Ä)"
 
-#: g10/keyedit.c:2528
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:2558
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "%s¤ò¥µ¥¤¥º%ld¤Î¸°0x%08lX (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:82
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "½ð̾¥Ý¥ê¥·¡¼: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "½ð̾¥Ý¥ê¥·¡¼: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n"
 
-#. This is UTF8
-#: g10/keylist.c:115
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "½ð̾Ãí¼á: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "½ð̾Ãí¼á: "
 
-#: g10/keylist.c:122
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "¿Í¤Ë¤ÏÆɤá¤Þ¤»¤ó"
 
-#: g10/keylist.c:187
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "¸°ÎØ"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [Í­¸ú´ü¸Â: %s]"
 
-#: g10/keylist.c:852
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "»ØÌæ:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:858
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "                    »ØÌæ:"
 
-#: g10/keylist.c:862
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "                »ØÌæ ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "¸ø³«¸°¤Ï%08lX¤Ç¤¹\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤DEK¤Ç¤¹\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u-¥Ó¥Ã¥È%s¸°, ID %08lX¤Ç°Å¹æ²½%s¤Ë¤Ç¤­¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s¸°, ID %08lX¤Ç°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿¤ò²¾Äê\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA°Å¹æ¤ÏÍøÍÑÉÔǽ¤Ê¤Î¤Ç¡¢³ÚŷŪ¤Ç¤¹¤¬%s¤ÇÂåÍѤ·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "Éü¹æ¤ËÀ®¸ù\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "·Ù¹ð: °Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï²þã⤵¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Éü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆâ½ï¤Ë¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë̾='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ÆÈΩÇË´þ¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Ãí¼á: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "¥Ý¥ê¥·¡¼: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "½ð̾¤Î¸¡¾Ú¤ò¾Êά\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "¤³¤Î¿½Å½ð̾¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ¤Î%s¸°ID %08lX¤Ë¤è¤ë½ð̾\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "ÉÔÀµ¤Ê ½ð̾: \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾: \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Àµ¤·¤¤½ð̾: \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[ÉÔ³ÎÄê]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "       ÊÌ̾ \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "ʬΥ½ð̾¤Ç¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Î½ð̾\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n"
 
@@ -3256,75 +3381,94 @@ msgstr ""
 "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 "¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "·Ù¹ð: %s \"%s\" ¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "·Ù¹ð: %s \"%s\" ¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA°Å¹æ¤Î¥×¥é¥°¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "¾ÜºÙ¤Ï¡¢http://www.gnupg.org/why-not-idea.html¤ò¤´Í÷¤¯¤À¤µ¤¤\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "·Ù¹ð: %s¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "·Ù¹ð: %s¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "\"--keyserver-options %s\"¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "¥¿¥¤¥×%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n"
 
-#: g10/passphrase.c:330 g10/passphrase.c:377
+#: g10/passphrase.c:442 g10/passphrase.c:489
 msgid "gpg-agent is not available in this session\n"
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg¥¨¡¼¥¸¥§¥ó¥È¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:450
 msgid "can't set client pid for the agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Î¥¯¥é¥¤¥¢¥ó¥Èpid¤òÀßÄê¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:346
+#: g10/passphrase.c:458
 msgid "can't get server read FD for the agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼ÆɽФ·FD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:353
+#: g10/passphrase.c:465
 msgid "can't get server write FD for the agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼½ñ¹þ¤ßFD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:386
+#: g10/passphrase.c:498
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO´Ä¶­ÊÑ¿ô¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:511
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/hkp.c:148 g10/passphrase.c:420
+#: g10/hkp.c:147 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/passphrase.c:442
+#: g10/passphrase.c:554
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:897
+#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+msgid "problem with the agent - disabling agent use\n"
+msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n"
+
+#: g10/passphrase.c:631 g10/passphrase.c:1017
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (¼ç¸°ID %08lX)"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:641
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3335,36 +3479,32 @@ msgstr ""
 "\"%.*s\"\n"
 "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s%s\n"
 
-#: g10/passphrase.c:542
+#: g10/passphrase.c:662
 msgid "Enter passphrase\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:664
 msgid "Repeat passphrase\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ\n"
 
-#: g10/passphrase.c:585
+#: g10/passphrase.c:705
 msgid "passphrase too long\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹²á¤®¤Þ¤¹\n"
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:718
 msgid "invalid response from agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n"
 
-#: g10/passphrase.c:607 g10/passphrase.c:688
+#: g10/passphrase.c:727 g10/passphrase.c:808
 msgid "cancelled by user\n"
 msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n"
 
-#: g10/passphrase.c:609 g10/passphrase.c:770
+#: g10/passphrase.c:729 g10/passphrase.c:890
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n"
 
-#: g10/passphrase.c:691 g10/passphrase.c:799
-msgid "problem with the agent - disabling agent use\n"
-msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n"
-
-#: g10/passphrase.c:883
+#: g10/passphrase.c:1003
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3374,20 +3514,20 @@ msgstr ""
 "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n"
 "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \""
 
-#: g10/passphrase.c:892
+#: g10/passphrase.c:1012
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s"
 
-#: g10/passphrase.c:943
+#: g10/passphrase.c:1063
 msgid "can't query password in batchmode\n"
 msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:947
+#: g10/passphrase.c:1067
 msgid "Enter passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: "
 
-#: g10/passphrase.c:951
+#: g10/passphrase.c:1071
 msgid "Repeat passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: "
 
@@ -3402,55 +3542,60 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "`%s'¤ÎºîÀ®¥¨¥é¡¼: %s\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:337
 msgid "Detached signature.\n"
 msgstr "ʬΥ½ð̾¡£\n"
 
-#: g10/plaintext.c:340
+#: g10/plaintext.c:341
 msgid "Please enter name of data file: "
 msgstr "¥Ç¡¼¥¿¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: "
 
-#: g10/plaintext.c:361
+#: g10/plaintext.c:362
 msgid "reading stdin ...\n"
 msgstr "ɸ½àÆþÎϤè¤êÆɹþ¤ßÃæ ...\n"
 
-#: g10/plaintext.c:395
+#: g10/plaintext.c:396
 msgid "no signed data\n"
 msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/plaintext.c:403
+#: g10/plaintext.c:404
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "ƿ̾¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸°%08lX¤òÍѤ¤¤Þ¤¹ ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "½ªÎ»¡£Æ¿Ì¾¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Êݸ¥ë¥´¥ê¥º¥à%d%s¤Ï̤ÃΤ«»ÈÍÑÉԲĤǤ¹\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "¸°%08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3462,27 +3607,31 @@ msgstr "¸°%08lX¤òHKP¸°¥µ¡¼¥Ð¡¼%s¤ËÍ×µá\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: g10/hkp.c:172
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "`%s'¤Ø¤ÎÁ÷¿®¥¨¥é¡¼: %s\n"
 
-#: g10/hkp.c:187
+#: g10/hkp.c:186
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "`%s'¤Ø¤ÎÁ÷¿®¤ËÀ®¸ù (¾õÂÖ=%u)\n"
 
-#: g10/hkp.c:190
+#: g10/hkp.c:189
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n"
 
-#: g10/hkp.c:472
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "\"%s\"¤òHKP¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
 
-#: g10/hkp.c:522
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ò¸¡º÷¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -3539,45 +3688,56 @@ msgstr "Ãí°Õ: ½ð̾¸°%08lX¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¤ß¤Ê¤·¤Þ¤¹\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "·Ù¹ð: ¥Ý¥ê¥·¡¼url¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Ì¤³ÈÄ¥¤ò»ÈÍÑ¡£\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr "·Ù¹ð: ¥Ý¥ê¥·¡¼url¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Ì¤³ÈÄ¥¤ò»ÈÍÑ¡£\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "ºîÀ®¤µ¤ì¤¿½ð̾¤Î¸¡¾Ú¤Ë¼ºÇÔ: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s½ð̾¡£½ð̾¼Ô: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "·Ù¹ð: `%s'¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç½ð̾¤Ç¤­¤ë¤À¤±¤Ç¤¹\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "½ð̾:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¥¯¥ê¥¢½ð̾¤·¤«¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s°Å¹æ²½¤ò»ÈÍѤ·¤Þ¤¹\n"
@@ -3766,26 +3926,26 @@ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡¾Ú¤ÏÉÔÍפǤ¹\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1638
+#: g10/trustdb.c:474 g10/trustdb.c:1641
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¼¡²ó¤Î¸¡¾Ú¤Ï%s¤Ç¤¹\n"
 
-#: g10/trustdb.c:776
+#: g10/trustdb.c:779
 msgid "checking the trustdb\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡¾Ú\n"
 
-#: g10/trustdb.c:930
+#: g10/trustdb.c:933
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "¸ø³«¸°%08lX¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/trustdb.c:1512
+#: g10/trustdb.c:1515
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%08lX¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/trustdb.c:1590
+#: g10/trustdb.c:1593
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "¿¼¤µ%d¤Ç¸¡¾Ú¡¢½ð̾ºÑ¤ß=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -3805,27 +3965,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹¤¹¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "¤ä¤Ð¤¯¤Æ¤â¤¤¤¤¥Õ¥é¥°¤¬¸°¤Ë¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "µ¶ÊªÍð¿ôÀ¸À®»Ò¤È¤Ï¤¤¤Ã¤·¤ç¤Ë»È¤¨¤Þ¤»¤ó!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s'¤ò¥¹¥­¥Ã¥×: ½ÅÊ£\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s'¤ò¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "¥¹¥­¥Ã¥×: ÈëÌ©¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3920,16 +4080,16 @@ msgstr "¤³¤ì¤ÏÈëÌ©¸°¤Ç¤¹! ËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "¸°¥Ö¥í¥Ã¥¯¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/delkey.c:161
+#: g10/delkey.c:166
 msgid "ownertrust information cleared\n"
 msgstr "½êÍ­¼Ô¿®ÍѾðÊó¤ò¥¯¥ê¥¢¤·¤Þ¤·¤¿\n"
 
-#: g10/delkey.c:189
+#: g10/delkey.c:194
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "¤³¤Î¸ø³«¸°¤Ë¤¿¤¤¤¹¤ëÈëÌ©¸° \"%s\" ¤¬¤¢¤ê¤Þ¤¹!\n"
 
-#: g10/delkey.c:191
+#: g10/delkey.c:196
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "¤Þ¤º¡Ö--delete-secret-keys¡×¥ª¥×¥·¥ç¥ó¤Ç¤³¤ì¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
@@ -4014,16 +4174,23 @@ msgstr ""
 "¤Ê¤¼¤Ê¤é¡¢¤³¤ì¤é¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¢\n"
 "ºîÀ®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£"
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "¡Öyes¡×¤«¡Öno¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4035,19 +4202,19 @@ msgstr ""
 "ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤½¤ÎÂå¤ê¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´ü´Ö¤ØÊÑ´¹¤¹¤ë\n"
 "¤è¤¦¤Ë»î¤ß¤Þ¤¹¡£"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "¥ª¥×¥·¥ç¥ó¤Ç¤¹¤¬¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "¥ª¥×¥·¥ç¥ó¤Î¥³¥á¥ó¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4061,11 +4228,11 @@ msgstr ""
 "O  ¸°¤ÎÀ¸À®¤Î³¹Ô¡£\n"
 "Q  ¸°¤ÎÀ¸À®¤ÎÃæ»ß¡£"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢¡Öyes¡×(¤Þ¤¿¤Ï¡¢Ã±¤Ë¡Öy¡×) ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4134,11 +4301,11 @@ msgstr ""
 "\n"
 "Àµ¤·¤¤Åú¤Î¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö0¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4146,11 +4313,11 @@ msgstr ""
 "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
 "¾ÚÌÀ½ñ¤âÁ´ÉôƱ»þ¤Ëºï½ü¤·¤Þ¤¹!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4160,7 +4327,7 @@ msgstr ""
 "¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Ï¡¢¸°¤Ø¤Î¿®ÍѤÎÎؤκîÀ®¤ä¡¢\n"
 "¤³¤Î¸°¤Ë¤è¤ë¾ÚÌÀ¤Ë¤È¤Ã¤Æ½ÅÍפÀ¤«¤é¤Ç¤¹¡£"
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4172,7 +4339,7 @@ msgstr ""
 "¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n"
 "¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£"
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4180,7 +4347,7 @@ msgstr ""
 "¤³¤Î½ð̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¤³¤È¤Ï¡¢¤¢¤Ê¤¿¤Î¸°Îؤ«¤éºï½ü¤¹¤Ù¤­¤À\n"
 "¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4193,7 +4360,7 @@ msgstr ""
 "¤·¤ì¤Þ¤»¤ó¡£¤è¤Ã¤Æ¡¢¤³¤Î¼«¸Ê½ð̾¤¬²¿¤é¤«¤ÎÍýͳ¤Ë¤è¤ê̵¸ú¤Ç¤¢¤Ã¤Æ¡¢\n"
 "ÂåÂؤȤʤ븰¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¡¢ºï½ü¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4202,23 +4369,23 @@ msgstr ""
 "Á´Éô (¤Þ¤¿¤ÏÁªÂò¤·¤¿) ¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤ò¡¢¸½ºß¤ÎÁª¹¥°ìÍ÷¤ËÊѹ¹\n"
 "¤·¤Þ¤¹¡£´Ø·¸¤¹¤ë¼«¸Ê½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¡¢1É乤¹¤ß¤Þ¤¹¡£\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹ \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "ÆþÎϤ·¤¿¥Ñ¥¹¥Õ¥ì¡¼¥º¤Î³Îǧ¤Î¤¿¤á¡¢ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "½ð̾¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "¾å½ñ¤­¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4226,7 +4393,7 @@ msgstr ""
 "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¡¦¥­¡¼¤ò²¡¤¹¤È¡¢\n"
 "(³ç¸Ì¤Ç°Ï¤ó¤À) ´ûÄê¤Î¥Õ¥¡¥¤¥ë̾¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4255,7 +4422,7 @@ msgstr ""
 "      ¤Þ¤¹¡£¤³¤ì¤ÏÉáÄÌ¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¤È\n"
 "      ¤­¤Ë»È¤¤¤Þ¤¹¡£\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4265,11 +4432,11 @@ msgstr ""
 "¥­¥¹¥È¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Æ¥­¥¹¥È¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "¶õ¹Ô¤Ç½ª¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s'¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó"
@@ -4332,255 +4499,272 @@ msgstr "%lu¸Ä¤Î¸°¤Þ¤Ç¸¡¾Ú (%lu¸Ä¤Î½ð̾)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n"
 
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "¥é¥ó¥À¥à¡¦¥Ó¥Ã¥È¤ò¤¿¤¯¤µ¤óÍ׵ᤷ²á¤®¤Ç¤¹¡£¸Â³¦¤Ï %d\n"
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|̾Á°=ÃÍ|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤ò»ÈÍÑ"
 
-msgid "|[NAMES]|check the trust database"
-msgstr "|[̾Á°]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯"
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "Ãí¼á̾¤ÎÀèƬ¤Ïʸ»ú¤«¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-msgid "--delete-secret-key user-id"
-msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id"
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-msgid "--delete-key user-id"
-msgstr "--delete-key ¥æ¡¼¥¶¡¼id"
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "·Ù¹ð: ¤³¤Î¸°¤Ë¤Ï¤â¤¦¥Õ¥©¥ÈID¤¬¤¢¤ê¤Þ¤¹¡£\n"
+#~ "      °ã¤¦¥Õ¥©¥ÈID¤òÄɲ乤ë¤È¡¢°ìÉô¤ÎÈǤÎPGP¤Ïº®Í𤹤뤫¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-and-public-key ¥æ¡¼¥¶¡¼id"
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "1Ëܤθ°¤Ë¤Ï¥Õ¥©¥ÈID¤ò¤Ò¤È¤ÄÉÕ¤±¤é¤ì¤ë¤À¤±¤Ç¤¹¡£\n"
 
-msgid "For info see http://www.gnupg.org"
-msgstr "KUWASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "¥é¥ó¥À¥à¡¦¥Ó¥Ã¥È¤ò¤¿¤¯¤µ¤óÍ׵ᤷ²á¤®¤Ç¤¹¡£¸Â³¦¤Ï %d\n"
 
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
+#~ msgid "|[NAMES]|check the trust database"
+#~ msgstr "|[̾Á°]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯"
 
-msgid ""
-"Could not find a valid trust path to the key.  Let's see whether we\n"
-"can assign some missing owner trust values.\n"
-"\n"
-msgstr ""
-"¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤηÐÏ©¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
-"¤¤¤Ê¤¤¿Í¤Î¿®ÍÑÅÙ¤¬ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n"
-"\n"
+#~ msgid "--delete-secret-key user-id"
+#~ msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id"
 
-msgid ""
-"No path leading to one of our keys found.\n"
-"\n"
-msgstr ""
-"¤³¤Á¤é¤Î¸°¤Ø»ê¤ë·ÐÏ©¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
-"\n"
+#~ msgid "--delete-key user-id"
+#~ msgstr "--delete-key ¥æ¡¼¥¶¡¼id"
 
-msgid ""
-"No certificates with undefined trust found.\n"
-"\n"
-msgstr ""
-"¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¤Î¾ÚÌÀ½ñ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-"\n"
+#~ msgid "--delete-secret-and-public-key user-id"
+#~ msgstr "--delete-secret-and-public-key ¥æ¡¼¥¶¡¼id"
 
-msgid ""
-"No trust values changed.\n"
-"\n"
-msgstr ""
-"¿®ÍÑÅÙ¤ÎÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-"\n"
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "KUWASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
 
-msgid "%08lX: no info to calculate a trust probability\n"
-msgstr "%08lX: ¿®ÍÑÅÙ¤ò·×»»¤¹¤ë¾ðÊ󤬤¢¤ê¤Þ¤»¤ó\n"
+#~ msgid "sSmMqQ"
+#~ msgstr "sSmMqQ"
 
-msgid "Enter the user ID: "
-msgstr "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ: "
+#~ msgid ""
+#~ "Could not find a valid trust path to the key.  Let's see whether we\n"
+#~ "can assign some missing owner trust values.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤηÐÏ©¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
+#~ "¤¤¤Ê¤¤¿Í¤Î¿®ÍÑÅÙ¤¬ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n"
+#~ "\n"
 
-msgid "skipped: public key already set with --encrypt-to\n"
-msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤ÇÀßÄêºÑ¤ß¤Ç¤¹\n"
+#~ msgid ""
+#~ "No path leading to one of our keys found.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "¤³¤Á¤é¤Î¸°¤Ø»ê¤ë·ÐÏ©¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+#~ "\n"
 
-msgid "%s: error checking key: %s\n"
-msgstr "%s: ¸°¤Î¸¡¾Ú¥¨¥é¡¼: %s\n"
+#~ msgid ""
+#~ "No certificates with undefined trust found.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¤Î¾ÚÌÀ½ñ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+#~ "\n"
 
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (½ð̾¤È°Å¹æ²½)\n"
+#~ msgid ""
+#~ "No trust values changed.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "¿®ÍÑÅÙ¤ÎÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+#~ "\n"
 
-msgid "Do you really want to create a sign and encrypt key? "
-msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
+#~ msgid "%08lX: no info to calculate a trust probability\n"
+#~ msgstr "%08lX: ¿®ÍÑÅÙ¤ò·×»»¤¹¤ë¾ðÊ󤬤¢¤ê¤Þ¤»¤ó\n"
 
-msgid "Do you really need such a large keysize? "
-msgstr "¤³¤ó¤Ê¤ËŤ¤¸°¤¬ËÜÅö¤Ë¤¤¤ê¤Þ¤¹¤«? "
+#~ msgid "Enter the user ID: "
+#~ msgstr "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ: "
 
-msgid "%s: user not found: %s\n"
-msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
+#~ msgid "skipped: public key already set with --encrypt-to\n"
+#~ msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤ÇÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-msgid "certificate read problem: %s\n"
-msgstr "¾ÚÌÀ½ñ¤ÎÆɹþ¤ß¾ã³²: %s\n"
+#~ msgid "%s: error checking key: %s\n"
+#~ msgstr "%s: ¸°¤Î¸¡¾Ú¥¨¥é¡¼: %s\n"
 
-msgid "too many entries in unk cache - disabled\n"
-msgstr "unk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n"
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
 
-msgid "secret key %08lX not imported (use %s to allow for it)\n"
-msgstr "ÈëÌ©¸°%08lX¤ÏÆɤ߹þ¤Þ¤ì¤Þ¤»¤ó (Í­¸ú¤Ë¤¹¤ë¤Ë¤Ï%s¤ò»È¤¤¤Þ¤¹)\n"
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "¤³¤ó¤Ê¤ËŤ¤¸°¤¬ËÜÅö¤Ë¤¤¤ê¤Þ¤¹¤«? "
 
-msgid "key %08lX: our copy has no self-signature\n"
-msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-msgid "%s: user not found\n"
-msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "¾ÚÌÀ½ñ¤ÎÆɹþ¤ß¾ã³²: %s\n"
 
-msgid "update of trustdb failed: %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "too many entries in unk cache - disabled\n"
+#~ msgstr "unk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n"
 
-msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
-"´ûÃΤθ°¥µ¡¼¥Ð¡¼¤Ï¤¢¤ê¤Þ¤»¤ó (--keyserver¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦)\n"
+#~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
+#~ msgstr "ÈëÌ©¸°%08lX¤ÏÆɤ߹þ¤Þ¤ì¤Þ¤»¤ó (Í­¸ú¤Ë¤¹¤ë¤Ë¤Ï%s¤ò»È¤¤¤Þ¤¹)\n"
+
+#~ msgid "key %08lX: our copy has no self-signature\n"
+#~ msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+
+#~ msgid "update of trustdb failed: %s\n"
+#~ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+#~ msgid "no keyserver known (use option --keyserver)\n"
+#~ msgstr ""
+#~ "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤Ï¤¢¤ê¤Þ¤»¤ó (--keyserver¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦)\n"
 
-msgid "%s: not a valid key ID\n"
-msgstr "%s: Àµ¤·¤¤¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgid "%s: not a valid key ID\n"
+#~ msgstr "%s: Àµ¤·¤¤¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n"
 
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢ÉÔÀµ¤ÊMDC¤È¤ß¤Ê¤·¤Þ¤¹\n"
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢ÉÔÀµ¤ÊMDC¤È¤ß¤Ê¤·¤Þ¤¹\n"
 
-msgid "error reading dir record for LID %lu: %s\n"
-msgstr "LID %lu¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
+#~ msgid "error reading dir record for LID %lu: %s\n"
+#~ msgstr "LID %lu¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
-msgid "lid %lu: expected dir record, got type %d\n"
-msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¡¢¥¿¥¤¥×%d\n"
+#~ msgid "lid %lu: expected dir record, got type %d\n"
+#~ msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¡¢¥¿¥¤¥×%d\n"
 
-msgid "no primary key for LID %lu\n"
-msgstr "LID %lu¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgid "no primary key for LID %lu\n"
+#~ msgstr "LID %lu¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-msgid "error reading primary key for LID %lu: %s\n"
-msgstr "LID %lu¤Î¼ç¸°¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
+#~ msgid "error reading primary key for LID %lu: %s\n"
+#~ msgstr "LID %lu¤Î¼ç¸°¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
-msgid "get_dir_record: search_record failed: %s\n"
-msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "get_dir_record: search_record failed: %s\n"
+#~ msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "key %08lX: query record failed\n"
-msgstr "¸°%08lX: ¥ì¥³¡¼¥É¤ÎÌä¹ç¤»¤Ë¼ºÇÔ\n"
+#~ msgid "key %08lX: query record failed\n"
+#~ msgstr "¸°%08lX: ¥ì¥³¡¼¥É¤ÎÌä¹ç¤»¤Ë¼ºÇÔ\n"
 
-msgid "key %08lX: already in trusted key table\n"
-msgstr "¸°%08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n"
+#~ msgid "key %08lX: already in trusted key table\n"
+#~ msgstr "¸°%08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n"
 
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤ÏÊݸ¤ì¤Æ¤¤¤Þ ¤»¤ó¡£\n"
+#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
+#~ msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤ÏÊݸ¤ì¤Æ¤¤¤Þ ¤»¤ó¡£\n"
 
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "¸°%08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n"
+#~ msgid "key %08lX: secret and public key don't match\n"
+#~ msgstr "¸°%08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-msgid "enumerate secret keys failed: %s\n"
-msgstr "ÈëÌ©¸°¤ÎÎóµó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "enumerate secret keys failed: %s\n"
+#~ msgstr "ÈëÌ©¸°¤ÎÎóµó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "key %08lX.%lu: Good subkey binding\n"
-msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n"
+#~ msgid "key %08lX.%lu: Good subkey binding\n"
+#~ msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n"
 
-msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n"
+#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
+#~ msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n"
 
-msgid "key %08lX.%lu: Valid key revocation\n"
-msgstr "¸°%08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇË´þ\n"
+#~ msgid "key %08lX.%lu: Valid key revocation\n"
+#~ msgstr "¸°%08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇË´þ\n"
 
-msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-msgstr "¸°%08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n"
+#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
+#~ msgstr "¸°%08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n"
 
-msgid "key %08lX.%lu: Valid subkey revocation\n"
-msgstr "¸°%08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n"
+#~ msgid "key %08lX.%lu: Valid subkey revocation\n"
+#~ msgstr "¸°%08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n"
 
-msgid "Good self-signature"
-msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾"
+#~ msgid "Good self-signature"
+#~ msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾"
 
-msgid "Invalid self-signature"
-msgstr "̵¸ú¤Ê¼«¸Ê½ð̾"
+#~ msgid "Invalid self-signature"
+#~ msgstr "̵¸ú¤Ê¼«¸Ê½ð̾"
 
-msgid "Valid user ID revocation skipped due to a newer self signature"
-msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó"
+#~ msgid "Valid user ID revocation skipped due to a newer self signature"
+#~ msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó"
 
-msgid "Valid user ID revocation"
-msgstr "Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
+#~ msgid "Valid user ID revocation"
+#~ msgstr "Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
 
-msgid "Invalid user ID revocation"
-msgstr "̵¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
+#~ msgid "Invalid user ID revocation"
+#~ msgstr "̵¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
 
-msgid "Valid certificate revocation"
-msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
+#~ msgid "Valid certificate revocation"
+#~ msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
 
-msgid "Good certificate"
-msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ"
+#~ msgid "Good certificate"
+#~ msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ"
 
-msgid "Invalid certificate revocation"
-msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
+#~ msgid "Invalid certificate revocation"
+#~ msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
 
-msgid "Invalid certificate"
-msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ"
+#~ msgid "Invalid certificate"
+#~ msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ"
 
-msgid "sig record %lu[%d] points to wrong record.\n"
-msgstr "½ð̾¥ì¥³¡¼¥É%lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n"
+#~ msgid "sig record %lu[%d] points to wrong record.\n"
+#~ msgstr "½ð̾¥ì¥³¡¼¥É%lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-msgid "duplicated certificate - deleted"
-msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü"
+#~ msgid "duplicated certificate - deleted"
+#~ msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü"
 
-msgid "tdbio_search_dir failed: %s\n"
-msgstr "tdbio_search_dir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "tdbio_search_dir failed: %s\n"
+#~ msgstr "tdbio_search_dir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "lid ?: insert failed: %s\n"
-msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "lid ?: insert failed: %s\n"
+#~ msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "lid %lu: insert failed: %s\n"
-msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "lid %lu: insert failed: %s\n"
+#~ msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "lid %lu: inserted\n"
-msgstr "lid %lu: ÁÞÆþ¤·¤Þ¤·¤¿\n"
+#~ msgid "lid %lu: inserted\n"
+#~ msgstr "lid %lu: ÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-msgid "error reading dir record: %s\n"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
+#~ msgid "error reading dir record: %s\n"
+#~ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
-msgid "\t%lu keys with errors\n"
-msgstr "\t%lu¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
+#~ msgid "\t%lu keys with errors\n"
+#~ msgstr "\t%lu¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
 
-msgid "\t%lu keys inserted\n"
-msgstr "\t%lu¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n"
+#~ msgid "\t%lu keys inserted\n"
+#~ msgstr "\t%lu¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-msgid "lid %lu: dir record w/o key - skipped\n"
-msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n"
+#~ msgid "lid %lu: dir record w/o key - skipped\n"
+#~ msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n"
 
-msgid "\t%lu due to new pubkeys\n"
-msgstr "\t%lu¿·¤·¤¤¸ø³«¸°\n"
+#~ msgid "\t%lu due to new pubkeys\n"
+#~ msgstr "\t%lu¿·¤·¤¤¸ø³«¸°\n"
 
-msgid "\t%lu keys skipped\n"
-msgstr "\t%lu¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n"
+#~ msgid "\t%lu keys skipped\n"
+#~ msgstr "\t%lu¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n"
 
-msgid "\t%lu keys updated\n"
-msgstr "\t%lu¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n"
+#~ msgid "\t%lu keys updated\n"
+#~ msgstr "\t%lu¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n"
 
-msgid "Ooops, no keys\n"
-msgstr "¤ª¤Ã¤È¡¢¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgid "Ooops, no keys\n"
+#~ msgstr "¤ª¤Ã¤È¡¢¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-msgid "Ooops, no user IDs\n"
-msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgid "Ooops, no user IDs\n"
+#~ msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-msgid "check_trust: search dir record failed: %s\n"
-msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "check_trust: search dir record failed: %s\n"
+#~ msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "key %08lX: insert trust record failed: %s\n"
-msgstr "¸°%08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "key %08lX: insert trust record failed: %s\n"
+#~ msgstr "¸°%08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "key %08lX.%lu: inserted into trustdb\n"
-msgstr "¸°%08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n"
+#~ msgid "key %08lX.%lu: inserted into trustdb\n"
+#~ msgstr "¸°%08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
-msgstr "¸°%08lX.%lu: ̤Íè¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
+#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+#~ msgstr "¸°%08lX.%lu: ̤Íè¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-msgid "key %08lX.%lu: expired at %s\n"
-msgstr "¸°%08lX.%lu: %s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
+#~ msgid "key %08lX.%lu: expired at %s\n"
+#~ msgstr "¸°%08lX.%lu: %s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
-msgid "key %08lX.%lu: trust check failed: %s\n"
-msgstr "¸°%08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "key %08lX.%lu: trust check failed: %s\n"
+#~ msgstr "¸°%08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "problem finding '%s' in trustdb: %s\n"
-msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é'%s'¤Î¸¡º÷¤Ë¾ã³²: %s\n"
+#~ msgid "problem finding '%s' in trustdb: %s\n"
+#~ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é'%s'¤Î¸¡º÷¤Ë¾ã³²: %s\n"
 
-msgid "user '%s' not in trustdb - inserting\n"
-msgstr "¥æ¡¼¥¶¡¼'%s'¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ\n"
+#~ msgid "user '%s' not in trustdb - inserting\n"
+#~ msgstr "¥æ¡¼¥¶¡¼'%s'¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ\n"
 
-msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "'%s'¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+#~ msgid "failed to put '%s' into trustdb: %s\n"
+#~ msgstr "'%s'¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "·Ù¹ð: ¤Þ¤À long pref ¥ì¥³¡¼¥É¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "·Ù¹ð: ¤Þ¤À long pref ¥ì¥³¡¼¥É¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
 
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤»¤ó: %s\n"
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤»¤ó: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 5de11eab1..b30d53c9e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "einde"
 
@@ -273,7 +273,7 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -338,7 +338,7 @@ msgstr ""
 "Gebruik geen enkele gegevens die door dit programma gegenereerd zijn!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +350,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -358,170 +358,170 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -531,209 +531,205 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -753,17 +749,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <gnupg-bugs@gnu.org>;\n"
 "fouten in de vertaling aan <nl@li.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -773,7 +769,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -781,272 +777,281 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1492
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "de gegeven beleids-URL is ongeldig\n"
-
-#: g10/g10.c:1496
+#: g10/g10.c:1613
 #, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "de gegeven beleids-URL is ongeldig\n"
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1651
 #, fuzzy
-msgid "invalid preferences\n"
+msgid "invalid default preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "toon voorkeuren"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "toon voorkeuren"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "toon voorkeuren"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"het eerste teken van een notitienaam moet een letter of laag liggend steepje "
-"zijn\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
+#: g10/g10.c:2520
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "de gegeven beleids-URL is ongeldig\n"
+
+#: g10/g10.c:2522
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "de gegeven beleids-URL is ongeldig\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1147,12 +1152,14 @@ msgid "User ID is no longer valid"
 msgstr ""
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
-msgstr ""
+#, fuzzy
+msgid "reason for revocation: "
+msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
-msgstr ""
+#, fuzzy
+msgid "revocation comment: "
+msgstr "[terugtrekking]"
 
 #. a string with valid answers
 #: g10/pkclist.c:252
@@ -1358,148 +1365,158 @@ msgstr ""
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Je gaf geen gebruikersidentificatie op. (je kunt \"-r\" gebruiken)\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "overgeslagen: openbare sleutel is al ingesteld als de standaard ontvanger\n"
 
 # fixme
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Openbare sleutel is niet toegankelijk.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
 # fixme
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "`%s' overgeslagen: dubbel\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "zelfondertekening wegschrijven\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "zelfondertekening wegschrijven\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1512,20 +1529,20 @@ msgstr ""
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
@@ -1537,12 +1554,12 @@ msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1550,11 +1567,11 @@ msgstr ""
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1562,17 +1579,17 @@ msgstr ""
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1588,7 +1605,7 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1605,32 +1622,32 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1638,11 +1655,11 @@ msgstr ""
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1658,44 +1675,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1706,28 +1723,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1735,17 +1752,17 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1757,7 +1774,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1770,54 +1787,54 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1826,12 +1843,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1839,7 +1856,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1847,84 +1864,94 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu sleutels verwerkt\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kon niet openen: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets geëxporteerd\n"
 
@@ -1934,22 +1961,22 @@ msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[gebruiker niet gevonden]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2030,181 +2057,186 @@ msgstr "geheime sleutels geïmporteerd: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "sleutel %08lX: openbare sleutel geïmporteerd\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "sleutel %08lX: kan originele sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "sleutel %08lX: geheime sleutel geïmporteerd\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat geïmporteerd\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -2213,190 +2245,206 @@ msgstr "sleutel %08lX: subsleutel overgeslagen\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
 "overgeslagen\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
 "overgeslagen\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ongeldige ondertekeningen\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "%d gebruikersidentificaties gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:404
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2404,7 +2452,33 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
+"\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
+"\n"
+
+#: g10/keyedit.c:616
 #, fuzzy
 msgid ""
 "\n"
@@ -2413,7 +2487,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 #, fuzzy
 msgid ""
 "\n"
@@ -2422,52 +2496,52 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2475,7 +2549,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2483,566 +2557,591 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "beëindig dit menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "opslaan en beëindigen"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "nrsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrlsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 #, fuzzy
 msgid "add a photo ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "revkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "voeg een secundaire sleutel toe"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "set preference list"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updated preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Beëindigen zonder te bewaren? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1740
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+msgid "This key may be revoked by %s key "
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Geef de sleutelgrootte"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal één secundaire sleutel.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3051,7 +3150,7 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3060,244 +3159,252 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "%s ondertekening van: %s\n"
+
+#: g10/keylist.c:93
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Aantekening: "
+
+#: g10/keylist.c:129
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Aantekening: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Vingerafdruk:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "            Vingerafdruk:"
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s versleutelde gegevens\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "versleuteld met onbekend algoritme %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s versleutelde gegevens\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -3315,31 +3422,46 @@ msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "LET OP: `%s' is een leeg bestand\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "LET OP: `%s' is een leeg bestand\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -3485,34 +3607,39 @@ msgstr "geen ondertekende gegevens\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonieme ontvanger; ik probeer geheime sleutel %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okee, wij zijn de anonieme ontvanger.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "oude codering van de DEK wordt niet ondersteund.\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: geheime sleutel %08lX is vervallen op %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "sleutel %08lx: sleutel is teruggeroepen!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, fuzzy, c-format
@@ -3539,12 +3666,16 @@ msgstr "versturen naar `%s' gelukt (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kan de sleutel niet opvragen van de server: %s\n"
@@ -3605,45 +3736,55 @@ msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "ontsleuteling mislukte: %s\n"
@@ -3876,28 +4017,28 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met nep-"
 "RNG!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' overgeslagen: dubbel\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "overgeslagen: geheime sleutel is al aanwezig\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4096,16 +4237,23 @@ msgstr ""
 "ondertekeningen die ermee gemaakt zijn, zijn behoorlijk groot en traag\n"
 "te verifiëren."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Geef de sleutelgrootte"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Antwoord met \"ja\" of \"nee\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4117,19 +4265,19 @@ msgstr ""
 "dan geen goede foutafhandeling krijgen, inplaats daarvan zal het\n"
 "systeem deze waarde proberen te interpreteren als een interval."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Geef de naam van de eigenaar van de sleutel"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "geef a.u.b. een optioneel maar aan te raden e-mail adres."
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Geef eventueel een kanttekening"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4143,11 +4291,11 @@ msgstr ""
 "O  om door te gaan met de sleutelgeneratie.\n"
 "Q  om te stoppen met de sleutelgeneratie."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Antwoord met \"ja\" (of alleen \"j\") om een subsleutel aan te maken."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4188,11 +4336,11 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Antwoord met \"ja\" als u ALLE gebruikersidentificaties wilt tekenen"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4200,11 +4348,11 @@ msgstr ""
 "Antwoord \"ja\" indien u deze gebruiker echt wilt verwijderen.\n"
 "Alle certificaten gaan dan ook verloren!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Antwoord met \"ja\" als het goed is om de subsleutel te verwijderen"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4215,7 +4363,7 @@ msgstr ""
 "relatie met deze of een andere sleutel verstoort, die getekend is met\n"
 "deze sleutel."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4228,7 +4376,7 @@ msgstr ""
 "ondertekenen met deze sleutel misschien een vertrouwensband kan\n"
 "scheppen met een andere, al getekende, sleutel."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4236,7 +4384,7 @@ msgstr ""
 "De ondertekening is ongeldig.  Het is zinnig om deze uit de sleutelbos\n"
 "te verwijderen."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4250,35 +4398,35 @@ msgstr ""
 "hierna te gebruiken. Dus doe dit alleen als de zelfondertekening om de\n"
 "een of andere reden niet geldig is, en een tweede beschikbaar is."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "Geef a.u.b. een sleuteltekst; dit is een geheime zin\n"
 "  blabla, blablabla, ..."
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Herhaal a.u.b. de voorgaande sleuteltekst, zodat u zeker weet wat u ingetypt "
 "heeft."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Geef de naam van het bestand waaraan de ondertekening toebehoort"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Antwoord \"ja\" als het goed is om het bestand te overschrijven"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4286,7 +4434,7 @@ msgstr ""
 "Geef a.u.b. een nieuwe bestansnaam. Als u op RETURN drukt, wordt de\n"
 "standaard bestandsnaam (tussen blokhaken weergegeven) gebruikt."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4302,18 +4450,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Geen hulp beschikbaar"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
@@ -4376,6 +4524,18 @@ msgstr "sleutels en ondertekeningen opnoemen"
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "het eerste teken van een notitienaam moet een letter of laag liggend "
+#~ "steepje zijn\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
@@ -4637,10 +4797,6 @@ msgstr "%s: sleutelbos aangemaakt\n"
 #~ msgid "failed to put '%s' into trustdb: %s\n"
 #~ msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
 
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr ""
 #~ "Wilt u echt een sleutel maken om mee te ondertekenen en versleutelen? "
@@ -4667,10 +4823,6 @@ msgstr "%s: sleutelbos aangemaakt\n"
 #~ msgid "invalid"
 #~ msgstr "ongeldige versleuteling"
 
-#, fuzzy
-#~ msgid "revoked"
-#~ msgstr "revkey"
-
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
 
diff --git a/po/pl.po b/po/pl.po
index 1465feeed..6546ed49d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.6\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-28 02:44+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "wyj¶cie"
 
@@ -282,7 +282,7 @@ msgstr "... to jest b³±d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
@@ -350,7 +350,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ¡ SIÊ DO \n"
 "NORMALNEGO U¯YTKU I NIE ZAPEWNIAJ¡ BEZPIECZEÑSTWA!!\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -362,7 +362,7 @@ msgstr ""
 "Proszê kontynuowaæ inne dzia³ania aby system móg³ zebraæ odpowiedni±\n"
 "ilo¶æ entropii do ich wygenerowania (brakuje %d bajtów).\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -370,167 +370,167 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z³o¿enie podpisu"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "z³o¿enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[pliki]|szyfrowanie plików"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "tylko zapis danych w formacie OpenPGP"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy¶lnie)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[pliki]|odszyfrowywanie plików"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "sprawdzenie podpisów kluczy"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "z³o¿enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr ""
 "z³o¿enie na kluczu podpisu nie podlegaj±cego \n"
 "uniewa¿nieniu"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "z³o¿enie na kluczu podpisu prywatnego,\n"
 "nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa¿nienia klucza"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "od¶wie¿enie kluczy z serwera"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "import/do³±czenie kluczy"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietów"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "eksport warto¶ci zaufania"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "wczytanie warto¶æi zaufania"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "automatyczne uaktualnienie bazy zaufania"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "zdjêcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skróty wiadomo¶ci"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -540,196 +540,192 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "domy¶lny klucz jest domy¶lnym adresatem"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "plik wyj¶ciowy"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatóww"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "bez odwo³añ do terminala"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "bez wymuszania trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "wymuszenie czwartej wersji formatu podpisów"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "bez wymuszania czwartej wersji formatu podpisów"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania bêdzie u¿ywany MDC"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "do szyfrowania nie zostanie u¿yty MDC"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "wykorzystanie gpg-agenta"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: ¿adnych pytañ"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "dodaæ zbiór kluczy do listy u¿ywanych"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "dodaæ zbiór kluczy tajnych do listy"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "okazanie, w którym zbiorze kluczy znajduje siê dany klucz"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znaków terminala NAZWA"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaæ opis stanu do FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[plik]|zapisaæ opis stanu do pliku"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|klucz ca³kowicie zaufany"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tryb zgodno¶ci formatu pakietów, szyfrów i skrótów z OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tryb zgodno¶ci formatów, szyfrów i skrótów z PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb obliczania has³a"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm skrótu dla has³a ALG"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj±cy NAZWA"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "usuniêcie numerów kluczy adresatów z zaszyfrowanych pakietów"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "okazanie identyfikatora - zdjêcia u¿ytkownika"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "bez pokazywania zdjêæ"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "polecenie wywo³ania przegl±darki do zdjêæ"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAZWA=TRE¦Æ|adnotacje"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -737,7 +733,7 @@ msgstr ""
 "@\n"
 "(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -758,15 +754,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +772,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
 "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,266 +780,278 @@ msgstr ""
 "\n"
 "Obs³ugiwane algorytmy:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "wywo³anie: gpg [opcje]"
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "niezrozuma³y URI serwera kluczy\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "OSTRZE¯ENIE: '%s' jest przestarza³± opcj±.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "nale¿y u¿yæ opcji \"--keyserver-options %s\"\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u¿ywaæ %s z %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo¿na sk³adaæ tylko podpisy oddzielne lub do³±czone do "
 "tekstu\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo¿na jednocze¶nie szyfrowaæ i podpisywaæ\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo¶ci w trybie --pgp2 wymaga modu³u szyfru IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "tej wiadomo¶ci mo¿e nie daæ siê odczytaæ za pomoc± PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodziæ z zakresu %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew³a¶ciwy domy¶lny poziom sprawdzania; musi mieæ warto¶æ 0, 1 lub 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "niew³a¶ciwe ustawienia\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "niew³a¶ciwe ustawienia\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "niew³a¶ciwe ustawienia\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "niew³a¶ciwe ustawienia\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u¿ytkownika [polecenia]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo¿na otworzyæ ,%s'\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "adnotacja musi zaczynaæ siê od podkre¶lenia lub litery\n"
-
-#: g10/g10.c:2319
-msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi koñczyæ siê ,='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "kropki w adnotacji musz± znajdowaæ siê pomiêdzy innymi znakami\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1140,11 +1148,13 @@ msgid "User ID is no longer valid"
 msgstr "Identyfikator u¿ytkownika przesta³ byæ poprawny"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Powód uniewa¿nienia: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Komentarz do uniewa¿nienia: "
 
 #. a string with valid answers
@@ -1336,21 +1346,21 @@ msgstr ""
 "             Nie ma pewno¶ci co do to¿samo¶ci osoby która z³o¿y³a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pominiêty: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pominiêty: zosta³ ju¿ wybrany\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta³ podany identyfikatora u¿ytkownika (np za pomoc± ,,-r'')\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1358,120 +1368,130 @@ msgstr ""
 "\n"
 "Identyfikator u¿ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u¿ytkownika.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pominiêty: klucz publiczny ju¿ jest domy¶lnym adresatem\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy³±czony z uzycia.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "pominiêty: zosta³ ju¿ wybrany\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy¶lny adresat '%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ycia\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresatów\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "ustawienie %c%lu jest niepoprawne\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "ustawienie %c%lu powtarza siê\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "zbyt wiele `%c' ustawieñ\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "niew³a¶ciwy znak w tek¶cie ustawieñ\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "zapis podpisu klucza nim samym\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi±¿±cego klucz\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew³a¶ciwa d³ugo¶æ klucza; wykorzystano %u bitów\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr±glony do %u bitów\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszê wybraæ rodzaj klucza:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytmów DSA i ElGamala (domy¶lne)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "U¿ywanie tego algorytmu jest odradzane - tworzyæ mimo to? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Niew³a¶ciwy wybór.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1484,20 +1504,20 @@ msgstr ""
 "               domy¶lny rozmiar klucza wynosi 1024 bity\n"
 "  najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
 
@@ -1509,12 +1529,12 @@ msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1522,11 +1542,11 @@ msgstr ""
 "Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n"
 "trwaj± wtedy BARDZO d³ugo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1534,17 +1554,17 @@ msgstr ""
 "Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n"
 "komputera przez pods³uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1560,7 +1580,7 @@ msgstr ""
 "      <n>m = termin wa¿no¶ci klucza up³ywa za n miesiêcy\n"
 "      <n>y = termin wa¿no¶ci klucza up³ywa za n lat\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1576,30 +1596,30 @@ msgstr ""
 "      <n>m = termin wa¿no¶ci podpisu up³ywa za n miesiêcy\n"
 "      <n>y = termin wa¿no¶ci podpisu up³ywa za n lat\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Okres wa¿no¶ci klucza ? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Okres wa¿no¶ci podpisu? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "niepoprawna warto¶æ\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nie ma daty wa¿no¶ci (nie traci wa¿no¶ci z up³ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s traci wa¿no¶æ: %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1607,11 +1627,11 @@ msgstr ""
 "Twój system nie potrafi pokazaæ daty po roku 2038.\n"
 "Niemniej daty do roku 2106 bêd± poprawnie obs³ugiwane.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1627,44 +1647,44 @@ msgstr ""
 "    \"Tadeusz ¯eleñski (Boy) <tzb@domena.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Imiê i nazwisko: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imiê i nazwisko musz± mieæ conajmniej 5 znaków d³ugo¶ci.\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Niew³a¶ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U¿ywasz zestawu znaków %s.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1675,49 +1695,49 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszczaæ adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "czy (W)yj¶æ? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej¶æ (D)alej czy (W)yj¶æ z programu ? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawiæ ten b³±d\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz podaæ d³ugie, skomplikowane has³o aby ochroniæ swój klucz tajny.\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1729,7 +1749,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1743,53 +1763,53 @@ msgstr ""
 "generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci "
 "entropii.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta³a anulowana.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujê klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujê klucz tajny w '%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b³±d podczas zapisu zbioru kluczy publicznych `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b³±d podczas zapisu zbioru kluczy tajnych `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta³y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "klucz zosta³ oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1797,12 +1817,12 @@ msgstr ""
 "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\"\n"
 "mo¿na dodaæ do niego podklucz u¿ywany do szyfrowania.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod³a siê: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1810,7 +1830,7 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1818,87 +1838,97 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Na pewno utworzyæ? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia³a z tym poleceniem\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ju¿ jest spakowany\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo¿na otworzyæ: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b³±d podczas tworzenia has³a: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE¯ENIE: plik jest pusty\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo¿na szyfrowaæ dla kluczy RSA krótszych od 2048 bitów\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nie mo¿na u¿yæ szyfru IDEA z wszystkimi kluczami dla których szyfrujesz.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "klucz `%s' nie zosta³ odaleziony: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b³±d odczytu bloku kluczy: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominiêty\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pominiêty\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pominiêty\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n"
 
@@ -1908,23 +1938,23 @@ msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wy³±czony\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u¿ytkownika]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Niepoprawny klucz %08lX uznany za poprawny przez --allow non-selfsigned-"
 "uid.\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominiêty\n"
@@ -2004,180 +2034,185 @@ msgstr "     tajnych kluczy dodanych: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "klucz %08lX: przyjêto identyfikator nie podpisany nim samym '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo¿e byæ spowodowane brakiem podpisu w³a¶ciciela klucza\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pominiêty\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b³±d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza siê z lokalnie posiadan± kopi±\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo¿na odczytaæ oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u¿ytkownika\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikatorów u¿ytkownika\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpisów\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy¶lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju¿ znajduje siê w zbiorze\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa¿nienia nie mo¿e byæ zastosowany\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - odrzucony\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa¿nienia\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "klucz %08lX: algorytm klucza publicznego \"%s\" nie jest obs³ugiwany\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi±zania\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obs³ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pominiêto identyfikator u¿ytkownika '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pominiêty\n"
@@ -2186,113 +2221,133 @@ msgstr "klucz %08lX: podklucz pominiêty\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominiêty\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa¿nienia umieszczony w niew³a¶ciwym \n"
 "miejscu - zosta³ pominiêty\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - pominiêty\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powtórzony identyfikator u¿ytkownika - do³±czony\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Ostrze¿enie: klucz %08lX móg³ zostaæ uniewazniony:\n"
 "             zapytanie o uniewa¿niaj±cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Ostrze¿enie: klucz %08lX móg³ zostaæ uniewa¿niony:\n"
 "             brak uniewa¿niaj±cego klucza %08lX.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa¿nienia\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo¶redni podpis\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[uniewa¿nienie]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpisów\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta³ sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisów nie zosta³o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta³ sprawdzony z powodu b³êdu\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisów nie sprawdzonych z powodu b³êdów\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u¿ytkownika bez podpisu w³a¶ciciela klucza\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikatorów u¿ytkownika bez podpisów w³a¶ciciela klucza\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u¿ytkownika \"%s\" zosta³ uniewa¿niony."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisaæ? (t/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr " Nie da siê z³o¿yæ podpisu.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Twój podpis na \"%s\"\n"
+"jest podpisem prywatnym (lokalnym).\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Czy chcesz zamieniæ go na pe³ny, publiczny, eksportowalny podpis? (t/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2301,51 +2356,51 @@ msgstr ""
 "Twój podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieniæ go na pe³ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" jest ju¿ lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" jest ju¿ podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Data wa¿no¶ci tego klucza up³ynê³a!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa¿no¶æ tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz ¿eby wa¿no¶æ Twojego podpisu wygasa³a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "W trybie --pgp2 nie mo¿na podpisywaæ w formacie OpenPGP.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2354,27 +2409,27 @@ msgstr ""
 "Jak dok³adnie zosta³a przez Ciebie sprawdzona to¿samo¶æ tej osoby?\n"
 "Je¶li nie wiesz co odpowiedzieæ, podaj \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W ogóle nie.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie¿nie.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok³adnie.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2382,7 +2437,32 @@ msgstr ""
 "Czy jeste¶ naprawdê pewien ¿e chcesz podpisaæ ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "to mo¿e byæ spowodowane brakiem podpisu w³a¶ciciela klucza\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Podpis zostanie oznaczony jako nie podlegaj±cy uniewa¿nieniu.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2390,7 +2470,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2398,7 +2478,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj±cy uniewa¿nieniu.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2406,7 +2486,7 @@ msgstr ""
 "\n"
 "To¿samo¶æ u¿ytkownika nie zosta³a w ogóle sprawdzona.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2414,7 +2494,7 @@ msgstr ""
 "\n"
 "To¿samo¶æ u¿ytkownika zosta³a sprawdzona pobie¿nie.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2422,33 +2502,33 @@ msgstr ""
 "\n"
 "To¿samo¶æ u¿ytkownika zosta³a dok³adnie sprawdzona.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Czy na pewno podpisaæ? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Czê¶æ tajna g³ównego klucza jest niedostêpna.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo¿na edytowaæ: %s.\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2456,7 +2536,7 @@ msgstr ""
 "Wprowad¼ nowe d³ugie has³o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2464,473 +2544,471 @@ msgstr ""
 "Nie chcesz has³a - to *z³y* pomys³!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobiæ? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "wyj¶cie z tego menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "zapis zmian i wyj¶cie"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikatorów u¿ytkowników"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "wybór identyfikatora u¿ytkownika N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "wybór podklucza N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "lista podpisów"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "z³o¿enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nupodpis"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nulpodpis"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "z³o¿enie na kluczu lokalnego podpisu nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "¶ledzenia"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "dodfoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "dodanie zdjêcia u¿ytkownika do klucza"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "usuniêcie identyfikatora u¿ytkownika z klucza"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "usfoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "usuniêcie podklucza"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "uniewa¿niony"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "dodanie podklucza"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "usuniêcie podpisów"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "zmiana daty wa¿no¶ci klucza"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "g³ówny"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "oznaczenie identyfikatora u¿ytkownika jako g³ównego"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "prze³"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawieñ"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "ustaw"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "aktopc"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "aktualizacja ustawieñ klucza"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "has³o"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "zmiana has³a klucza"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w³a¶ciciela"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "uniewa¿nienie podpisu"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "uniewa¿nienie podklucza"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "wy³kl"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "wy³±czyæ klucz z u¿ycia"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "w³kl"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "w³±czyæ klucz do u¿ycia"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "foto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdjêcia"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia³a w trybie wsadowym\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "b³±d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Dostêpny jest klucz tajny.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Klucz uniewa¿niony."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dostêpne w trybie %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybraæ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun±æ wybrane klucze? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun±æ ten klucz? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Czy na pewno zaktualizowaæ ustawienia klucza dla wybranych identyfikatorów? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Czy na pewno usaktualniæ ustawienia? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Zapisaæ zmiany? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Wyj¶æ bez zapisania zmian? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta³ zmieniony wiêc naniesienie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spróbuj \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s %s%s.\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  utworzony: %s, wa¿ny do: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta³ wy³±czony z u¿ytku"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta³ uniewa¿niony: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "fa³szywy certyfikat uniewa¿nienia\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa¿nienia: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna dopóki program "
 "nie\n"
 "zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"OSTRZE¯ENIE: Do tego klucza dodano ju¿ zdjêcie u¿ytkownika.\n"
-"             Dodanie drugiego spowoduje, ¿e niektóre wersje PGP przestan±\n"
-"             rozumieæ ten klucz.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Czy dalej chcesz je dodaæ? (t/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Do klucza mo¿na do³±czyæ tylko jedno zdjêcie.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2940,83 +3018,108 @@ msgstr ""
 "niektóre \n"
 "             wersje przestan± go rozumieæ.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Czy dalej chcesz je dodaæ? (t/N) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla wersji 2 PGP nie mo¿na dodaæ zdjêcia.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun±æ ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun±æ ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuniêty.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpisów usuniêtych.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta³o usuniête.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Wprowad¼ rozmiar klucza"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Proszê usun±æ znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Proszê wybraæ tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "Identyfikator u¿ytkownika: "
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3025,7 +3128,7 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3034,235 +3137,243 @@ msgstr ""
 "\"\n"
 "lokalnie podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u¿ytkowników s± podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa¿niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "podpisany przez %08lX w %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Zdjêcie w formacie %s, rozmiar %ld bajtów, klucz 0x%08lX (id %d).\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Regulamin podpisu: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Adnotacje podpisu: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "nieczytelne dla cz³owieka"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Zbiór kluczy"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Odcisk klucza:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc± %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "Zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj±c ¿e dane zosta³y zaszyfrowane za pomoc± %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dostêpny, %s zostanie wykorzystany zamiast niego\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE¯ENIE: zaszyfrowana wiadomo¶æ by³a manipulowana!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa¿nienia - u¿yj ,,gpg --import'' aby go przyj±æ\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Adnotacja: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Regulamin: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominiêcie sprawdzenia podpisu\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo¿na obs³uzyæ tych wielokrotnych podpisów\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Przeterminowany podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Poprawny podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo¿na sprawdziæ podpisu: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -3280,31 +3391,46 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "u¿ywanie tego szyfru jest odradzane; nale¿y u¿ywaæ standardowych szyfrów!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Ostrze¿enie: niebezpieczne prawa w³asno¶ci do %s \"%s\".\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ostrze¿enie: niebezpieczne prawa dostêpu do %s \"%s\".\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu³ szyfru IDEA nie jest dostêpny\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "wiêcej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "OSTRZE¯ENIE: '%s' jest przestarza³± opcj±.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "OSTRZE¯ENIE: '%s' jest przestarza³± opcj±.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "nale¿y u¿yæ opcji \"--keyserver-options %s\"\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo¿na obs³u¿yæ tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -3446,34 +3572,39 @@ msgstr "brak podpisanych danych\n"
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo¿na otworzyæ podpisanego pliku '%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste¶my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs³ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfruj±cy %d%s jest nieznany, b±d¼ te¿ zosta³ wy³±czony\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "UWAGA: wa¿no¶æ klucza tajnego %08lX wygas³a %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "klucz %08lX: klucz zosta³ uniewa¿niony!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3500,12 +3631,16 @@ msgstr "wysy³anie do '%s' powiod³o siê (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "wysy³anie do '%s' nie powiod³o siê (status=%u)\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "zapytanie o \"%s\" w serwerze HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nie mo¿na przeszukaæ serwera: %s\n"
@@ -3565,46 +3700,58 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyjêto niewa¿no¶æ podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"OSTRZE¯ENIE: nie mo¿na rozkodowaæ urla regulaminu, pozostanie zakodowany.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 "OSTRZE¯ENIE: nie mo¿na rozkodowaæ urla regulaminu, pozostanie zakodowany.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z³o¿onego podpisu nie powiod³o siê: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z³o¿ony przez: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE¯ENIE: plik '%s' jest pusty\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo¿na podpisywaæ tylko za pomoc± kluczy z wersji 2.x\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mo¿na utworzyæ %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo¿na podpisywaæ tylko za pomoc± kluczy z wersji 2.x\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u¿yty szyfr %s\n"
@@ -3835,27 +3982,27 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej¶cia %u zbyt d³uga lub brak znaku LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap± \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "pominiêty '%s': duplikat\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pominiêty '%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "pominiêty: klucz tajny ju¿ znajduje siê w bazie\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4056,16 +4203,23 @@ msgstr ""
 "gdy¿ nie jest obs³ugiwany przez wszystkie programy, a podpisy nim\n"
 "sk³adane s± du¿e i ich sprawdzanie trwa d³ugo."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Wprowad¼ rozmiar klucza"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpowied¼ \"tak\" lub \"nie\"."
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4077,20 +4231,20 @@ msgstr ""
 "w³a¶ciwej obs³ugi b³êdów - system próbuje interpretowaæ podan± warto¶æ\n"
 "jako okres."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Nazwa w³a¶ciciela klucza."
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "proszê wprowadziæ opcjonalny ale wysoce doradzany adres e-mail"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Proszê wprowadziæ opcjonalny komentarz"
 
 # OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4104,11 +4258,11 @@ msgstr ""
 "O aby kontynuowaæ tworzenie klucza.\n"
 "Q aby zrezygnowaæ z tworzenia klucza."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Je¶li ma zostaæ wygenerowany podklucz, nale¿y odpowiedzieæ \"tak\"."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4179,11 +4333,11 @@ msgstr ""
 "\n"
 "Je¶li nie wiesz co odpowiedzieæ, podaj \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Odpowiedz \"tak\", aby podpisaæ WSZYSTKIE identyfikatory u¿ytkownika."
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4191,11 +4345,11 @@ msgstr ""
 "Aby skasowaæ ten identyfikator u¿ytkownika (co wi±¿e siê ze utrat±\n"
 "wszystkich jego po¶wiadczeñ!) nale¿y odpowiedzieæ \"tak\"."
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Aby skasowaæ podklucz nale¿y odpowiedzieæ \"tak\"."
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4205,7 +4359,7 @@ msgstr ""
 "poniewa¿ mo¿e byæ wa¿ny dla zestawienia po³aczenia zaufania do klucza\n"
 "którym go z³o¿ono lub do innego klucza nim po¶wiadczonego."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4218,13 +4372,13 @@ msgstr ""
 "w momencie uzyskania tego klucza mo¿e pojawiæ siê ¶cie¿ka zaufania\n"
 "pomiêdzy tym a innym, ju¿ po¶wiadczonym kluczem."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ten podpis jest niepoprawny. Mo¿na usuni±æ go z bazy kluczy."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4238,7 +4392,7 @@ msgstr ""
 "klucza nim samym z jakich¶ przyczyn nie jest poprawny, i klucz jest\n"
 "drugi raz podpisany w ten sam sposób."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4248,30 +4402,30 @@ msgstr ""
 "ustawienia. Data na odpowiednich podpisach zostane przesuniêta do przodu o\n"
 "jedn± sekundê. \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Podaj d³ugie, skomplikowane has³o, np ca³e zdanie.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Proszê powrótrzyæ has³o, aby upewniæ siê ¿e nie by³o pomy³ki."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazwê pliku którego dotyczy ten podpis"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Je¶li mo¿na nadpisaæ ten plik, nale¿y odpowiedzieæ ,,tak''"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 "Nazwa pliku. Naci¶niêcie ENTER potwierdzi nazwê domy¶ln± (w nawiasach)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4298,7 +4452,7 @@ msgstr ""
 "      Identyfikator u¿ytkownika (najczê¶ciej adres e-mail przesta³ byæ \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4308,11 +4462,11 @@ msgstr ""
 "uniewa¿nienia. Opis powinien byc zwiêz³y. \n"
 "Pusta linia koñczy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Pomoc niedostêpna"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
@@ -4375,6 +4529,28 @@ msgstr "%lu kluczy (%lu podpisów)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAZWA=TRE¦Æ|adnotacje"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "adnotacja musi zaczynaæ siê od podkre¶lenia lub litery\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "kropki w adnotacji musz± znajdowaæ siê pomiêdzy innymi znakami\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "OSTRZE¯ENIE: Do tego klucza dodano ju¿ zdjêcie u¿ytkownika.\n"
+#~ "             Dodanie drugiego spowoduje, ¿e niektóre wersje PGP "
+#~ "przestan±\n"
+#~ "             rozumieæ ten klucz.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Do klucza mo¿na do³±czyæ tylko jedno zdjêcie.\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Czy na pewno chcesz to podpisaæ?\n"
 
@@ -4475,9 +4651,6 @@ msgstr "%s: zbiór kluczy utworzony\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: b³±d podczas sprawdzania klucza: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Czy na pewno chcesz stworzyæ klucz do szyfrowania i podpisywania? "
 
@@ -4670,9 +4843,6 @@ msgstr "%s: zbiór kluczy utworzony\n"
 #~ msgid "invalid"
 #~ msgstr "niepoprawny"
 
-#~ msgid "revoked"
-#~ msgstr "uniewa¿niony"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"
 
diff --git a/po/pt.po b/po/pt.po
index a0e82191a..b45532ee4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-03-05 16:05+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -48,7 +48,7 @@ msgstr "não"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "sair"
 
@@ -275,7 +275,7 @@ msgstr "... isto é um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -341,7 +341,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +352,7 @@ msgstr ""
 "Não há bytes aleatórios suficientes. Por favor, faça outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (São necessários mais %d bytes)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra simétrica"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "decifrar dados (acção por omissão)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|decifrar ficheiros"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave de forma não revocável"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente e de forma não revocável"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequências de pacotes"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "actualizar automaticamente a base de dados de confiança"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confiança"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,214 +526,210 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omissão como destinatário por omissão"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "não forçar assinaturas v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "forçar assinaturas v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "não forçar assinaturas v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "nunca usar um MDC para cifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "utilizar o gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto à lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "ler opções do ficheiro"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escrever ifnroamções de estado para o ficheiro"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opções de pacote, cifragem e \"digest\"\n"
 "para comportamento OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "configurar todas as opções de pacote, cifragem e \"digest\"\n"
 "para comportamento PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes cifrados"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Mostrar IDs Fotográficos"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Não mostrar IDs Fotográficos"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Configurar linha de comandos para ver fotografias"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOME=VALOR|usar estes dados de notação"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -741,7 +737,7 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -761,15 +757,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -779,7 +775,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -787,267 +783,276 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opções `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVISO: `%s' é um ficheiro vazio\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "só pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "não pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e não um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "esta mensagem poderá não ser utilizável pelo PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado não é válido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "a URL de política de assinatura dada é inválida\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "a URL de política de certificação dada é inválida\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "preferências inválidas\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "preferências inválidas\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferências inválidas\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "preferências inválidas\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"o primeiro caracter de um nome de notação deve ser uma letra ou um "
-"sublinhado\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"pontos num nome de notação devem estar cercados por outros caracteres\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "a URL de política de certificação dada é inválida\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "a URL de política de assinatura dada é inválida\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1144,11 +1149,13 @@ msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador já não é válido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Motivo da revocação: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Comentário da revocação: "
 
 #. a string with valid answers
@@ -1342,21 +1349,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Não especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1364,121 +1371,131 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "preferência %c%lu não é válida\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "caracter inválido na cadeia de caractéres\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escrevendo auto-assinatura\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "A utilização destes algoritmos está desactualizada - criar na mesma?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1491,19 +1508,19 @@ msgstr ""
 "         tamanho por omissão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 1024 é o valor mínimo permitido para RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
@@ -1515,12 +1532,12 @@ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1528,11 +1545,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1540,17 +1557,17 @@ msgstr ""
 "Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado também "
 "é extremamente vulnerável a ataques!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1566,7 +1583,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1582,30 +1599,30 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "A assinatura é valida por? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1613,11 +1630,11 @@ msgstr ""
 "O seu sistema não consegue mostrar datas para além de 2038.\n"
 "No entanto, estas vão ser tratadas correctamente até 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1634,44 +1651,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1682,29 +1699,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor não coloque o endereço de email no nome verdadeiro ou no "
 "comentário\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1712,16 +1729,16 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1733,7 +1750,7 @@ msgstr ""
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1745,53 +1762,53 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma hipótese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "chave marcada como de confiança absoluta\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1799,12 +1816,12 @@ msgstr ""
 "Note que esta chave não pode ser usada para cifragem. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1812,7 +1829,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1820,86 +1837,96 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a criação de sub-chave para chaves v3 não respeito o OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output não funciona para este comando\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossível abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "no modo --pgp2 só pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossível utilizar a cifra IDEA para todas as chaves para que está a "
 "cifrar.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: não está protegida - ignorada\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1909,21 +1936,21 @@ msgstr "entradas demais no cache pk - desactivado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Utilizador não encontrado]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inválida %08lX tornada válida por --always-trust\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
@@ -2003,179 +2030,184 @@ msgstr "  chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas não modificadas: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "chave %08lX: ligação de subchave inválida\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: não modificada\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves público por omissão: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no porta-chaves secreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta não encontrada: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogação\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogação importado\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -2184,106 +2216,125 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação adicionado\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura não verificada por falta de chave\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas não verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura não verificada devido a um erro\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas não verificadas devido a erros\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura válida detectado\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas válidas detectados\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identificador do utilizador \"%s\" está revocado.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"A sua assinatura actual em \"%s\"\n"
+"é uma assinatura local.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Quer promovê-la a uma assinatura exportável? "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2292,51 +2343,51 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promovê-la a uma assinatura exportável? "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" já foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" já foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "só pode assinar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "esta mensagem poderá não ser utilizável pelo PGP 2.x\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2346,27 +2397,27 @@ msgstr ""
 "pertence\n"
 "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Não vou responder.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Não verifiquei.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2374,7 +2425,32 @@ msgstr ""
 "Você tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "isto pode ser causado por falta de auto-assinatura\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"A assinatura será marcada como não-exportável.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"A assinatura será marcada como não-revocável.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2382,7 +2458,7 @@ msgstr ""
 "\n"
 "A assinatura será marcada como não-exportável.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2390,7 +2466,7 @@ msgstr ""
 "\n"
 "A assinatura será marcada como não-revocável.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2398,7 +2474,7 @@ msgstr ""
 "\n"
 "Não verifiquei esta chave.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2406,7 +2482,7 @@ msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2414,33 +2490,33 @@ msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossível editar esta chave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2448,7 +2524,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2456,470 +2532,467 @@ msgstr ""
 "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Você quer realmente fazer isso? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma não-revogável"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma não revogável"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotográfico"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "adiciona nova chave secundária"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como primário"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "lista preferências (perito)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "lista preferências (detalhadamente)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "configurar lista de preferências"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "preferências actualizadas"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "mostrar identificador fotográfico"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave está revogada.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Você quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Realmente actualizar as preferências para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Realmente actualizar as preferências?"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode ser revogada pela chave %s %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- revogação falsa encontrada\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
-"AVISO: Esta chave já tem um identificador fotográfico.\n"
-"       Se adicionar outro pode confundir algumas versão do PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/n) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Só pode ter um identificador fotográfico por chave.\n"
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2928,84 +3001,110 @@ msgstr ""
 "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n"
 "       algumas versão do PGP podem rejeitá-la.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/n) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Insira o tamanho da chave"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selecções das chaves secretas.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "chave %08lX: auto-assinatura inválida\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3014,7 +3113,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3023,237 +3122,245 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Politica de assinatura: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notação da assinatura: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notação da assinatura: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "não é legível por humanos"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Porta-chaves"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "  Impressão da chave ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO não disponível, a tentar utilizar %s em substituição\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "não consigo tratar estas assinaturas múltiplas\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
@@ -3272,31 +3379,46 @@ msgstr ""
 "este algoritmo de criptografia está desctualizado; por favor use um "
 "algoritmo mais standard!x\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA não está presente\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "veja http://www.gnupg.org/why-not-idea.html para mais informações\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVISO: `%s' é um ficheiro vazio\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: `%s' é um ficheiro vazio\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -3439,34 +3561,39 @@ msgstr "não há dados assinados\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatário anónimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anónimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifra %d%s é desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "chave %08lX: a chave foi revogada!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3493,12 +3620,16 @@ msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "erro ao enviar para `%s': estado=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "não consigo procurar no servidor de chaves: %s\n"
@@ -3555,7 +3686,14 @@ msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
+"A utilizar não expandida.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3563,39 +3701,45 @@ msgstr ""
 "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
 "A utilizar não expandida.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um ficheiro vazio\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "só pode assinar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "só pode assinar à vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "será utilizada a cifragem %s\n"
@@ -3828,26 +3972,26 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4047,16 +4191,23 @@ msgstr ""
 "porque não são suportadas por todos os programas e assinaturas criadas com\n"
 "elas são grandes e sua verificação é lenta."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Insira o tamanho da chave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"não\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4068,19 +4219,19 @@ msgstr ""
 "reacção a erros - o sistema tentará interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endereço de email (opcional mas recomendado)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um comentário (opcional)"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4094,11 +4245,11 @@ msgstr ""
 "O  para continuar a geração da chave.\n"
 "S  para interromper a geração da chave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4170,11 +4321,11 @@ msgstr ""
 "\n"
 "Se não sabe qual é a resposta correcta, responda \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4182,11 +4333,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
 "Todos os certificados também serão perdidos!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4196,7 +4347,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conexão de confiança à chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4208,13 +4359,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conexão de confiança\n"
 "através de outra chave já certificada."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura não é válida. Faz sentido removê-la do seu porta-chaves."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4227,7 +4378,7 @@ msgstr ""
 "não consiga mais usar esta chave. Faça isto apenas se por alguma\n"
 "razão esta auto-assinatura não for válida e há uma segunda disponível."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -4239,23 +4390,23 @@ msgstr ""
 "O 'timestamp' de todas as auto-assinaturas afectuadas será avançado\n"
 "em um segundo.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Dê o nome para o ficheiro ao qual a assinatura se aplica"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4264,7 +4415,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omissão (que é mostrado entre parênteses) será utilizado."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4293,7 +4444,7 @@ msgstr ""
 "     não deve ser mais utilizado; normalmente utilizada para indicar\n"
 "     que um endereço de email é inválido.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4303,11 +4454,11 @@ msgstr ""
 "este certificado de revogação. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
@@ -4370,6 +4521,29 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOME=VALOR|usar estes dados de notação"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "o primeiro caracter de um nome de notação deve ser uma letra ou um "
+#~ "sublinhado\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "pontos num nome de notação devem estar cercados por outros caracteres\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "AVISO: Esta chave já tem um identificador fotográfico.\n"
+#~ "       Se adicionar outro pode confundir algumas versão do PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Só pode ter um identificador fotográfico por chave.\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Você tem certeza de que quer assiná-la?\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7f934a872..0a02d2b45 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -51,7 +51,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "sair"
 
@@ -282,7 +282,7 @@ msgstr "... isto é um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -347,7 +347,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -359,7 +359,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(São necessários mais %d bytes)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -367,175 +367,175 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "simétrica"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padrão)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro público"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seqüências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,166 +545,166 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usuário para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "usar como arquivo de saída"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "modo não-interativo: nunca perguntar"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro à lista de chaveiros"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto à lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padrão"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "ler opções do arquivo"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informações de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr ""
 "|DA|escrever informações de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opções de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
@@ -712,63 +712,59 @@ msgstr ""
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOME=VALOR|usar estes dados de notação"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -788,15 +784,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -806,7 +802,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a operação padrão depende dos dados de entrada\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -814,274 +810,282 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opções `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVISO: `%s' é um arquivo vazio\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1492
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "a URL de política dada é inválida\n"
-
-#: g10/g10.c:1496
+#: g10/g10.c:1613
 #, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "a URL de política dada é inválida\n"
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1651
 #, fuzzy
-msgid "invalid preferences\n"
+msgid "invalid default preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "lista preferências"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "lista preferências"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "lista preferências"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas não fica claro
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"o primeiro caractere de um nome de notação deve ser uma letra ou um "
-"sublinhado\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"pontos em um nome de notação devem estar cercados por outros caracteres\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
+#: g10/g10.c:2520
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "a URL de política dada é inválida\n"
+
+#: g10/g10.c:2522
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "a URL de política dada é inválida\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1180,12 +1184,14 @@ msgid "User ID is no longer valid"
 msgstr ""
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
-msgstr ""
+#, fuzzy
+msgid "reason for revocation: "
+msgstr "rev- revogações de chaves incorreta\n"
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
-msgstr ""
+#, fuzzy
+msgid "revocation comment: "
+msgstr "[revogação]"
 
 #. a string with valid answers
 #: g10/pkclist.c:252
@@ -1386,147 +1392,157 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Você não especificou um identificador de usuário. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Identificador de usuário inexistente.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já marcada como destinatário padrão\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatário padrão desconhecido `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desativada\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "Preferências demais"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escrevendo auto-assinatura\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padrão)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Sua opção? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1539,20 +1555,20 @@ msgstr ""
 "              tamanho padrão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave você quer? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
@@ -1564,12 +1580,12 @@ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1577,11 +1593,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1589,17 +1605,17 @@ msgstr ""
 "Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também "
 "é vulnerável a ataques!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1615,7 +1631,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1632,31 +1648,31 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1664,11 +1680,11 @@ msgstr ""
 "Seu sistema não consegue mostrar datas além de 2038.\n"
 "Apesar disso, elas serão corretamente manipuladas até 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1684,44 +1700,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Endereço de correio eletrônico: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrônico inválido\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Caractere inválido no comentário\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1732,28 +1748,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1761,17 +1777,17 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1783,7 +1799,7 @@ msgstr ""
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1795,54 +1811,54 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "impossível bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1850,12 +1866,12 @@ msgstr ""
 "Note que esta chave não pode ser usada para criptografia. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1863,7 +1879,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1871,84 +1887,94 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossível abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usuário `%s' não encontrado: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1958,22 +1984,22 @@ msgstr "entradas demais no cache pk - desativado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usuário não encontrado]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
@@ -2053,179 +2079,184 @@ msgstr "  chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas não modificadas: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "chave %08lX: ligação de subchave inválida\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usuário\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceito ID de usuário sem auto-assinatura '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usuários válidos\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "impossível escrever chaveiro: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usuário\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuários\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: não modificada\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "impossível bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no chaveiro secreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta não encontrada: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogação\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogação importado\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usuário para assinatura\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usuário '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -2234,184 +2265,200 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - ignorada\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usuário duplicado - unido\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação adicionado\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura não verificada por falta de chave\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas não verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura não verificada devido a um erro\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas não verificadas devido a erros\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usuário sem auto-assinatura válida detectado\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usuários sem auto-assinaturas válidas detectados\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:404
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Já assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Já assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2419,7 +2466,32 @@ msgstr ""
 "Você tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "isto pode ser causado por falta de auto-assinatura\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"A assinatura será marcada como não-exportável.\n"
+"\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"A assinatura será marcada como não-exportável.\n"
+"\n"
+
+#: g10/keyedit.c:616
 #, fuzzy
 msgid ""
 "\n"
@@ -2428,7 +2500,7 @@ msgstr ""
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 #, fuzzy
 msgid ""
 "\n"
@@ -2437,52 +2509,52 @@ msgstr ""
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta não disponível"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossível editar esta chave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2490,7 +2562,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2498,567 +2570,592 @@ msgstr ""
 "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Você realmente quer fazer isso? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usuários"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "seleciona ID de usuário N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "remove ID de usuário"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "revkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "adiciona nova chave secundária"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "set preference list"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usuário? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de usuário para assinar\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de usuário.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de usuário!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usuário? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Você realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Você realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Salvar alterações? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualização falhou: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma atualização é necessária.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1740
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+msgid "This key may be revoked by %s key "
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revogações de chaves incorreta\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Você tem certeza de que quer este tamanho de chave? "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Você tem certeza de que quer este tamanho de chave? "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Digite o tamanho da chave"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as seleções das chaves secretas.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de usuário.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "chave %08lX: auto-assinatura inválida\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usuário com índice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "ID de usuário: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3067,7 +3164,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3076,243 +3173,251 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Você assinou estes IDs de usuário:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Você está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "assinatura %s de: %s\n"
+
+#: g10/keylist.c:93
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notação: "
+
+#: g10/keylist.c:129
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Notação: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "       Impressão digital:"
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revogação isolada - use \"gpg --import\" para aplicá-la\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
@@ -3332,31 +3437,46 @@ msgstr ""
 "este algoritmo de criptografia é depreciado; por favor use algum\n"
 "algoritmo padrão!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVISO: `%s' é um arquivo vazio\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: `%s' é um arquivo vazio\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -3502,34 +3622,39 @@ msgstr "no dados assinados\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatário anônimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anônimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de proteção %d não é suportado\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "chave %08lX: a chave foi revogada!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, fuzzy, c-format
@@ -3556,12 +3681,16 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
@@ -3620,45 +3749,55 @@ msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -3890,28 +4029,28 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave não está marcada como insegura - impossível usá-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4110,16 +4249,23 @@ msgstr ""
 "porque não são suportadas por todos os programas e assinaturas criadas com\n"
 "elas são grandes e sua verificação é lenta."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Digite o tamanho da chave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"não\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4131,19 +4277,19 @@ msgstr ""
 "reação a erros - o sistema tentará interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endereço de email (opcional mas recomendado)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um comentário (opcional)"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4157,11 +4303,11 @@ msgstr ""
 "O  para continuar a geração da chave.\n"
 "S  para interromper a geração da chave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4202,11 +4348,11 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usuário"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4214,11 +4360,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de usuário.\n"
 "Todos os certificados também serão perdidos!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4228,7 +4374,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conexão de confiança à chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4240,13 +4386,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conexão de confiança\n"
 "através de outra chave já certificada."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura não é válida. Faz sentido removê-la de seu chaveiro."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4259,33 +4405,33 @@ msgstr ""
 "não consiga mais usar esta chave. Faça isto apenas se por alguma\n"
 "razão esta auto-assinatura não for válida e há uma segunda disponível."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor repita a última frase secreta, para ter certeza do que você "
 "digitou."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Dê o nome para o arquivo ao qual a assinatura se aplica"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4293,7 +4439,7 @@ msgstr ""
 "Por favor digite um novo nome de arquivo. Se você apenas apertar RETURN o\n"
 "arquivo padrão (que é mostrado em colchetes) será usado."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4309,18 +4455,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
@@ -4383,6 +4529,19 @@ msgstr "listar as chaves e as assinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOME=VALOR|usar estes dados de notação"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "o primeiro caractere de um nome de notação deve ser uma letra ou um "
+#~ "sublinhado\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "pontos em um nome de notação devem estar cercados por outros caracteres\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Você tem certeza de que quer este tamanho de chave? "
@@ -4640,10 +4799,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "failed to put '%s' into trustdb: %s\n"
 #~ msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr ""
 #~ "Você realmente quer criar uma chave para assinatura e criptografia? "
@@ -4674,10 +4829,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "invalid"
 #~ msgstr "armadura inválida"
 
-#, fuzzy
-#~ msgid "revoked"
-#~ msgstr "revkey"
-
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "chave RSA não pode ser usada nesta versão\n"
 
diff --git a/po/sv.po b/po/sv.po
index 0e2bc65bd..ff87321d0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2001-08-23 10:32+02:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "avsluta"
 
@@ -286,7 +286,7 @@ msgstr "... detta är ett fel i programmet (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "ANVÄND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -364,7 +364,7 @@ msgstr ""
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -372,170 +372,170 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normalläge)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "räkna upp nycklar"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "räkna upp nycklar och signaturer"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "räkna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "räkna upp hemliga nycklar"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "ta bort en nyckel från den publika nyckelringen"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "ta bort en nyckel från den hemliga nyckelringen"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "generera ett återkallelesecertifikat"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "exportera de värden som representerar ägartillit"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "importera värden som representerar ägartillit"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal för en fil eller standard in"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,203 +545,199 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att slå av kompression)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
 # syftar på ett användargränsnitt i ett separat program, till exempel gpa
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "använd gpg-agenten"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "batch-läge: fråga aldrig"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "anta att svaret är ja på de flesta frågor"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "anta att svaret är nej på de flesta frågor"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "läs flaggor från fil"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|NYCKELID|lita ovillkorligen på denna nyckel"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda tilläggsmodul FIL"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera läget som beskrivs i RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "ställ om alla flaggor så att gpg följer OpenPGP-standarden"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "ställ om alla flaggor så att gpg följer OpenPGP-standarden"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|använd lösenordsläget N"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|använd chifferalgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAMN=VÄRDE|använd detta sätt för att beskriva data"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -749,7 +745,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -769,17 +765,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <sv@li.org>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -789,7 +785,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -797,117 +793,107 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBSERVERA: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser flaggor från \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "VARNING: \"%s\" är en tom fil\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr ""
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBSERVERA: %s är inte för normal användning!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:1492
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "angiven URL är ogiltig\n"
-
-#: g10/g10.c:1496
+#: g10/g10.c:1613
 #, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "angiven URL är ogiltig\n"
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
@@ -918,160 +904,179 @@ msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
 # är ändå litet. Eventuellt borde meddelandena inte alls
 # översättas för att göra eventuell felsökning lättare
 # för internationella felsökare
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBSERVERA: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1651
 #, fuzzy
-msgid "invalid preferences\n"
+msgid "invalid default preferences\n"
 msgstr "skriv ut inställningar"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "skriv ut inställningar"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "skriv ut inställningar"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "skriv ut inställningar"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"det första tecknet i ett notationsnamn måste vara en bokstav eller\n"
-"ett understrykningstecken (_)\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "punkter i ett notationsnamn måste vara omgivna av andra tecken\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
+#: g10/g10.c:2520
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "angiven URL är ogiltig\n"
+
+#: g10/g10.c:2522
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "angiven URL är ogiltig\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1171,11 +1176,13 @@ msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Anledning till återkallelsen: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Återkallelsekommentar: "
 
 #. a string with valid answers
@@ -1379,144 +1386,154 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s överhoppad\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du specificerade ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Hittade inte användaridentiteten.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade över: den publika nyckeln är redan satt som förvald mottagare\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är deaktiverad\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: hoppade över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade över: den publika nyckeln är deaktiverad\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "hoppade över \"%s\": kopia\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "skriv ut inställningar"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "skriver självsignatur\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (signering och kryptering)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Användanadet av denna algoritm är förlegat - skapa ändå? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1529,20 +1546,20 @@ msgstr ""
 "              den förvalda nyckelstorleken är 1024 bitar\n"
 "    den största föreslagna nyckelstorleken är 2048 bitar\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "nyckelstorleken är för liten; 1024 är det minsta tillåtna värdet för RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "nyckelstorleken är för liten; 768 är det minsta tillåtna värdet.\n"
 
@@ -1554,12 +1571,12 @@ msgstr "nyckelstorleken är för liten; 768 är det minsta tillåtna värdet.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "nyckelstorleken är för stor; %d är det största tillåtna värdet\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1567,11 +1584,11 @@ msgstr ""
 "Nyckelstorlekar större än 2048 är inte att rekommendera\n"
 "eftersom beräkningar tar MYCKET lång tid!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1579,18 +1596,18 @@ msgstr ""
 "Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n"
 "avslöjande strålning som kan avlyssnas!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1607,7 +1624,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1624,31 +1641,31 @@ msgstr ""
 "      <n>m = nyckeln blir ogiltig efter n månader\n"
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid är nyckeln giltig? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "För hur lång tid är nyckeln giltig? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Nyckeln går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1656,11 +1673,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1676,44 +1693,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Epostadressen är ogiltig\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1724,28 +1741,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte epostadressen som namn eller kommentar\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1753,17 +1770,17 @@ msgstr ""
 "Du behöver en lösenordsfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1774,7 +1791,7 @@ msgstr ""
 "Jag kommer att göra det ändå. Du kan ändra din lösenordsfras närsomhelst\n"
 "om du använder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1786,54 +1803,54 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropi.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certifikat som leder till en pålitlig nyckel:\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1842,13 +1859,13 @@ msgstr ""
 "att vilja använda kommandot \"--edit-key\" för att generera en sekundär\n"
 "nyckel för detta syfte.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1856,7 +1873,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1864,84 +1881,94 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu nycklar behandlade\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan inte öppna: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenordsfras: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "OBSERVERA: chifferalgoritmen %d finns inte i inställningarna\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad för: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "användaren \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nyckeln %08lX följer inte standarden RFC2440 - överhoppad\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - överhoppad\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: ny nyckel - överhoppad\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
@@ -1951,21 +1978,21 @@ msgstr "för många poster i pk-cachen - inaktiverad\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "använder sekundära nyckeln %08lX istället för primärnyckeln %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade över\n"
@@ -2045,180 +2072,185 @@ msgstr "antal importerade hemliga nycklar: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:455
+#: g10/import.c:544
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "nyckel %08lX: accepterade icke självsignerad användaridentitet '"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nyckeln %08lX: ny nyckel - överhoppad\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny användaridentitet\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya användaridentiteter\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "nyckel %08lX: inte förändrad\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen förvald publik nyckel\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: ingen publik nyckel - kan inte tillämpa "
 "återkallelsecertifikatet\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt återkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: återkallelsecertifikat importerat\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "nyckel %08lX: algoritmen för publik nyckel ej stödd\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig självsignatur\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för publik nyckel ej stödd\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
@@ -2227,184 +2259,200 @@ msgstr "nyckel %08lX: hoppade över undernyckel\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %08lX: återkallelsecertifikat på fel plats - hoppade över\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt återkallelsecertifikat: %s - hoppade över\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "nyckel %08lX: användaridentitet hittades två gånger - slog ihop\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: lade till återkallelsecertifikat\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[återkallelse]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:404
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Notera: Denna nyckel har gått ut!\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2412,7 +2460,32 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "detta kan bero på att det saknas en självsignatur\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"Signaturen kommer att markeras som icke exporterbar.\n"
+"\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"Signaturen kommer att markeras som icke exporterbar.\n"
+"\n"
+
+#: g10/keyedit.c:616
 #, fuzzy
 msgid ""
 "\n"
@@ -2421,7 +2494,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 #, fuzzy
 msgid ""
 "\n"
@@ -2430,51 +2503,51 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2482,7 +2555,7 @@ msgstr ""
 "Skriv in den nya lösenordsfrasen för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2490,567 +2563,592 @@ msgstr ""
 "Du vill inte ha någon lösenordsfras - detta är sannolikt en dålig idé!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "visa denna hjälp"
 
 # skall dessa översättas?
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "räkna upp nycklar och användaridentiteter"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "välj sekundär nyckel N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "räkna upp signaturer"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 #, fuzzy
 msgid "add a photo ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "ta bort en användaridentitet"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "lägg till en sekundär nyckel"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "ta bort en sekundär nyckel"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "lägg till en sekundär nyckel"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "ändra utgångsdatum"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "set preference list"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "updated preferences"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "ändra lösenordsfrasen"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "återkalla en sekundär nyckel"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "kan ej göra detta i batch-läge\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj det användarid du vill signera\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen återkalla de valda nycklarna? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen återkalla denna nyckel? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1740
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+msgid "This key may be revoked by %s key "
 msgstr "VARNING: Denna nyckel har återkallats av sin ägare!\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  skapad: %s går ut: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! en undernyckel har återkallats: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "rev- hittade felaktig återkallelse\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem vid kontroll av återkallandet: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1835
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Ange storleken på nyckeln"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som mest en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "nyckel %08lX: ogiltig självsignatur\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundär nyckel med index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3059,7 +3157,7 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3068,120 +3166,128 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s-signatur från: %s\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen återkalla denna nyckel? "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett återkallelsecertifikat för denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   återkallad av %08lX %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "%s-signatur från: %s\n"
+
+#: g10/keylist.c:93
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s-signatur från: %s\n"
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notation: "
+
+#: g10/keylist.c:129
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Notation: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr "[går ut: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr "Fingeravtryck:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "           Fingeravtryck:"
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln är %08lX\n"
@@ -3193,126 +3299,126 @@ msgstr "den publika nyckeln är %08lX\n"
 # rätt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska översättningen är mycket obskyrare än engelska
 # originalet iallafall.
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBSERVERA: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående återkallelsecertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det någon bra svensk översättning av policy?
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "ingen frikopplad signatur\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -3331,31 +3437,46 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "denna chifferalgoritm är förlegad, använd istället en mer normal algoritm!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "VARNING: \"%s\" är en tom fil\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VARNING: \"%s\" är en tom fil\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för publik nyckelhantering\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -3497,34 +3618,39 @@ msgstr "ingen signerad data\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerad data \"%s\"\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonym mottagare, försöker använda den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "chifferalgoritmen %d är okänd eller avslagen\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "OBSERVERA: chifferalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "OBSERVERA: den hemliga nyckeln %08lX gick ut %s\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "nyckeln %08lX: nyckeln har återkallats!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, fuzzy, c-format
@@ -3551,12 +3677,16 @@ msgstr "lyckades sända till \"%s\" (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades sända till \"%s\": status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kan inte hämta nyckeln från en nyckelserver: %s\n"
@@ -3616,45 +3746,55 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen är felaktig eftersom en okänd kritisk bit är satt\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "försök att verifiera signaturen misslyckades: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur från: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "OBSERVERA: chifferalgoritmen %d finns inte i inställningarna\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "dekrypteringen misslyckades: %s\n"
@@ -3887,26 +4027,26 @@ msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
 # om någon kan tala om för mig vad detta betyder skulle jag bli jätteglad!
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad osäker - går inte att använda med fejkad RNG!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "hoppade över \"%s\": kopia\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4102,16 +4242,23 @@ msgstr ""
 "att använda dem eftersom de inte stöds i alla program och signaturer\n"
 "skapade med dem är stora och mycket långsamma att verifiera."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4123,19 +4270,19 @@ msgstr ""
 "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 "att försöka tolka det angivna värdet som ett intervall."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en epostadress. Detta är valfritt men rekommenderas varmt"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Ange en valfri kommentar"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4149,11 +4296,11 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4195,11 +4342,11 @@ msgid ""
 msgstr ""
 
 # felstavat original
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4207,11 +4354,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4222,7 +4369,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4234,7 +4381,7 @@ msgstr ""
 "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
 "en tillitskoppling genom en annan redan certifierad nyckel."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4243,7 +4390,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4257,7 +4404,7 @@ msgstr ""
 "mer. Så gör bara detta om denna självsignatur av någon anledning är\n"
 "ogiltig och det finns en andra signatur som tillgänglig."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4265,27 +4412,27 @@ msgid ""
 msgstr ""
 
 # ej klar, eller?
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "Ange en lösenordsfras. Detta är en hemlig mening\n"
 "[hjälptexten ej färdigställd]"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Reptera lösenordsfrasen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om det du vill skriva över filen"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4293,7 +4440,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4323,7 +4470,7 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en epostadress\n"
 "     är ogiltig.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4333,11 +4480,11 @@ msgstr ""
 "detta återkallelsecertifikat. Försök att hålla texten kort och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
@@ -4401,6 +4548,18 @@ msgstr "räkna upp nycklar och signaturer"
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAMN=VÄRDE|använd detta sätt för att beskriva data"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "det första tecknet i ett notationsnamn måste vara en bokstav eller\n"
+#~ "ett understrykningstecken (_)\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "punkter i ett notationsnamn måste vara omgivna av andra tecken\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
@@ -4480,9 +4639,6 @@ msgstr "%s: nyckelring skapad\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: fel vid kontroll av nyckeln: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (signering och kryptering)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Vill du verkligen skapa en nyckel för signering och kryptering? "
 
diff --git a/po/tr.po b/po/tr.po
index bd5d658f4..f74856625 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-06-29 23:05+0200\n"
 "PO-Revision-Date: 2002-04-21 15:14+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -48,7 +48,7 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:897 util/miscutil.c:333
 msgid "quit"
 msgstr "çıkış"
 
@@ -275,7 +275,7 @@ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -340,7 +340,7 @@ msgstr ""
 "BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:140
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +352,7 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:300
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:302
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:290
+#: g10/g10.c:303
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:291
+#: g10/g10.c:304
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:292
+#: g10/g10.c:305
 msgid "encrypt data"
 msgstr "veriyi ÅŸifreler"
 
-#: g10/g10.c:293
+#: g10/g10.c:306
 msgid "|[files]|encrypt files"
 msgstr "|[dosyalar]|dosyalar ÅŸifrelenir"
 
-#: g10/g10.c:294
+#: g10/g10.c:307
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik ÅŸifre ile ÅŸifreler"
 
-#: g10/g10.c:295
+#: g10/g10.c:308
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:296
+#: g10/g10.c:309
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:297
+#: g10/g10.c:310
 msgid "|[files]|decrypt files"
 msgstr "|[dosyalar]|dosyaların şifresi açılır"
 
-#: g10/g10.c:298
+#: g10/g10.c:311
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:300
+#: g10/g10.c:313
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:302
+#: g10/g10.c:315
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:303
+#: g10/g10.c:316
 msgid "check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:304
+#: g10/g10.c:317
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:305
+#: g10/g10.c:318
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:306
+#: g10/g10.c:319
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:307
+#: g10/g10.c:320
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:309
+#: g10/g10.c:322
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:310
+#: g10/g10.c:323
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:311
+#: g10/g10.c:324
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:312
+#: g10/g10.c:325
 msgid "sign a key non-revocably"
 msgstr "bir anahtarı iptal edilemez olarak imzalar"
 
-#: g10/g10.c:313
+#: g10/g10.c:326
 msgid "sign a key locally and non-revocably"
 msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
 
-#: g10/g10.c:314
+#: g10/g10.c:327
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:315
+#: g10/g10.c:328
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:316
+#: g10/g10.c:330
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:317
+#: g10/g10.c:331
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:318
+#: g10/g10.c:332
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:320
+#: g10/g10.c:334
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:322
+#: g10/g10.c:336
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:326
+#: g10/g10.c:340
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:328
+#: g10/g10.c:342
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:330
+#: g10/g10.c:344
 msgid "export the ownertrust values"
 msgstr "sahibiningüvencesi değerlerini gönderir"
 
-#: g10/g10.c:332
+#: g10/g10.c:346
 msgid "import ownertrust values"
 msgstr "sahibiningüvencesi değerlerini indirir"
 
-#: g10/g10.c:334
+#: g10/g10.c:348
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:336
+#: g10/g10.c:350
 msgid "unattended trust database update"
 msgstr "bakımsız güvence veritabanının güncellemesi"
 
-#: g10/g10.c:337
+#: g10/g10.c:351
 msgid "fix a corrupted trust database"
 msgstr "bozulan güvence veritabanını onarır"
 
-#: g10/g10.c:338
+#: g10/g10.c:352
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
 
-#: g10/g10.c:340
+#: g10/g10.c:354
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi zırhlar"
 
-#: g10/g10.c:342
+#: g10/g10.c:356
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:346
+#: g10/g10.c:360
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,198 +526,194 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:362
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:350
+#: g10/g10.c:364
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:353
+#: g10/g10.c:367
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: g10/g10.c:355
+#: g10/g10.c:369
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: g10/g10.c:361
+#: g10/g10.c:375
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/g10.c:362
+#: g10/g10.c:376
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/g10.c:364
+#: g10/g10.c:378
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:371
+#: g10/g10.c:385
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:372
+#: g10/g10.c:386
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:373
+#: g10/g10.c:387
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/g10.c:374
+#: g10/g10.c:388
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: g10/g10.c:375
+#: g10/g10.c:389
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: g10/g10.c:376
+#: g10/g10.c:390
 msgid "do not force v3 signatures"
 msgstr "v3 imzalara zorlamaz"
 
-#: g10/g10.c:377
+#: g10/g10.c:391
 msgid "force v4 key signatures"
 msgstr "v4 imzalara zorlar"
 
-#: g10/g10.c:378
+#: g10/g10.c:392
 msgid "do not force v4 key signatures"
 msgstr "v4 imzalara zorlamaz"
 
-#: g10/g10.c:379
+#: g10/g10.c:393
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: g10/g10.c:381
+#: g10/g10.c:395
 msgid "never use a MDC for encryption"
 msgstr "şifreleme için asla bir MDC kullanılmaz"
 
-#: g10/g10.c:383
+#: g10/g10.c:397
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:399
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:388
+#: g10/g10.c:402
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: g10/g10.c:389
+#: g10/g10.c:403
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: g10/g10.c:390
+#: g10/g10.c:404
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: g10/g10.c:391
+#: g10/g10.c:405
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: g10/g10.c:392
+#: g10/g10.c:406
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: g10/g10.c:393
+#: g10/g10.c:407
 msgid "show which keyring a listed key is on"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/g10.c:394
+#: g10/g10.c:408
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/g10.c:395
+#: g10/g10.c:409
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: g10/g10.c:397
+#: g10/g10.c:411
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|Ä°SÄ°M|terminal karakter setini Ä°SÄ°M olarak ayarlar"
 
-#: g10/g10.c:398
+#: g10/g10.c:412
 msgid "read options from file"
 msgstr "seçenekleri dosyadan okur"
 
-#: g10/g10.c:402
+#: g10/g10.c:416
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:404
+#: g10/g10.c:418
 msgid "|[file]|write status info to file"
 msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
 
-#: g10/g10.c:410
+#: g10/g10.c:430
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANHKİML|bu anahtar son derece güvenli"
 
-#: g10/g10.c:411
+#: g10/g10.c:431
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: g10/g10.c:412
+#: g10/g10.c:432
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de açıklanan kipi uygular"
 
-#: g10/g10.c:413
+#: g10/g10.c:433
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini OpenPGP tarzında ayarlar"
 
-#: g10/g10.c:414
+#: g10/g10.c:434
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini PGP 2.x'e göre ayarlar"
 
-#: g10/g10.c:418
+#: g10/g10.c:440
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolası kipi olarak N kullanılır"
 
-#: g10/g10.c:420
+#: g10/g10.c:442
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|İSİM|anahtar parolaları için ileti özümleme algoritması olarak İSİM "
 "kullanılır"
 
-#: g10/g10.c:422
+#: g10/g10.c:444
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|İSİM|anahtar parolaları için şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:424
+#: g10/g10.c:446
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:425
+#: g10/g10.c:447
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:426
+#: g10/g10.c:449
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: g10/g10.c:427
+#: g10/g10.c:450
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:428
+#: g10/g10.c:451
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:429
+#: g10/g10.c:452
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:430
+#: g10/g10.c:453
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|İSİM=DEĞER|veri bu nitelemeyle kullanılır"
-
-#: g10/g10.c:434
+#: g10/g10.c:459
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -725,7 +721,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:462
 msgid ""
 "@\n"
 "Examples:\n"
@@ -745,15 +741,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:613
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> adresine bildirin.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:617
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:586
+#: g10/g10.c:620
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -763,7 +759,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:631
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -771,265 +767,275 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:735
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:728
+#: g10/g10.c:792
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:810
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:997
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1001
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1008
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1309
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1326
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1340
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
-
-#: g10/g10.c:1253 g10/g10.c:1270
-#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "lütfen yerine \"--keyserver-options %s\" kullanınız\n"
-
-#: g10/g10.c:1347
+#: g10/g10.c:1476
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1480
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1487 g10/g10.c:1498
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1489 g10/g10.c:1509
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1492
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1519
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1525
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1531
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1544
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "bu ileti PGP 2.x tarafından kullanılamayabilir\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1601 g10/g10.c:1619
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1607 g10/g10.c:1625
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "belirtilen imza güvence adresi geçersiz\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "belirtilen sertifika güvence adresi geçersiz\n"
+#: g10/g10.c:1613
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1628
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1630
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1632
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1634
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1637
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1641
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1645
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı denetim seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1651
+#, fuzzy
+msgid "invalid default preferences\n"
 msgstr "tercihler geçersiz\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1659
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "tercihler geçersiz\n"
+
+#: g10/g10.c:1663
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "tercihler geçersiz\n"
+
+#: g10/g10.c:1667
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "tercihler geçersiz\n"
+
+#: g10/g10.c:1761
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1771
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1781
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1788
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1796
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1813
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1826
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1840
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1849
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1867
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1878
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1886
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1894
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1902
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:1981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2072
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2080
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2167
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2253
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2257
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2313
-msgid ""
-"the first character of a notation name must be a letter or an underscore\n"
-msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalı\n"
-
-#: g10/g10.c:2319
+#: g10/g10.c:2474
+#, fuzzy
 msgid ""
-"a notation name must have only letters, digits, dots or underscores and end "
-"with an '='\n"
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr ""
-"bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış "
-"olmalıdır\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2483
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
+#: g10/g10.c:2520
+msgid "the given certification policy URL is invalid\n"
+msgstr "belirtilen sertifika güvence adresi geçersiz\n"
+
+#: g10/g10.c:2522
+msgid "the given signature policy URL is invalid\n"
+msgstr "belirtilen imza güvence adresi geçersiz\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1126,11 +1132,13 @@ msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Yürürlükten kaldırma sebebi: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Yürürlükten kaldırma açıklaması: "
 
 #. a string with valid answers
@@ -1325,21 +1333,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1347,120 +1355,130 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "%c%lu tercihi geçersiz\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "%c%lu tercihi yinelendi\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "`%c' tercih çok fazla\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "öz-imza yazılıyor\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
+
+#: g10/keyedit.c:572 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Bu algoritmanın kullanımı uygun değil - Yine de oluşturulsun mu?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:585 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1473,20 +1491,20 @@ msgstr ""
 "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
 "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
 
@@ -1498,12 +1516,12 @@ msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit't
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1511,11 +1529,11 @@ msgstr ""
 "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
 "2048 bitten fazlası tavsiye edilmez.\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Bu anahtar uzunluÄŸunu istediÄŸinizden emin misiniz? "
 
-#: g10/keygen.c:875
+#: g10/keygen.c:1050
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1523,17 +1541,17 @@ msgstr ""
 "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
 "kendinizi uzak tutun! (ne demekse...)\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ä°stenen anahtar uzunluÄŸu: %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1549,7 +1567,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1565,30 +1583,30 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1596,11 +1614,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Bu doÄŸru mu? (e/h)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1616,44 +1634,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1664,29 +1682,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1694,18 +1712,18 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:783 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1717,7 +1735,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1730,53 +1748,53 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "anahtar son derece güvenli olarak imlendi.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1784,19 +1802,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1804,87 +1822,97 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:673
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:126 g10/encode.c:351
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: açılamıyor: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:162 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:236 g10/encode.c:447
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: UYARI: dosya boÅŸ\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:340
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:368
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:347
+#: g10/encode.c:402
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:413 g10/encode.c:567
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:485 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
+
+#: g10/encode.c:646
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s %s için şifrelendi\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:77 g10/export.c:164
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloÄŸu okunurken hata: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:172
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
 
-#: g10/export.c:180
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:188
+#: g10/export.c:196
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:255
+#: g10/export.c:279
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1894,23 +1922,23 @@ msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
 "oldu\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
@@ -1990,182 +2018,187 @@ msgstr "  gizli anahtarlar indirildi: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar deÄŸiÅŸmedi: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:479
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
+
+#: g10/import.c:527 g10/import.c:756
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:455
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliği '%s' kabul edildi\n"
 
-#: g10/import.c:462
+#: g10/import.c:551
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:464
+#: g10/import.c:553
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:563 g10/import.c:825
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:568
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:489
+#: g10/import.c:578
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluÅŸtu: %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:596
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "anahtar %08lX: genel anahtar indirildi\n"
 
-#: g10/import.c:524
+#: g10/import.c:617
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:634 g10/import.c:842
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:641 g10/import.c:848
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:673
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "anahtar %08lX: 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:676
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "anahtar %08lX: %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:679
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "anahtar %08lX: 1 yeni imza\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:682
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "anahtar %08lX: %d yeni imza\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:685
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "anahtar %08lX: bir yeni yardımcı anahtar\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:688
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "anahtar %08lX: %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:700
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "anahtar %08lX: deÄŸiÅŸmedi\n"
 
-#: g10/import.c:671
+#: g10/import.c:770
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:781
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:785
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:691
+#: g10/import.c:790
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:819
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:760
+#: g10/import.c:859
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:891
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası indirildi\n"
 
-#: g10/import.c:826
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:839
+#: g10/import.c:941
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:841
+#: g10/import.c:943
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:858
+#: g10/import.c:960
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:868
+#: g10/import.c:970
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:869
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:899
+#: g10/import.c:1001
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:922
+#: g10/import.c:1024
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
@@ -2174,112 +2207,132 @@ msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
 
-#: g10/import.c:954
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:971
+#: g10/import.c:1073
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1174
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "anahtar %08lX: çift kullanıcı kimliği saptandı - katıştırıldı\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1233
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Uyarı: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %08lX alınıyor\n"
 
-#: g10/import.c:1145
+#: g10/import.c:1247
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Uyarı: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %08lX mevcut değil.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1304
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1335
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:143
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:215 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:217 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:219 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:221 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:223 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:225 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:356
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
+#: g10/keyedit.c:376
+#, c-format
+msgid "Warning: user ID \"%s\" is not self-signed.\n"
+msgstr ""
+
+#: g10/keyedit.c:395
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" üzerindeki imzanız\n"
+"dahili bir imza.\n"
+
+#: g10/keyedit.c:404
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:418
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2288,40 +2341,40 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:422
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:442
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:446
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:459
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:474
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:494
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:498
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:531
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2329,11 +2382,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:533
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:556
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2342,27 +2395,27 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:560
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:562
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:564
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:566
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:591
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2370,7 +2423,32 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:600
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
+
+#: g10/keyedit.c:604
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"İmza dışarı gönderilemez olarak imlenecek.\n"
+
+#: g10/keyedit.c:609
+#, fuzzy
+msgid ""
+"\n"
+"Warning: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
+
+#: g10/keyedit.c:616
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2378,7 +2456,7 @@ msgstr ""
 "\n"
 "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:620
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2386,7 +2464,7 @@ msgstr ""
 "\n"
 "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:625
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2394,7 +2472,7 @@ msgstr ""
 "\n"
 "Her şeyiyle bu anahtarı kontol edemedim.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:629
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2402,7 +2480,7 @@ msgstr ""
 "\n"
 "Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:633
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2410,33 +2488,33 @@ msgstr ""
 "\n"
 "Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:642
 msgid "Really sign? "
 msgstr "Gerçekten imzalayacak mısınız? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:740
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:744
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:748
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuÅŸ.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:768
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:774
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2444,7 +2522,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:788
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2452,473 +2530,471 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:791
 msgid "Do you really want to do this? "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:855
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:897
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:898
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save"
 msgstr "kaydet"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:899
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "help"
 msgstr "yardım"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:900
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "fpr"
 msgstr "piz"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:902
 msgid "show fingerprint"
 msgstr "parmak izini göster"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list"
 msgstr "listele"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:903
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini göster"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:904
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "uid"
 msgstr "kullkim"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:905
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "key"
 msgstr "anahtar"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:906
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "check"
 msgstr "kontrol"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:907
 msgid "list signatures"
 msgstr "imzaları listele"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:908
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign"
 msgstr "imzala"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:909
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:910
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "lsign"
 msgstr "yimza"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:911
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "nrsign"
 msgstr "yksızimza"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:912
 msgid "sign the key non-revocably"
 msgstr "yürürlükten kaldırılamayan imza"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "nrlsign"
 msgstr "içyksızimza"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:913
 msgid "sign the key locally and non-revocably"
 msgstr "yürürlükten kaldırılamayan yerel imza"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:914
 msgid "debug"
 msgstr "hata ayıklama"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "adduid"
 msgstr "kullkimEkle"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:915
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "addphoto"
 msgstr "fotoekle"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:916
 msgid "add a photo ID"
 msgstr "bir foto kimliÄŸi ekler"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "deluid"
 msgstr "kullkimSil"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:917
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:919
 msgid "delphoto"
 msgstr "fotosil"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "addkey"
 msgstr "anhEkle"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:920
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delkey"
 msgstr "anhSil"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:921
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "addrevoker"
+msgstr "anhEkle"
+
+#: g10/keyedit.c:922
+#, fuzzy
+msgid "add a revocation key"
+msgstr "bir yardımcı anahtar ekler"
+
+#: g10/keyedit.c:923
 msgid "delsig"
 msgstr "imzaSil"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "expire"
 msgstr "sontarih"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:924
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "primary"
 msgstr "asıl"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:925
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle"
 msgstr "seçmece"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:926
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:928
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "pref"
 msgstr "önayar"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:929
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "showpref"
 msgstr "tercihgöst"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:930
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "setpref"
 msgstr "tercihyap"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:931
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updpref"
 msgstr "tercgüncel"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:932
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "passwd"
 msgstr "aparola"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:933
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "trust"
 msgstr "güvence"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:934
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revsig"
 msgstr "imzayürkal"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:935
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revkey"
 msgstr "yürkalanh"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:936
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable"
 msgstr "iptal"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:937
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable"
 msgstr "kullan"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:938
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "showphoto"
 msgstr "fotogöst"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:939
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:112 g10/keyedit.c:959
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:996
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "gizli anahtar bloÄŸu `%s' okunurken hata oluÅŸtu: %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1014
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1045
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1077
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1081
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1130
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1149
 msgid "Really sign all user IDs? "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1150
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1175
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1195 g10/keyedit.c:1216
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1197
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1200
 msgid "Really remove all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1201
 msgid "Really remove this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1239 g10/keyedit.c:1270
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1243
 msgid "Do you really want to delete the selected keys? "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1274
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1275
 msgid "Do you really want to revoke this key? "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1344
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
 "musunuz? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1346
 msgid "Really update the preferences? "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1384
 msgid "Save changes? "
 msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1387
 msgid "Quit without saving? "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1398
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1412
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1424
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1740
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr ""
 "Bu anahtar %s tarafından %s%s anahtarı ile yürürlükten kaldırılmış olabilir\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1744
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1750 g10/keyedit.c:1776
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  üretildi: %s son kullanma tarihi: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1759
 #, c-format
 msgid " trust: %c/%c"
 msgstr " güven derecesi: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1763
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmiÅŸti"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1792
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1795
 msgid "rev- faked revocation found\n"
 msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1797
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1827
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1835
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, geçerliliğinin\n"
 "olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"UYARI: Bu anahtarın zaten bir foto kimliği var.\n"
-"    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz "
-"olabilir.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1923
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2927,83 +3003,108 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1928
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
+
+#: g10/keyedit.c:1934
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2069
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2079
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2083
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2089
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2103
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2104
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2107
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2203
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Anahtar uzunluÄŸunu giriniz"
+
+#: g10/keyedit.c:2218
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2228
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2314
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2320
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2324
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2326
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2368
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2384
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2467
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
+
+#: g10/keyedit.c:2671
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2717
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2831
 msgid "user ID: \""
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2836
 #, c-format
 msgid ""
 "\"\n"
@@ -3012,7 +3113,7 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2839
 #, c-format
 msgid ""
 "\"\n"
@@ -3021,242 +3122,250 @@ msgstr ""
 "\"\n"
 "%08lX anahtarınızla %s de yerel olarak imzalı\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2844
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2848
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2852
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2877
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2891
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2899
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2919
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2929
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2931
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2938
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2968
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3120
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "imza guvencesi: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "imza niteleyici: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "insan okuyabilir deÄŸil"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:476 g10/mainproc.c:895
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:889
+#: g10/keylist.c:952
 msgid "Fingerprint:"
 msgstr " Parmak izi:"
 
 #. use tty
 #. Translators: this should fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keylist.c:895
+#: g10/keylist.c:958
 msgid "             Fingerprint:"
 msgstr "              Parmak izi:"
 
-#: g10/keylist.c:899
+#: g10/keylist.c:962
 msgid "     Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ÅŸifreli veri\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:283
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile ÅŸifrelenmiÅŸ\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:311
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "genel anahtar: %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:357
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla ÅŸifreli veri: doÄŸru DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:409
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve kullanıcı kimliği\n"
 "%08lX ile ÅŸifrelendi, %s oluÅŸturuldu\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:419
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s anahtarı ve %08lX kullanıcı kimliği ile şifrelendi\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:433
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:460 g10/mainproc.c:479
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:467
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:497
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:502
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: ÅŸifreli ileti tahrip edilmiÅŸ!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:507
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:526
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:528
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:703
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:771
 msgid "Notation: "
 msgstr "Niteleme: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:783
 msgid "Policy: "
 msgstr "Güvence: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1238
 msgid "signature verification suppressed\n"
 msgstr "imza doÄŸrulama engellendi\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1280 g10/mainproc.c:1290
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1301
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliği ile yapıldı\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1345 g10/mainproc.c:1367
 msgid "BAD signature from \""
 msgstr "KÖTÜ imza: \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1346 g10/mainproc.c:1368
 msgid "Expired signature from \""
 msgstr "Kullanım tarihi geçmiş imza: \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1347 g10/mainproc.c:1369
 msgid "Good signature from \""
 msgstr "DoÄŸru imza: \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1371
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1391
 msgid "                aka \""
 msgstr "                den \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1452
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ä°mza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1548
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1605
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1612
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -3274,21 +3383,21 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
 
-#: g10/misc.c:378
+#: g10/misc.c:386
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Uyarı: %s \"%s\" de güvensiz sahiplik\n"
 
-#: g10/misc.c:410
+#: g10/misc.c:418
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Uyarı: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA ÅŸifre eklentisi yok\n"
 
-#: g10/misc.c:436
+#: g10/misc.c:444
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
@@ -3296,12 +3405,27 @@ msgstr ""
 "adresine\n"
 "bakınız.\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "lütfen yerine \"--keyserver-options %s\" kullanınız\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -3442,34 +3566,39 @@ msgstr "imzalı veri yok\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonim alıcı: %08lX gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "anahtar %08lX: anahtar yürürlükten kaldırılmıştı!\n"
+
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3496,12 +3625,16 @@ msgstr "\"%s\" adresine gönderme işlemi başarılı (durum=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "\"%s\" adresine gönderme işlemi başarısız (durum=%u)\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:283
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:493
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:543
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "anahtar sunucusu aranamıyor: %s\n"
@@ -3560,7 +3693,14 @@ msgstr "BİLGİ: %08lX imza anahtarının kullanım süresi %s tarihinde dolmuş
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "Hatalı imzanın bilinmeyen bir kritik bitten kaynaklandığı sanılıyor\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
+"Uzatılmadan kullanılıyor.\n"
+
+#: g10/sign.c:151
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3568,40 +3708,46 @@ msgstr ""
 "UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s imza: %s den\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imza yapabilirsiniz\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -3831,25 +3977,25 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -4051,16 +4197,23 @@ msgstr ""
 "olduğundan RFC2440 standardında tanımlı olmalarına rağmen tavsiye\n"
 "edilmezler."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluÄŸunu giriniz"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4071,20 +4224,20 @@ msgstr ""
 "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
 "bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4098,11 +4251,11 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4164,11 +4317,11 @@ msgstr ""
 "kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
 "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4176,11 +4329,11 @@ msgstr ""
 "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
 "Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4190,7 +4343,7 @@ msgstr ""
 "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
 "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4202,13 +4355,13 @@ msgstr ""
 "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
 "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "İmza geçersiz. Onu anahtar zincirinizden kaldırmak uygun olacak."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4221,7 +4374,7 @@ msgstr ""
 "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
 "kullanılabilir bir ikincisi var ise yapın."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4231,23 +4384,23 @@ msgstr ""
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
 "tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4255,7 +4408,7 @@ msgstr ""
 "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
 "parantez içinde gösterilen öntanımlı dosya kullanılacak."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4283,7 +4436,7 @@ msgstr ""
 "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
 "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4293,11 +4446,11 @@ msgstr ""
 "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
 "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
@@ -4360,6 +4513,29 @@ msgstr "%lu anahtar denetlendi (%lu imza)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluÅŸturuldu\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|İSİM=DEĞER|veri bu nitelemeyle kullanılır"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalı\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış "
+#~ "olmalıdır\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "UYARI: Bu anahtarın zaten bir foto kimliği var.\n"
+#~ "    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz "
+#~ "olabilir.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Onu yine de imzalamak istiyor musunuz?\n"